that和when引导宾语从句的区别?

题目

that和when引导宾语从句的区别?
请教以下两个句子哪个是正确的：
He told me that he would go to Shanghai.
He told me when he would go to Shanghai.
“他告诉了我他将什么时候去上海”的正确表达到底是什么样子的?

答案