Business travel to China

Hi, I am a Slovak citizen living in Switzerland. Next week I am flying to China for a 3 day business trip, then I am going to Japan for 10 days vacation, and I am flying from Japan back to China just for one night, then leaving China and flying back to Switzerland. Do I need a visa for this or an invitation letter from my company is enough?