安装告知模块 功能开发

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java

@@ -248,5 +248,14 @@ public class JgInstallationNoticeDto extends BaseDto {
     @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date handleDate;
 
+    private String createUserCompanyName;
+
+    //下一步任务ID
+    private String nextTaskId;
+
+    /**
+     * 创建人
+     */
+    private String createUserName;
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -400,4 +400,19 @@ public class JgInstallationNotice extends BaseEntity {
      */
     private String approvalStatus;
 
+
+    @TableField(value = "\"create_user_company_name\"")
+    private String createUserCompanyName;
+
+    //下一步任务ID
+    @TableField(value = "\"next_taskId\"")
+    private String nextTaskId;
+
+    /**
+     * 创建人
+     */
+    @TableField("\"create_user_name\"")
+    private String createUserName;
+
+
 }

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

@@ -592,7 +592,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgInstallationNotice));
         jsonObject.put("taskType", BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
         jsonObject.put("nextExecuteUser", jgInstallationNotice.getNextExecuteIds());
-        commonService.rollbackTask(jgInstallationNotice.getInstanceId(), JSON.parseObject(JSON.toJSONString(jgInstallationNotice)));
+        commonService.rollbackTask(jgInstallationNotice.getInstanceId(), jsonObject);
     }
 
     @Transactional
@@ -633,6 +633,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskMap.put("relationId", jgTransferNotice.getInstanceId());
                 taskMap.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskMap.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+                taskMap.put("model", jgTransferNotice);
                 taskV2Model = commonService.updateTaskModel(taskMap);
             } else {
                 jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -9,13 +9,13 @@
     "type": "102",
     "pageType": "look",
     "name": "安装告知",
-    "url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&sequenceNbr=%s&roleIds=%s&&userId={userId}&nextExecuteIds=%s&formType=detail&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=detail"
   },
   {
     "type": "102",
     "pageType": "edit",
     "name": "安装告知",
-    "url": "/mixuap?appId=1742358052905971713&id=1734127099570057217&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&formType=edit&noticeStatus=%s&instanceId=%s"
+    "url": ""
   },
   {
     "type": "103",