fix(jg):注释报错代码

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/JgInstallationNoticeServiceImpl.java

@@ -882,7 +882,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         model.setStartDate(new Date());
         model.setTaskSource("workFlow");
         model.setCreateDate(new Date());
-        model.setFinishStatus(Boolean.FALSE);
+        //model.setFinishStatus(Boolean.FALSE);
         model.setAgencyCode("tzs");
         model.setTaskTitle("发起了" + model.getTaskTitle());
         Systemctl.taskV2Client.create(model);
@@ -903,7 +903,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         model.setRoutePath(model.getRoutePath().replace("nextExecuteIds", "nextExecuteIdsOld"));
         model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
         model.setEndDate(new Date());
-        model.setFinishStatus(Boolean.TRUE);
+        //model.setFinishStatus(Boolean.TRUE);
         model.setEndUserId(userJson != null ? userJson.get("userId").toString() : "");
         if (params.containsKey("isDelete")) {
             Systemctl.taskV2Client.delete(model.getSequenceNbr().toString());
@@ -968,7 +968,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskV2Model.setTaskStatusLabel(noticeStatus.getName());
             taskV2Model.setTaskCode(jgInstallationNotice.getApplyNo());
             taskV2Model.setStartUserId(jgInstallationNotice.getCreateUserId());
-            taskV2Model.setCreateUserId(jgInstallationNotice.getCreateUserId());
+            //taskV2Model.setCreateUserId(jgInstallationNotice.getCreateUserId());
             buildTaskModel(taskV2Model);
         }
     }
@@ -1019,7 +1019,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             model.setRoutePath(model.getRoutePath().replace("nextExecuteIds", "nextExecuteIdsOld"));
             model.setTaskStatusLabel(jsonObject.get("nodeName").toString());
             model.setEndDate(new Date());
-            model.setFinishStatus(Boolean.TRUE);
+            //model.setFinishStatus(Boolean.TRUE);
             JSONObject userJson = JSON.parseObject(jsonObject.get("user").toString());
             model.setEndUserId(userJson.get("userId").toString());
             Systemctl.taskV2Client.update(model, model.getSequenceNbr());

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/JgScrapCancelServiceImpl.java

@@ -606,7 +606,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 map.put("taskStatusLabel", FlowStatusEnum.REJECTED.getName());
                 TaskV2Model taskV2ModelOld = updateTaskModel(map);
                 TaskV2Model taskV2Model = new TaskV2Model();
-                taskV2Model.setExecuteUserIds(taskV2ModelOld.getCreateUserId());
+                //taskV2Model.setExecuteUserIds(taskV2ModelOld.getCreateUserId());
                 taskV2Model.setExtras(JSON.toJSONString(jgScrapCancel));
                 taskV2Model.setRelationId(instanceId);
                 taskV2Model.setTaskType("scrapCancel");
@@ -675,7 +675,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         model.setRoutePath(model.getRoutePath().replace("nextExecuteIds", "nextExecuteIdsOld"));
         model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
         model.setEndDate(new Date());
-        model.setFinishStatus(Boolean.TRUE);
+        //model.setFinishStatus(Boolean.TRUE);
         model.setEndUserId(reginParams.getUserModel().getUserId());
         if (params.containsKey("isDelete")) {
             Systemctl.taskV2Client.delete(model.getSequenceNbr().toString());
@@ -691,8 +691,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         model.setStartUserId(reginParams.getUserModel().getUserId());
         model.setTaskSource("workFlow");
         model.setCreateDate(new Date());
-        model.setFinishStatus(Boolean.FALSE);
-        model.setCreateUserId(reginParams.getUserModel().getUserId());
+        //model.setFinishStatus(Boolean.FALSE);
+        //model.setCreateUserId(reginParams.getUserModel().getUserId());
         model.setAgencyCode(reginParams.getUserModel().getAgencyCode());
         model.setTaskTitle(reginParams.getUserModel().getRealName() + "发起了" + model.getTaskTitle());
         Systemctl.taskV2Client.create(model);

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

@@ -109,7 +109,7 @@ public class CommonserviceImpl {
         model.setTaskSource(params.getOrDefault("taskSource","workFlow").toString());
         // model.setTerminal(params.getOrDefault("terminal","WEB").toString());
         model.setCreateDate(new Date());
-        model.setFinishStatus(false);
+        //model.setFinishStatus(false);
         model.setTaskCode(params.get("taskCode").toString());
         model.setRecUserId(params.get("userId").toString());
         model.setAgencyCode(params.get("agencyCode").toString());
@@ -129,7 +129,7 @@ public class CommonserviceImpl {
         model.setEndUserId(reginParams.getUserModel().getUserId());
         model.setEndDate(new Date());
         model.setRoutePath(model.getRoutePath().replace("roleIds","role").replace("edit","look"));
-        model.setFinishStatus(true);
+        //model.setFinishStatus(true);
         Systemctl.taskV2Client.update(model,model.getSequenceNbr());
 
         //修改model并返回 用于组装新待办
@@ -137,7 +137,7 @@ public class CommonserviceImpl {
         model.setTaskStatus(null);
         model.setEndDate(null);
         model.setSequenceNbr(null);
-        model.setCreateUserId(reginParams.getUserModel().getUserId());
+        //model.setCreateUserId(reginParams.getUserModel().getUserId());
         model.setCreateDate(new Date());
         model.setTaskStatus(FlowStatusEnum.REJECTED.getCode());
         model.setTaskStatusLabel(FlowStatusEnum.REJECTED.getName());