Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgReformByWorkFlowController.java

@@ -78,8 +78,10 @@ public class JgReformByWorkFlowController {
         // TODO 受理改造告知流程
         LinkedHashMap model1 = (LinkedHashMap) model.get("model");
         LinkedHashMap installationInfo = (LinkedHashMap) model1.get("reformInfo");
-        JgReformNoticeDto JgReformNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgReformNoticeDto.class);
-        jgReformNoticeService.accept(JgReformNoticeDto, op);
+        String opinion = (String) model.get("opinion");
+        JgReformNoticeDto jgReformNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgReformNoticeDto.class);
+        jgReformNoticeDto.setRemark(opinion);
+        jgReformNoticeService.accept(jgReformNoticeDto, op);
         return ResponseHelper.buildResponse(null);
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgReformNoticeServiceImpl.java

@@ -183,7 +183,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             JgReformNotice notice = new JgReformNotice();
             BeanUtils.copyProperties(noticeDto, notice);
             op = "提交";
-            boolean submit = submit(notice, op);
+            boolean submit = submit(notice, op, "");
 
             if (submit) {
                 // 查询下节点任务
@@ -590,7 +590,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         return urls;
     }
 
-    public boolean submit(JgReformNotice notice, String op) {
+    public boolean submit(JgReformNotice notice, String op, String comment) {
 
         AjaxResult ajaxResult = Workflow.taskClient.getTask(notice.getInstanceId());
         JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
@@ -599,7 +599,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(taskId);
-        dto.setComment("提交流程");
+        dto.setComment(comment);
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         dto.setVariable(map);
@@ -649,7 +649,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         ArrayList<String> roleList = new ArrayList<>();
 
 
-        boolean submit = submit(jgReformNotice, op);
+        boolean submit = submit(jgReformNotice, op, dto.getRemark());
         if (submit) {
             getNext(roleList, dto.getInstanceId(), taskName);
             jgReformNotice.setStatus(taskName[0]);