modify：模板查询测试

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/task/AutoSubmit.java

@@ -132,7 +132,7 @@ public class AutoSubmit extends IJobHandler {
         map.put("flowUrl", changeRecord.getFlowId());
         ChangeConfigPo changeConfigPo = changeConfigService.queryInfoPo(changeRecord.getParentChangeClassId(),
             changeRecord.getSonChangeClassId());
-        StringBuilder changeType = new StringBuilder("");
+        StringBuilder changeType = new StringBuilder();
         try {
             changeType.append(changeConfigPo.getChangeTypes().get(0).getTypeName());
         } catch (Exception e) {

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/excel/ChangeFlowExcelVo.java

@@ -184,11 +184,45 @@ public class ChangeFlowExcelVo {
     private String changeExecUser;
 
     /**
-     * 变更状态
-     * @see ChangeStatusEnum
+     * 行动项变更风险描述
      */
-    @ExcelTitleName(title = "变更状态", order = 9)
-    private Integer changeState;
+    @ExcelTitleName(title = "行动项变更风险描述", order = 28)
+    private String changeExecRiskDesc;
+
+    /**
+     * 行动项
+     */
+    @ExcelTitleName(title = "行动项", order = 29)
+    private String changeExecProject;
+
+    /**
+     * 变更验证措施
+     */
+    @ExcelTitleName(title = "变更验证措施", order = 30)
+    private String changeChecking;
+    /**
+     * 行动完成时间
+     */
+    @ExcelTitleName(title = "行动完成时间", order = 31)
+    private Long changeExecFinishTime;
+
+    /**
+     * 行动完成情况
+     */
+    @ExcelTitleName(title = "行动完成情况", order = 32)
+    private String changeExecFinishDesc;
+
+    /**
+     * 变更结论
+     */
+    @ExcelTitleName(title = "变更结论", order = 33)
+    private Integer changeResult;
+
+    /**
+     * 变更完结时间
+     */
+    @ExcelTitleName(title = "变更结论", order = 34)
+    private Integer changeEndTime;
 
 
     public static List<ExcelCell> init(ChangeFlowExcelDTO dto) {

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/TestController.java

@@ -23,6 +23,7 @@ import com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz;
 import com.netease.mail.yanxuan.change.biz.config.AppConfig;
 import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
 import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
+import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierSendService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.TodoService;
 import com.netease.mail.yanxuan.change.biz.task.AutoSubmit;
@@ -32,6 +33,7 @@ import com.netease.mail.yanxuan.change.common.bean.ResponseCode;
 import com.netease.mail.yanxuan.change.common.enums.ChangeFlowEnum;
 import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
+import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.SendMailReq;
 import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierInfoService;
@@ -67,6 +69,9 @@ public class TestController {
     @Autowired
     private SupplierSendService sendSupplierEmail;
 
+    @Autowired
+    private ChangeConfigService changeConfigService;
+
     @PostMapping("/createToDo")
 
     public AjaxResult<Void> createTodoTask(ChangeRecord entity) {
@@ -128,4 +133,9 @@ public class TestController {
     public AjaxResult<List<String>> ccList(@RequestParam List<String> receiver){
         return AjaxResult.success(changeFlowBiz.getDepartmentInfo(receiver));
     }
+
+    @GetMapping("/getByOneAndTwo")
+    public AjaxResult<ChangeConfigPo> getByOneAndTwo(@RequestParam Long parentId, @RequestParam Long sonId) {
+        return AjaxResult.success(changeConfigService.queryInfoPo(parentId, sonId));
+    }
 }
\ No newline at end of file