Regarding the visa for Thailand, I will go to Thailand again in the short term.

Thailand tourist visa is valid for 9 days (this 9 days means that you have to use your visa to leave the country within 9 days, and the overdue period will be counted as a fee). Generally, you will be given a legal residence time limit of 6 days when you enter Thailand. When the 6 days are approaching, you can renew it for 3 days at the cost of 1,9 baht, and you can renew it for another 7 days after 3 days. After 7 days, you must leave the country. Usually, it is not recommended to postpone it, which will affect it.

in your case, when your company organizes a tour to go back, it costs 1, baht to apply for a return visa at the Thai airport, and the validity period of the return visa is 6 days when you enter the country. As far as I know, Suvarnabhumi Airport can handle it. Other airports are not clear. You can also take a taxi to the immigration office on the way.