优化

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

@@ -78,8 +78,9 @@ public class JgTransferNoticeByWorkFlowController {
         // TODO 受理移装告知流程
         LinkedHashMap model1 = (LinkedHashMap)model.get("model");
         LinkedHashMap installationInfo = (LinkedHashMap)model1.get("transferNoticeInfo");
+        String opinion = model.get("opinion").toString();
         JgTransferNoticeDto JgTransferNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgTransferNoticeDto.class);
-        jgTransferNoticeService.accept(JgTransferNoticeDto,op);
+        jgTransferNoticeService.accept(JgTransferNoticeDto, op, opinion);
         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/JgTransferNoticeServiceImpl.java

@@ -273,7 +273,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             JgTransferNotice notice = new JgTransferNotice();
             BeanUtils.copyProperties(noticeDto,notice);
 
-            boolean submit = submit(notice, op);
+            boolean submit = submit(notice, op, null);
 
             if(submit) {
                 // 查询下节点任务
@@ -537,7 +537,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         return urls;
     }
 
-    public boolean submit(JgTransferNotice notice, String op) {
+    public boolean submit(JgTransferNotice notice, String op, String opinion) {
 
         AjaxResult ajaxResult = Workflow.taskClient.getTask(notice.getInstanceId());
         JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
@@ -546,7 +546,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(taskId);
-        dto.setComment("提交流程");
+        if (!StringUtils.isEmpty(opinion)) {
+            dto.setComment(opinion);
+        }
         HashMap<String, Object> map = new HashMap<>();
         if(notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615") ) {
             map.put("approvalStatus", "提交");
@@ -586,7 +588,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
     @Transactional
-    public void accept(JgTransferNoticeDto dto, String op) {
+    public void accept(JgTransferNoticeDto dto, String op, String opinion) {
         String[] taskName = new String[]{"流程结束"};
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         JgTransferNotice jgTransferNotice = this.jgTransferNoticeMapper.selectById(dto.getSequenceNbr());
@@ -600,7 +602,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
 
         ArrayList<String> roleList = new ArrayList<>();
-        boolean submit = submit(jgTransferNotice, op);
+        boolean submit = submit(jgTransferNotice, op, opinion);
         if(submit) {
             getNext(roleList, dto.getInstanceId(), taskName);
             jgTransferNotice.setPromoter(reginParams.getUserModel().getUserId());