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

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -162,7 +161,6 @@ public class JgMaintainNoticeDto extends BaseDto {
     @ApiModelProperty(value = "接收机构机构代码")
     private String receiveOrgCode;
 
-    @TableField(exist = false)
     @ApiModelProperty(value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -131,11 +130,9 @@ public class JgReformNoticeDto extends BaseDto {
     private String entrustingUnitName;
 
     @ApiModelProperty (value = "委托书附件")
-    @TableField(typeHandler = FastjsonTypeHandler.class)
     private List<JSONObject> powerOfAttorney;
 
     @ApiModelProperty (value = "施工合同附件")
-    @TableField(typeHandler = FastjsonTypeHandler.class)
     private List<JSONObject> constructionContract;
 
     @ApiModelProperty (value = "施工合同是否本单位与甲方直接签署")
@@ -163,7 +160,6 @@ public class JgReformNoticeDto extends BaseDto {
     private String equCategory;
     /* ----------------  -------------- */
 
-    @TableField (exist = false)
     @ApiModelProperty (value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 
@@ -228,4 +224,11 @@ public class JgReformNoticeDto extends BaseDto {
 
     @ApiModelProperty (value = "其他附件")
     private String otherAccessories;
+
+
+    /**
+     *工作流下一节点任务id
+     */
+    @ApiModelProperty (value = "工作流下一节点任务id")
+    private String nextTaskId;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/init/ApplicationRunnerImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.init;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import org.springframework.boot.ApplicationArguments;
@@ -20,18 +22,29 @@ public class ApplicationRunnerImpl implements ApplicationRunner {
 
     private CommonServiceImpl commonService;
 
-    public ApplicationRunnerImpl(JgUseRegistrationServiceImpl useRegistrationService, CommonServiceImpl commonService) {
+    private JgInstallationNoticeServiceImpl installationNoticeService;
+
+    public ApplicationRunnerImpl(JgUseRegistrationServiceImpl useRegistrationService,
+                                 CommonServiceImpl commonService,
+                                 JgInstallationNoticeServiceImpl installationNoticeService) {
         this.commonService = commonService;
         this.useRegistrationService = useRegistrationService;
+        this.installationNoticeService = installationNoticeService;
     }
 
 
     @Override
     public void run(ApplicationArguments args) {
         // TODO 增加删除启动时， 完成时
+        // 使用登记数据初始化
         List<JgUseRegistration> jgUseRegistrations = useRegistrationService.list(new LambdaQueryWrapper<JgUseRegistration>().ne(JgUseRegistration::getStatus, FlowStatusEnum.TO_BE_FINISHED.getName()));
         jgUseRegistrations.forEach(jgUseRegistration -> {
             commonService.saveExecuteFlowData2Redis(jgUseRegistration.getInstanceId(), useRegistrationService.buildInstanceRuntimeData(jgUseRegistration));
         });
+        // 安装告知数据初始化
+        List<JgInstallationNotice> jgInstallationNotices = installationNoticeService.list(new LambdaQueryWrapper<JgInstallationNotice>().ne(JgInstallationNotice::getNoticeStatus, FlowStatusEnum.TO_BE_FINISHED.getCode()));
+        jgInstallationNotices.forEach(jgInstallation -> {
+            commonService.saveExecuteFlowData2Redis(jgInstallation.getInstanceId(), installationNoticeService.buildInstanceRuntimeData(jgInstallation));
+        });
     }
 }