Merge branch 'songyuanshuo' into 'master'

1./Plan/Record/exportTo接口修改，调用新的Utils类生成Excel

See merge request !20

quality-review/src/main/java/com/ruoyi/web/TestPlanRecordController.java

@@ -3,11 +3,12 @@ package com.ruoyi.web;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.ExcelMultipleSheetsUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelMultipleSheetsUtil;
+//import com.ruoyi.common.utils.poi.ExcelMultipleSheetsUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ReviewStandard;
 import com.ruoyi.domain.TTestPlanRecord;

quality-review/src/main/resources/mapper/TTestPlanRecordMapper.xml

@@ -87,5 +87,9 @@
         LEFT JOIN  t_review_details trd on trd.review_keypoint_id = trk.id
         LEFT JOIN  t_review_scene trsc on trsc.review_details_id = trd.id
         WHERE standard_id = #{standardId} AND type = #{type}
+        ORDER BY
+        CAST(SUBSTRING_INDEX(trs.chapter, '.', 1) AS UNSIGNED),
+        CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(trs.chapter, '.', 2), '.', -1) AS UNSIGNED),
+        CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(trs.chapter, '.', 3), '.', -1) AS UNSIGNED)
     </select>
 </mapper>