Confusion on visa type needed

I had a valid residence permit and work permit when the travel ban was imposed, my work permit expiry was on 31 July,2020. My HR helped me to renew my work permit but residence permit renewal cant be done like that and its expired on 31, July, 2020. Now my question is, I have a valid renewed work permit until 2022, which type of visa should I need to apply? I am confused with it. If I apply for a Z visa again, whether I can convert it into residence permit in China with a renewed work permit? Please clarify. Thanks in advance.