fix(jg):登记暂存接口修改

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

@@ -352,6 +352,15 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty("end_latitude_longitude")
     private JSONObject endLatitudeLongitude;
 
+    /**
+     * 证书打印标记
+     */
     @ApiModelProperty("证书打印标记")
     private String certificatePrintTag;
+
+    /**
+     * 是否暂存状态（0-否，1-是）
+     */
+    @ApiModelProperty("是否暂存状态（0-否，1-是）")
+    private String isTemporaryStatus;
 }

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

@@ -245,4 +245,7 @@ public class JgMaintainNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "工程装置id")
     private String projectContraptionId;
+
+    @ApiModelProperty("是否暂存状态（0-否，1-是）")
+    private String isTemporaryStatus;
 }

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

@@ -289,4 +289,10 @@ public class JgReformNoticeDto extends BaseDto {
 
     @ApiModelProperty("管道改造的长度变化值（正值为增加，负值为减少）-压力管道用")
     private String pipeLengthChanged;
+
+    /**
+     * 是否暂存状态（0-否，1-是）
+     */
+    @ApiModelProperty("是否暂存状态（0-否，1-是）")
+    private String isTemporaryStatus;
 }

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

@@ -262,4 +262,10 @@ public class JgTransferNoticeDto extends BaseDto {
     @ApiModelProperty (value = "设备种类编码")
     private String equListCode;
 
+    @ApiModelProperty (value = "设备种类编码")
+    private String equCategoryCode;
+
+    @ApiModelProperty("是否暂存状态（0-否，1-是）")
+    private String isTemporaryStatus;
+
 }

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

@@ -398,4 +398,10 @@ public class JgMaintainNotice extends BaseEntity {
      */
     @TableField("project_contraption_id")
     private String projectContraptionId;
+
+    /**
+     * 是否暂存状态（0-否，1-是）
+     */
+    @TableField("is_temporary_status")
+    private String isTemporaryStatus;
 }

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

@@ -419,4 +419,10 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField("pipe_length_changed")
     private String pipeLengthChanged;
+
+    /**
+     * 是否暂存状态（0-否，1-是）
+     */
+    @TableField("is_temporary_status")
+    private String isTemporaryStatus;
 }

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

@@ -305,6 +305,9 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(value = "equ_category")
     private String equCategory;
 
+    @TableField(value = "equ_category_code")
+    private String equCategoryCode;
+
     @TableField(value = "equ_list")
     private String equList;
 
@@ -340,4 +343,10 @@ public class JgTransferNotice extends BaseEntity {
      */
     @TableField("receive_company_org_code")
     private String receiveCompanyOrgCode;
+
+    /**
+     * 是否暂存状态（0-否，1-是）
+     */
+    @TableField("is_temporary_status")
+    private String isTemporaryStatus;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgInstallationNoticeService.java

@@ -92,5 +92,5 @@ public interface IJgInstallationNoticeService extends IService<JgInstallationNot
 
     Page<JgNoticeToBeSubmitDto> queryNoticeToBeSubmitPage(Page<JgNoticeToBeSubmitDto> page, ReginParams selectedOrgInfo);
 
-    Map<String, Map<String, Object>> getNoticeToBeSubmitDetails(Long sequenceNbr, CompanyBo company, String businessType);
+    Map<String, Map<String, Object>> getNoticeToBeSubmitDetails(Long sequenceNbr, ReginParams reginParams, String businessType);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -393,13 +393,11 @@
             'GZ_AZ' AS type,
             isn.apply_no AS applyNo,
             ec1.name AS equListName,
-            ec2.name AS equCategoryName,
             isn.receive_org_name AS receiveOrgName,
             CASE isn.notice_status WHEN '6610' THEN '待提交' ELSE isn.notice_status END AS status,
-            DATE_FORMAT(isn.create_date, '%Y-%m-%d') AS createDate
+            DATE_FORMAT(isn.notice_date, '%Y-%m-%d') AS createDate
         FROM tzs_jg_installation_notice isn
              LEFT JOIN tz_equipment_category ec1 ON ec1.code = isn.equ_list_code
-             LEFT JOIN tz_equipment_category ec2 ON ec2.code = isn.equ_category_code
         WHERE isn.is_delete = false AND isn.notice_status = '6610'
           AND isn.install_unit_credit_code = #{companyCode}
         UNION ALL
@@ -409,7 +407,6 @@
             'GZ_GZ' AS type,
             isn.apply_no AS applyNo,
             isn.equ_list_name AS equListName,
-            isn.equ_category_name AS equCategoryName,
             isn.receive_org_name AS receiveOrgName,
             CASE isn.notice_status WHEN '6610' THEN '待提交' ELSE isn.notice_status END AS status,
             DATE_FORMAT(isn.create_date, '%Y-%m-%d') AS createDate
@@ -423,13 +420,11 @@
             'GZ_WX' AS type,
             isn.apply_no AS applyNo,
             ec1.name AS equListName,
-            ec2.name AS equCategoryName,
             isn.receive_org_name AS receiveOrgName,
             CASE isn.notice_status WHEN '6610' THEN '待提交' ELSE isn.notice_status END AS status,
             DATE_FORMAT(isn.create_date, '%Y-%m-%d') AS createDate
         FROM tzs_jg_maintain_notice isn
          LEFT JOIN tz_equipment_category ec1 ON ec1.code = isn.equ_list_code
-         LEFT JOIN tz_equipment_category ec2 ON ec2.code = isn.equ_category
         WHERE isn.is_delete = false AND isn.notice_status = '6610'
           AND isn.install_unit_credit_code = #{companyCode}
         UNION ALL
@@ -439,13 +434,11 @@
             'GZ_YZ' AS type,
             isn.apply_no AS applyNo,
             ec1.name AS equListName,
-            ec2.name AS equCategoryName,
             isn.receive_org_name AS receiveOrgName,
             CASE isn.notice_status WHEN '6610' THEN '待提交' ELSE isn.notice_status END AS status,
             DATE_FORMAT(isn.create_date, '%Y-%m-%d') AS createDate
         FROM tzs_jg_transfer_notice isn
              LEFT JOIN tz_equipment_category ec1 ON ec1.code = isn.equ_list_code
-             LEFT JOIN tz_equipment_category ec2 ON ec2.code = isn.equ_category_code
         WHERE isn.is_delete = false
           AND isn.notice_status = '6610'
           AND isn.install_unit_credit_code = #{companyCode}

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

@@ -215,6 +215,6 @@ public class JgInstallationNoticeController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "4个告知暂存详情查询", notes = "4个告知暂存详情查询")
     public ResponseModel<Map<String, Map<String, Object>>> getNoticeToBeSubmitDetails(@RequestParam("sequenceNbr") Long sequenceNbr,
                                                                                       @RequestParam("businessType") String businessType) {
-        return ResponseHelper.buildResponse(iJgInstallationNoticeService.getNoticeToBeSubmitDetails(sequenceNbr, getSelectedOrgInfo().getCompany(), businessType));
+        return ResponseHelper.buildResponse(iJgInstallationNoticeService.getNoticeToBeSubmitDetails(sequenceNbr, getSelectedOrgInfo(), businessType));
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/ToBeSubmitDetailStrategyFactory.java

+package com.yeejoin.amos.boot.module.jg.biz.handler;
+
+import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class ToBeSubmitDetailStrategyFactory {
+
+    private final Map<String, ToBeSubmitDetailStrategy> strategyMap = new HashMap<>();
+
+    @Autowired
+    public ToBeSubmitDetailStrategyFactory(List<ToBeSubmitDetailStrategy> strategies) {
+        for (ToBeSubmitDetailStrategy strategy : strategies) {
+            strategyMap.put(strategy.supportBusinessType(), strategy);
+        }
+    }
+
+    public ToBeSubmitDetailStrategy getStrategy(String businessType) {
+        ToBeSubmitDetailStrategy strategy = strategyMap.get(businessType);
+        if (strategy == null) {
+            throw new IllegalArgumentException("Unsupported businessType: " + businessType);
+        }
+        return strategy;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/strategy/ToBeSubmitDetailStrategy.java

+package com.yeejoin.amos.boot.module.jg.biz.handler.strategy;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import java.util.Map;
+
+/**
+ * 告知类暂存跳转
+ */
+public interface ToBeSubmitDetailStrategy {
+    /**
+     * 返回指定类型告知的 notice + basic 信息
+     */
+    Map<String, Map<String, Object>> getDetails(Long sequenceNbr, ReginParams reginParams);
+
+    /**
+     * 返回支持的业务类型（如 安装告知、改造告知等）
+     */
+    String supportBusinessType();
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/InstallNoticeStrategyHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.handler.toBeSubmit;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class InstallNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
+
+    @Autowired
+    private JgInstallationNoticeServiceImpl jgInstallationNoticeService;
+
+    @Override
+    public Map<String, Map<String, Object>> getDetails(Long sequenceNbr, ReginParams reginParams) {
+        Map<String, Map<String, Object>> notice = jgInstallationNoticeService.queryBySequenceNbr(sequenceNbr, reginParams.getCompany());
+
+        Map<String, Object> installationInfo = notice.get("installationInfo");
+
+        Map<String, Object> basic = new HashMap<>();
+        basic.put("type", ApplicationFormTypeEnum.AZGZ.getBusinessCode());
+        basic.put("receiveOrgCreditCode", installationInfo.get("receiveOrgCreditCode"));
+
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        result.put("notice", installationInfo);
+        result.put("basic", basic);
+        return result;
+    }
+
+    @Override
+    public String supportBusinessType() {
+        return BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName();
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/MaintainNoticeStrategyHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.handler.toBeSubmit;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintainNoticeServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class MaintainNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
+
+    @Autowired
+    private JgMaintainNoticeServiceImpl jgMaintainNoticeService;
+
+    @Override
+    public Map<String, Map<String, Object>> getDetails(Long sequenceNbr, ReginParams reginParams) {
+        Map<String, Map<String, Object>> notice = jgMaintainNoticeService.queryBySequenceNbr(sequenceNbr, reginParams.getCompany());
+        Map<String, Object> maintainInfo = notice.get("maintainInfo");
+
+        Map<String, Object> basic = new HashMap<>();
+        basic.put("type", ApplicationFormTypeEnum.WXGZ.getBusinessCode());
+        basic.put("receiveOrgCreditCode", maintainInfo.get("receiveOrgCreditCode"));
+
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        result.put("notice", maintainInfo);
+        result.put("basic", basic);
+        return result;
+    }
+
+    @Override
+    public String supportBusinessType() {
+        return BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName();
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/ReformNoticeStrategyHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.handler.toBeSubmit;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgReformNoticeServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class ReformNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
+
+    @Autowired
+    private JgReformNoticeServiceImpl jgReformNoticeService;
+
+    @Override
+    public Map<String, Map<String, Object>> getDetails(Long sequenceNbr, ReginParams reginParams) {
+        Map<String, Object> reformNotice = jgReformNoticeService.queryBySequenceNbr(sequenceNbr);
+
+        Map<String, Object> basic = new HashMap<>();
+        basic.put("type", ApplicationFormTypeEnum.GZGZ.getBusinessCode());
+        basic.put("receiveOrgCreditCode", reformNotice.get("receiveOrgCode"));
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        result.put("notice", reformNotice);
+        result.put("basic", basic);
+        return result;
+    }
+
+    @Override
+    public String supportBusinessType() {
+        return BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName();
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/RegistrationReformStrategyHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.handler.toBeSubmit;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class RegistrationReformStrategyHandler implements ToBeSubmitDetailStrategy {
+
+    @Autowired
+    private JgChangeRegistrationReformServiceImpl registrationReformService;
+
+    @Override
+    public Map<String, Map<String, Object>> getDetails(Long sequenceNbr, ReginParams reginParams) {
+        Map<String, Object> notice = registrationReformService.getDetail(String.valueOf(sequenceNbr), "", reginParams.getCompany());
+        Map<String, Object> basic = new HashMap<>();
+        Map<String, Object> useRegFormUpload = new HashMap<>();
+        basic.put("type", ApplicationFormTypeEnum.GZBG.getBusinessCode());
+        basic.put("receiveOrgCreditCode1", notice.get("receiveCompanyCode"));
+        basic.put("businessScenarios", "0");
+        basic.put("code", notice.get("equList"));
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        result.put("notice", notice);
+        result.put("basic", basic);
+        result.put("techInfo", (Map<String, Object>) notice.get("techInfo"));
+        useRegFormUpload.put("uploadMode", notice.get("uploadMode"));
+        useRegFormUpload.put("useRegistrationFormUrl", notice.get("useRegistrationFormUrl"));
+        useRegFormUpload.put("applicationFormFileUrl", notice.get("applicationFormFileUrl"));
+        useRegFormUpload.put("applyNo", notice.get("applyNo"));
+        result.put("useRegFormUpload", useRegFormUpload);
+        return result;
+    }
+
+    @Override
+    public String supportBusinessType() {
+        return BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName();
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/RegistrationTransferStrategyHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.handler.toBeSubmit;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationTransferServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class RegistrationTransferStrategyHandler implements ToBeSubmitDetailStrategy {
+
+    @Autowired
+    private JgChangeRegistrationTransferServiceImpl registrationTransferService;
+
+    @Override
+    public Map<String, Map<String, Object>> getDetails(Long sequenceNbr, ReginParams reginParams) {
+        Map<String, Map<String, Object>> notice = registrationTransferService.getTransferDetail(String.valueOf(sequenceNbr), reginParams.getCompany());
+        Map<String, Object> basic = new HashMap<>();
+        basic.put("type", ApplicationFormTypeEnum.YZBG.getBusinessCode());
+        basic.put("code", notice.get("equList"));
+        basic.put("equCategory", notice.get("EQU_CATEGORY_CODE"));
+        basic.put("receiveOrgCreditCode1", notice.get("changeRegistrationTransfer").get("receiveCompanyCode"));
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        result.put("notice", notice.get("changeRegistrationTransfer"));
+        result.put("basic", basic);
+        return result;
+    }
+
+    @Override
+    public String supportBusinessType() {
+        return BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName();
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/TransferNoticeStrategyHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.handler.toBeSubmit;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgTransferNoticeServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class TransferNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
+
+    @Autowired
+    private JgTransferNoticeServiceImpl jgTransferNoticeService;
+
+    @Override
+    public Map<String, Map<String, Object>> getDetails(Long sequenceNbr, ReginParams reginParams) {
+        Map<String, Map<String, Object>> notice = jgTransferNoticeService.queryBySequenceNbr(sequenceNbr, reginParams.getCompany());
+        Map<String, Object> transferInfo = notice.get("transferNoticeInfo");
+
+        Map<String, Object> basic = new HashMap<>();
+        basic.put("type", ApplicationFormTypeEnum.YZGZ.getBusinessCode());
+        basic.put("receiveOrgCreditCode", transferInfo.get("receiveOrgCreditCode"));
+
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        result.put("notice", transferInfo);
+        result.put("basic", basic);
+        return result;
+    }
+
+    @Override
+    public String supportBusinessType() {
+        return BusinessTypeEnum.JG_ADVICE_REMOVAL.getName();
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/UseRegistrationStrategyHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.handler.toBeSubmit;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class UseRegistrationStrategyHandler implements ToBeSubmitDetailStrategy {
+
+    @Autowired
+    private JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
+
+    @Override
+    public Map<String, Map<String, Object>> getDetails(Long sequenceNbr, ReginParams reginParams) {
+        Map<String, Object> notice = jgUseRegistrationServiceImpl.getDetail("", sequenceNbr, reginParams);
+        Map<String, Object> basic = new HashMap<>();
+        Map<String, Object> useRegFormUpload = new HashMap<>();
+        basic.put("type", ApplicationFormTypeEnum.SYDJ.getBusinessCode());
+        basic.put("businessScenarios", "0");
+        basic.put("receiveOrgCreditCode1", notice.get("receiveOrgCode"));
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        result.put("notice", notice);
+        result.put("basic", basic);
+        useRegFormUpload.put("uploadMode", notice.get("uploadMode"));
+        useRegFormUpload.put("useRegistrationFormUrl", notice.get("useRegistrationFormUrl"));
+        result.put("useRegFormUpload", useRegFormUpload);
+        return result;
+    }
+
+    @Override
+    public String supportBusinessType() {
+        return BusinessTypeEnum.JG_USAGE_REGISTRATION.getName();
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/VehicleRegistrationStrategyHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.handler.toBeSubmit;
+
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.vo.JgVehicleInformationVo;
+import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgVehicleInformationServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class VehicleRegistrationStrategyHandler implements ToBeSubmitDetailStrategy {
+
+    @Autowired
+    private JgVehicleInformationServiceImpl vehicleInformationService;
+
+    @Override
+    @ResultFieldMapping({@ResultFieldMapping.ResultFieldMap(sourceField = "notice.estateUnitName", targetField = "notice.estateUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")})
+    public Map<String, Map<String, Object>> getDetails(Long sequenceNbr, ReginParams reginParams) {
+        JgVehicleInformationVo vo = vehicleInformationService.queryBySequenceNbr(sequenceNbr);
+        Map<String, Object> basic = new HashMap<>();
+        Map<String, Object> useRegFormUpload = new HashMap<>();
+        basic.put("type", ApplicationFormTypeEnum.SYDJ.getBusinessCode());
+        basic.put("receiveOrgCreditCode1", vo.getReceiveOrgCode());
+        basic.put("businessScenarios", "1");
+        basic.put("code", "2300");
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        useRegFormUpload.put("useRegistrationFormUrl", vo.getUseRegistrationFormUrl());
+        result.put("notice", Bean.BeantoMap(vo));
+        result.put("basic", basic);
+        result.put("useRegFormUpload", useRegFormUpload);
+        return result;
+    }
+
+    @Override
+    public String supportBusinessType() {
+        return BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName();
+    }
+}

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

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
@@ -571,9 +572,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if ("add".equals(submitType)) {
             projectContraption.setCreateDate(date);
         }
-        if (StringUtils.isEmpty(projectContraption.getProjectContraption())) {
-            throw new BadRequest("请填写工程（装置）名称/项目名称后暂存！");
+        if (Stream.of(projectContraption.getProjectContraption(), projectContraption.getProjectContraptionNo())
+                .anyMatch(StringUtils::isEmpty)) {
+            throw new BadRequest("请填写工程（装置）名称/项目名称/工程装置编号后暂存！");
         }
+        idxBizJgProjectContraptionService.checkTheUnitProConMatching(EquipRequestParamsDto.builder()
+                .projectContraptionNo(projectContraption.getProjectContraptionNo())
+                .projectContraption(projectContraption.getProjectContraption())
+                .companyCode(MapUtil.getStr(companyInfoMap,"creditCode"))
+                .build());
         idxBizJgProjectContraptionService.saveOrUpdateData(projectContraption);
 
         List<IdxBizJgUseInfo> useInfoList = initializeList();
@@ -3799,14 +3806,16 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (EQUIP_MAINPARTS_FORM_ID.equals(subFormType) && !ValidationUtil.isEmpty(list)) {
             for (Object s : list) {
                 JSONArray subFormMainPartsList = JSON.parseArray(toJSONString(map.get(s)));
-                subFormMainPartsList.forEach(data -> {
-                    JSONObject jsonObject = (JSONObject) data;
-                    IdxBizJgMainParts mainParts = jsonObject.toJavaObject(IdxBizJgMainParts.class);
-                    mainParts.setRecord(record);
-                    mainParts.setRecDate(date);
-                    mainParts.setSequenceNbr("save".equals(type) ? null : String.valueOf(jsonObject.get("MAINPARTS_SEQ")));
-                    mainPartsList.add(mainParts);
-                });
+                if (!ObjectUtils.isEmpty(subFormMainPartsList)) {
+                    subFormMainPartsList.forEach(data -> {
+                        JSONObject jsonObject = (JSONObject) data;
+                        IdxBizJgMainParts mainParts = jsonObject.toJavaObject(IdxBizJgMainParts.class);
+                        mainParts.setRecord(record);
+                        mainParts.setRecDate(date);
+                        mainParts.setSequenceNbr("save".equals(type) ? null : String.valueOf(jsonObject.get("MAINPARTS_SEQ")));
+                        mainPartsList.add(mainParts);
+                    });
+                }
             }
             return mainPartsList;
         } else if (EQUIP_PROTECTIONDEVICES_FORM_ID.equals(subFormType) && !ValidationUtil.isEmpty(list)) {

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -254,15 +255,20 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             String companyCode = CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
                     reginParams.getCompany().getCompanyCode().split("_")[1] : reginParams.getCompany().getCompanyCode();
             String equListCode = map.getString("EQU_LIST_CODE");
+            //非管道类
             if(!equListCode.equals(EquipmentClassifityEnum.YLGD.getCode())){
                 UseInfo useInfo = new UseInfo();
-                String equipId = map.get("record").toString();
+                String equipId = Objects.toString(map.get("record"),null);
                 LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
                 lambda.eq(UseInfo::getRecord, equipId);
                 // 提交时进行校验设备是否在流程中使用（并发及同时打开多个相同的页面时才会出现此种情况）
                 this.checkForRepeatUsedEquip(map, equipId, reginParams);
                 // 使用登记信息
-                JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
+                //JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
+                String sequenceNbr = Objects.toString(map.get("sequenceNbr"),null);
+                JgChangeRegistrationReform jgChangeRegistrationReform = ValidationUtil.isEmpty(sequenceNbr)
+                        ? new JgChangeRegistrationReform()
+                        : this.getBaseMapper().selectById(sequenceNbr);
                 LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
                 otherLambda.eq(OtherInfo::getRecord, equipId);
                 OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
@@ -288,6 +294,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 CompanyBo companyBo = commonServiceImpl.getOneCompany(jgChangeRegistrationReform.getReceiveCompanyCode());
                 jgChangeRegistrationReform.setReceiveCompanyOrgCode(companyBo.getOrgCode());
                 JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
+                jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(BUSINESS_TYPE, String.valueOf(map.get("applyNo"))));
                 //使用登记编号
                 jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
                 //登记类别
@@ -315,31 +322,40 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
                     jgChangeRegistrationReformEq.setEquId(equipId);
                     jgChangeRegistrationReformEqMapper.updateById(jgChangeRegistrationReformEq);
-                    jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(BUSINESS_TYPE, String.valueOf(map.get("applyNo"))));
+                    //jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(BUSINESS_TYPE, String.valueOf(map.get("applyNo"))));
                     jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
                 } else {
                     //暂存处理
                     // 业务管理设备信息保存
                     JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
                     jgChangeRegistrationReformEq.setEquId(equipId);
-                    ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
-                    if (!result.getResult().isEmpty()) {
-                        jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
-                    } else {
-                        throw new BadRequest("申请单编号生成失败,请稍后重试!");
+                    if (ValidationUtil.isEmpty(jgChangeRegistrationReform.getApplyNo())){
+                        ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
+                        if (!result.getResult().isEmpty()) {
+                            jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
+                        } else {
+                            throw new BadRequest("申请单编号生成失败,请稍后重试!");
+                        }
                     }
                     jgChangeRegistrationReform.setRegDate(new Date());
                     jgChangeRegistrationReform.setCreateDate(new Date());
                     jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
                     jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
-                    this.save(jgChangeRegistrationReform);
-                    jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
+                    this.saveOrUpdate(jgChangeRegistrationReform);
+
+                    //删除旧的关系表和历史
+                    if (!ValidationUtil.isEmpty(sequenceNbr)) {
+                        LambdaQueryWrapper<JgChangeRegistrationReformEq> reformEqLambdaQueryWrapper = Wrappers.<JgChangeRegistrationReformEq>lambdaQuery()
+                                .eq(JgChangeRegistrationReformEq::getEquipTransferId, sequenceNbr);
+                        jgChangeRegistrationReformEqMapper.delete(reformEqLambdaQueryWrapper);
+                    }
+                    jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr()+ "");
                     jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
                     //当前单据id
                     jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
-                    jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
+                    jgRegistrationHistoryServiceImpl.saveOrUpdate(jgRegistrationHistory);
                     //暂存时生成待办数据
-                    List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, null));
+                    List<TaskModelDto> taskModelDtoList = Collections.singletonList(getTaskModelDtoList(jgChangeRegistrationReform, null));
                     commonServiceImpl.buildTaskModel(taskModelDtoList);
                 }
                 if (!ObjectUtils.isEmpty(map.get("submit"))) {
@@ -374,7 +390,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 String projectContraptionId = map.getString("projectContraptionId");
                 IdxBizJgProjectContraption jgProjectContraption = jgProjectContraptionService.getById(projectContraptionId);
                 // 使用登记信息
-                JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
+                //JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
+                String sequenceNbr = Objects.toString(map.get("sequenceNbr"),null);
+                JgChangeRegistrationReform jgChangeRegistrationReform = ValidationUtil.isEmpty(sequenceNbr) ? new JgChangeRegistrationReform() :
+                        this.getBaseMapper().selectById(sequenceNbr);
                 jgChangeRegistrationReform.setSupervisoryCode(jgProjectContraption.getSupervisoryCode());
                 jgChangeRegistrationReform.setUseUnitName(reginParams.getCompany().getCompanyName());
                 jgChangeRegistrationReform.setUseUnitCreditCode(companyCode);
@@ -431,14 +450,14 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     jgChangeRegistrationReform.setCreateDate(new Date());
                     jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
                     jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
-                    this.save(jgChangeRegistrationReform);
+                    this.saveOrUpdate(jgChangeRegistrationReform);
                     // 2.关系表保存
                     saveEqRelation(reginParams, equipmentLists, jgChangeRegistrationReform);
                     // 3.历史表保存
                     jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
                     // 原有汇总表保存 用来来恢复技术参数
                     this.setOldData(jgRegistrationHistory, jgChangeRegistrationReform);
-                    jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
+                    jgRegistrationHistoryServiceImpl.saveOrUpdate(jgRegistrationHistory);
                 }
                 if (!ObjectUtils.isEmpty(map.get("submit"))) {
                     String instanceId = "";
@@ -511,12 +530,15 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     private void saveEqRelation(ReginParams reginParams, List<Map<String, Object>> equipmentLists, JgChangeRegistrationReform jgChangeRegistrationReform) {
+        LambdaQueryWrapper<JgChangeRegistrationReformEq> deleteWrapper = Wrappers.lambdaQuery();
+        deleteWrapper.eq(JgChangeRegistrationReformEq::getEquipTransferId, jgChangeRegistrationReform.getSequenceNbr());
+        jgChangeRegistrationReformEqServiceImpl.remove(deleteWrapper);
         List<JgChangeRegistrationReformEq> registrationReformEqs = new ArrayList<>();
         for (Map<String, Object> equip : equipmentLists) {
             String record = equip.get("record").toString();
             JgChangeRegistrationReformEq jgChangeRegistrationReformEq =  new JgChangeRegistrationReformEq();
             jgChangeRegistrationReformEq.setEquId(record);
-            jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
+            jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr() +"");
             jgChangeRegistrationReformEq.setRecUserId(reginParams.getUserModel().getUserId());
             jgChangeRegistrationReformEq.setRecDate(new Date());
             registrationReformEqs.add(jgChangeRegistrationReformEq);
@@ -1490,6 +1512,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             Map<String, Object> originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(registerInfo.getRecord());
             detail.putAll(originalDataOther);
             detail.put("techInfo", originalData);
+            detail.remove("sequenceNbr");
 //            return jgChangeRegistrationTransferService.getDetailFieldCamelCase(registerInfo.getRecord());
 //
         }

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -242,7 +243,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             }
 
             CompanyBo company = reginParams.getCompany();
-            String sequenceNbr = (String) map.get("sequenceNbr");
+            String sequenceNbr = MapUtil.getStr(tableData,"sequenceNbr");
             String receiveOrgCode = (String) tableData.get("receiveOrgCode");
             String receiveOrgName = "";
 
@@ -343,10 +344,15 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             //设备移装详细地址
             oldTransfer.setFullAddress(fullAddress);
             oldTransfer.setTransferType((String) tableData.get("transferType"));
+            oldTransfer.setEquipListName(Optional.of(deviceList)
+                    .flatMap(list -> list.stream()
+                            .findFirst()
+                            .map(json -> json.getString("EQU_LIST")))
+                    .orElse(""));
             if (!ObjectUtils.isEmpty(tableData.get("otherAccessories"))) {
                 oldTransfer.setOtherAccessories(JSONObject.toJSONString(tableData.get("otherAccessories")));
             }
-
+            oldTransfer.setCreateDate(new Date());
             //保存【移装变更登记】基本信息
             if (!ValidationUtil.isEmpty(oldTransfer)) {
                 this.saveOrUpdate(oldTransfer);

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.util.StringUtil;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
@@ -44,6 +43,8 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCur
 import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.boot.module.jg.biz.handler.ToBeSubmitDetailStrategyFactory;
+import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService;
@@ -209,6 +210,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private JgMaintainNoticeServiceImpl jgMaintainNoticeService;
     @Autowired
     private JgUseRegistrationMapper jgUseRegistrationMapper;
+    @Autowired
+    private ToBeSubmitDetailStrategyFactory toBeSubmitDetailStrategyFactory;
 
 
     /**
@@ -879,33 +882,36 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             // 获取告知设备列表
             List<Map<String, Object>> deviceList = model.getDeviceList();
             // 提交时对设备状态进行校验（处理并发问题，一个未被使用的设备同时被多个使用这打开，同时提交发起申请） todo 回滚异常未写
-            if (SUBMIT_TYPE_FLOW.equals(submitType)) {//提交
+            if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 if (CollectionUtils.isEmpty(deviceList)) {
                     throw new BadRequest("设备列表为空");
                 }
                 this.repeatUsedEquipCheck(deviceList, reginParams.getCompany().getCompanyCode());
             }
-            // 获取告知单号
-            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.AZGZ.getCode(), 1);
-            if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
-                log.error("告知单获取失败: {}", listResponseModel.getMessage());
-                throw new BadRequest("告知单生成失败！");
-            }
-            List<String> applyNoList = listResponseModel.getResult();
-            if (CollectionUtils.isEmpty(applyNoList)) {
-                log.error("告知单返回为空");
-                throw new BadRequest("告知单生成失败！");
+            List<String> applyNoList = new ArrayList<>();
+            if (ValidationUtil.isEmpty(model.getApplyNo())){
+                // 获取告知单号
+                ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.AZGZ.getCode(), 1);
+                if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
+                    log.error("告知单获取失败: {}", listResponseModel.getMessage());
+                    throw new BadRequest("告知单生成失败！");
+                }
+                applyNoList = listResponseModel.getResult();
+                if (CollectionUtils.isEmpty(applyNoList)) {
+                    log.error("告知单返回为空");
+                    throw new BadRequest("告知单生成失败！");
+                }
+            }else{
+                applyNoList.add(model.getApplyNo());
             }
 
             // 启动工作流并返回信息
             List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList, model.getReceiveOrgCreditCode());
-
             List<JgInstallationNotice> list = new ArrayList<>();
             List<JgInstallationNoticeEq> equipList = new ArrayList<>();
             // 业务数据组装等
             businessData(submitType, reginParams, model, deviceList, applyNoList, list, equipList, workflowResultList);
-
-            jgInstallationNoticeMapper.insertBatchSomeColumn(list);
+            this.saveOrUpdateBatch(list);
             // 如果为保存并提交，则创建代办
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 buildTask(list, workflowResultList, Boolean.TRUE);
@@ -919,6 +925,11 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
             }).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(jgRelationEquipList)){
+                if (!ValidationUtil.isEmpty(model.getSequenceNbr())) {
+                    LambdaQueryWrapper<JgInstallationNoticeEq> lambda = new QueryWrapper<JgInstallationNoticeEq>().lambda();
+                    lambda.eq(JgInstallationNoticeEq::getEquipTransferId, model.getSequenceNbr());
+                    jgInstallationNoticeEqMapper.delete(lambda);
+                }
                 jgInstallationNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
             }
             this.updateRedisBatch(list);
@@ -1048,9 +1059,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             dto.setInstanceStatus(workflowResultList.get(0).getNextExecutorRoleIds() + "," + workflowResultList.get(0).getExecutorRoleIds());
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setNextTaskId(workflowResultList.get(0).getNextTaskId());
+            dto.setIsTemporaryStatus("0");
         } else {
             dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
         }
+        if (SUBMIT_TYPE_TEMP.equals(submitType)) {
+            dto.setIsTemporaryStatus("1");
+        }
         dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
         dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
         dto.setEntrustingUnitName(dto.getUseUnitName());
@@ -1064,6 +1079,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
         dto.setCreateUserName(reginParams.getUserModel().getRealName());
         dto.setCreateUserId(reginParams.getUserModel().getUserId());
+        dto.setCreateDate(new Date());
         list.add(dto);
         if (!CollectionUtils.isEmpty(deviceList)){
             deviceList.forEach(obj -> {
@@ -1436,7 +1452,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                                                 .approvalUnitCode(jgInstallationNotice.getReceiveOrgCreditCode())
                                                 .status("正常")
                                                 .changeContent(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "业务办理")
-                                        .routePath(taskV2Model1.getRoutePath())
+                                                .routePath(taskV2Model1.getRoutePath())
                                                 .build())
                                         .collect(Collectors.toList())
                         );
@@ -2067,26 +2083,46 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         return jgInstallationNoticeMapper.queryNoticeToBeSubmitPage(page, companyCode);
     }
 
-    @Override
-    public Map<String, Map<String, Object>> getNoticeToBeSubmitDetails(Long sequenceNbr, CompanyBo company, String businessType) {
-        Map<String, Map<String, Object>> notice = null;
-
+    @ResultFieldMapping({
+            @ResultFieldMapping.ResultFieldMap(sourceField = "notice.useUnitCreditCode", targetField = "notice.useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
+            @ResultFieldMapping.ResultFieldMap(sourceField = "notice.propertyUnitName", targetField = "notice.propertyUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")
+    })
+    public Map<String, Map<String, Object>> getNoticeToBeSubmitDetails1(Long sequenceNbr, CompanyBo company, String businessType) {
+        Map<String, Map<String, Object>> notice = new HashMap<>();
         switch (businessType) {
             case "安装告知":
                 notice = this.queryBySequenceNbr(sequenceNbr, company);
                 notice.put("notice", notice.get("installationInfo"));
+                Map<String, Object> basicObject = new HashMap<>();
+                basicObject.put("type", ApplicationFormTypeEnum.AZGZ.getBusinessCode());
+                basicObject.put("receiveOrgCreditCode", notice.get("installationInfo").get("receiveOrgCreditCode"));
+                notice.put("basic", basicObject);
                 notice.remove("installationInfo");
                 break;
             case "改造告知":
-                jgReformNoticeService.queryBySequenceNbr(sequenceNbr);
+                Map<String, Object> reformNotice = jgReformNoticeService.queryBySequenceNbr(sequenceNbr);
+                notice.put("notice", reformNotice);
+                Map<String, Object> basicObject1 = new HashMap<>();
+                basicObject1.put("type", ApplicationFormTypeEnum.GZGZ.getBusinessCode());
+                basicObject1.put("receiveOrgCreditCode", reformNotice.get("receiveOrgCode"));
+                notice.put("basic", basicObject1);
                 break;
             case "维修告知":
                 notice = jgMaintainNoticeService.queryBySequenceNbr(sequenceNbr, company);
+                Map<String, Object> basicObject2 = new HashMap<>();
+                basicObject2.put("type", ApplicationFormTypeEnum.WXGZ.getBusinessCode());
+                basicObject2.put("receiveOrgCreditCode", notice.get("maintainInfo").get("receiveOrgCreditCode"));
                 notice.put("notice", notice.get("maintainInfo"));
+                notice.put("basic", basicObject2);
                 break;
             case "移装告知":
                 notice = jgTransferNoticeService.queryBySequenceNbr(sequenceNbr, company);
-                notice.put("notice", notice.get("transferInfo"));
+                notice.put("notice", notice.get("transferNoticeInfo"));
+                Map<String, Object> basicObject3 = new HashMap<>();
+                basicObject3.put("type", ApplicationFormTypeEnum.YZGZ.getBusinessCode());
+                basicObject3.put("receiveOrgCreditCode", notice.get("transferNoticeInfo").get("receiveOrgCreditCode"));
+                notice.put("notice", notice.get("transferNoticeInfo"));
+                notice.put("basic", basicObject3);
                 break;
             default:
                 this.queryBySequenceNbr(sequenceNbr, company);
@@ -2094,6 +2130,16 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         return notice;
     }
 
+    @ResultFieldMapping({
+            @ResultFieldMapping.ResultFieldMap(sourceField = "notice.useUnitCreditCode", targetField = "notice.useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
+            @ResultFieldMapping.ResultFieldMap(sourceField = "notice.propertyUnitName", targetField = "notice.propertyUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")
+    })
+    @Override
+    public Map<String, Map<String, Object>> getNoticeToBeSubmitDetails(Long sequenceNbr, ReginParams reginParams, String businessType) {
+        ToBeSubmitDetailStrategy strategy = toBeSubmitDetailStrategyFactory.getStrategy(businessType);
+        return strategy.getDetails(sequenceNbr, reginParams);
+    }
+
     @Override
     public boolean beforeCheck(JgInstallationNotice notice) {
         return notice.getInstanceId() != null && !notice.getNoticeStatus().equals(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode())) &&!notice.getNoticeStatus().equals(String.valueOf(FlowStatusEnum.TO_BE_DISCARD.getCode()));

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

@@ -85,6 +85,7 @@ import java.util.stream.Collectors;
 public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto, JgMaintainNotice, JgMaintainNoticeMapper> implements IJgMaintainNoticeService, ICompensateFlowDataOfRedis<JgMaintainNotice> {
 
     private static final String SUBMIT_TYPE_FLOW = "1";
+    private static final String SUBMIT_TYPE_TEMP = "3";
     private static final String PROCESS_DEFINITION_KEY = "maintainNotice";
     private static final String TABLE_PAGE_ID = "maintainInfo";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("6610", "6614", "6615", "6617", "6616");
@@ -596,14 +597,19 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 }
                 this.repeatUsedEquipCheck(deviceList, reginParams.getCompany().getCompanyCode());
             }
-            // 获取告知单号
-            ResponseModel<List<String>> applyNoResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), 1);
-
-            if (CollectionUtils.isEmpty(applyNoResult.getResult())) {
-                log.error(" 获取告知单号失败");
-                throw new RuntimeException();
+            String applyNo;
+            if (ValidationUtil.isEmpty(model.getApplyNo())){
+                // 获取告知单号
+                ResponseModel<List<String>> applyNoResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), 1);
+                if (CollectionUtils.isEmpty(applyNoResult.getResult())) {
+                    log.error(" 获取告知单号失败");
+                    throw new RuntimeException();
+                }
+                applyNo = applyNoResult.getResult().get(0);
+            }else{
+                applyNo = model.getApplyNo();
             }
-            String applyNo = applyNoResult.getResult().get(0);
+
             List<WorkflowResultDto> workflowResultDtoList = workFlowInfo(submitType, model.getReceiveCompanyCode());
             List<JgMaintainNoticeEq> equipList = new ArrayList<>();
             CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
@@ -625,10 +631,14 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 notice.setNextTaskId(workflowResultDtoList.get(0).getNextTaskId());
                 notice.setInstanceId(workflowResultDtoList.get(0).getInstanceId());
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                notice.setIsTemporaryStatus("0");
             } else {
                 notice.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
+            if (SUBMIT_TYPE_TEMP.equals(submitType)) {
+                notice.setIsTemporaryStatus("1");
+            }
             notice.setEquListCode(
                     Optional.ofNullable(deviceList)
                             .filter(list -> !list.isEmpty() && list.get(0) != null)
@@ -672,7 +682,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 });
             }
             notice.setCreateDate(new Date());
-            jgMaintainNoticeMapper.insert(notice);
+            this.saveOrUpdate(notice);
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 buildTask(notice, workflowResultDtoList, Boolean.TRUE);
             } else {
@@ -680,6 +690,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 buildTaskDraft(notice);
             }
             if (!CollectionUtils.isEmpty(deviceList)){
+                if (!ValidationUtil.isEmpty(model.getSequenceNbr())) {
+                    LambdaQueryWrapper<JgMaintainNoticeEq> lambda = new QueryWrapper<JgMaintainNoticeEq>().lambda();
+                    lambda.eq(JgMaintainNoticeEq::getEquipTransferId, model.getSequenceNbr());
+                    jgMaintainNoticeEqMapper.delete(lambda);
+                }
                 List<JgMaintainNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> jgRelationEquip.setEquipTransferId(String.valueOf(notice.getSequenceNbr()))).collect(Collectors.toList());
                 jgMaintainNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
             }

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

@@ -93,6 +93,7 @@ import static com.alibaba.fastjson.JSON.toJSONString;
 public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, JgReformNotice, JgReformNoticeMapper> implements IJgReformNoticeService, ICompensateFlowDataOfRedis<JgReformNotice> {
 
     private static final String SUBMIT_TYPE_FLOW = "1";
+    private static final String SUBMIT_TYPE_TEMP = "3";
     private static final String PROCESS_DEFINITION_KEY = "renovationNoticeNew";
     private static final String TABLE_PAGE_ID = "reformNoticeAdd";
     public static final String DEVICE_LIST = "deviceList";
@@ -149,7 +150,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
 
     @ResultFieldMapping({
-                @ResultFieldMapping.ResultFieldMap(sourceField = "useUnitCreditCode", targetField = "useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
+            @ResultFieldMapping.ResultFieldMap(sourceField = "useUnitCreditCode", targetField = "useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
     })
     public Map<String, Object> queryBySequenceNbrWithAuth(Long sequenceNbr, CompanyBo companyBo) {
         Map<String, Object> re = this.queryBySequenceNbr(sequenceNbr);
@@ -289,7 +290,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     if (EquipmentClassifityEnum.YLGD.getCode().equals(notice.getEquListCode())) {
                         oldPipJsonData = this.getNowPipJsonData(noticeDto.getProjectContraptionId());
                         notice.setPipeLengthChanged(this.calculatePipeLengthChange(JSONArray.parseArray(JSON.toJSONString(oldPipJsonData.get(DEVICE_LIST))),
-                                                                                   JSONArray.parseArray(JSON.toJSONString(noticeDto.getDeviceList()))));
+                                JSONArray.parseArray(JSON.toJSONString(noticeDto.getDeviceList()))));
                     }
                     jgReformNoticeMapper.updateById(notice);
                     // 删除暂存
@@ -332,7 +333,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     if (EquipmentClassifityEnum.YLGD.getCode().equals(notice.getEquListCode())) {
                         oldPipJsonData = this.getNowPipJsonData(noticeDto.getProjectContraptionId());
                         notice.setPipeLengthChanged(this.calculatePipeLengthChange(JSONArray.parseArray(JSON.toJSONString(oldPipJsonData.get(DEVICE_LIST))),
-                                                                                   JSONArray.parseArray(JSON.toJSONString(noticeDto.getDeviceList()))));
+                                JSONArray.parseArray(JSON.toJSONString(noticeDto.getDeviceList()))));
                     }
                     this.updateById(notice);
                 }
@@ -344,7 +345,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             }
             this.saveOrUpdateHisData(String.valueOf(noticeDto.getSequenceNbr()), JSONObject.parseObject(noticeJsonStr), oldPipJsonData);
             jgReformNoticeEqMapper.delete(new LambdaQueryWrapper<JgReformNoticeEq>()
-                                                  .eq(JgReformNoticeEq::getEquipTransferId, notice.getSequenceNbr()));
+                    .eq(JgReformNoticeEq::getEquipTransferId, notice.getSequenceNbr()));
             // eq关系表
             List<JgReformNoticeEq> noticeEqs = new ArrayList<>();
             // 更新设备关系表
@@ -511,14 +512,18 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 }
                 this.repeatUsedEquipCheck(deviceList, reginParams.getCompany().getCompanyCode());
             }
-            // 获取申请单号
-            ResponseModel<List<String>> codeResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZGZ.getCode(), 1);
-            List<String> applyNoList = null;
-            if (codeResult != null && !ValidationUtil.isEmpty(codeResult.getResult())) {
-                applyNoList = codeResult.getResult();
-            }
-            if (CollectionUtils.isEmpty(applyNoList)) {
-                throw new BadRequest("申请单编号生成失败,请稍后重试!");
+            List<String> applyNoList = new ArrayList<>();
+            if (ValidationUtil.isEmpty(model.getApplyNo())){
+                // 获取申请单号
+                ResponseModel<List<String>> codeResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZGZ.getCode(), 1);
+                if (codeResult != null && !ValidationUtil.isEmpty(codeResult.getResult())) {
+                    applyNoList = codeResult.getResult();
+                }
+                if (CollectionUtils.isEmpty(applyNoList)) {
+                    throw new BadRequest("申请单编号生成失败,请稍后重试!");
+                }
+            }else{
+                applyNoList.add(model.getApplyNo());
             }
 
             // 申请单业务主键seq
@@ -552,9 +557,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 notice.setPromoter(reginParams.getUserModel().getUserId());
                 notice.setNextTaskId(workflowResult.getNextTaskId());
                 notice.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
+                notice.setIsTemporaryStatus("0");
             } else {
                 notice.setNextExecuteUserIds(RequestContext.getExeUserId());
             }
+            if (SUBMIT_TYPE_TEMP.equals(submitType)) {
+                notice.setIsTemporaryStatus("1");
+            }
             notice.setInstallUnitName(reginParams.getCompany().getCompanyName());
             notice.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             notice.setEntrustingUnitName(reginParams.getCompany().getCompanyName());
@@ -570,7 +579,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             if (EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)) {
                 oldPipJsonData = this.getNowPipJsonData(String.valueOf(jsonObject.get(PROJECT_CONTRAPTION_ID)));
                 notice.setPipeLengthChanged(this.calculatePipeLengthChange(JSONArray.parseArray(JSON.toJSONString(oldPipJsonData.get(DEVICE_LIST))),
-                                                                           JSONArray.parseArray(JSON.toJSONString(jsonObject.get(DEVICE_LIST)))));
+                        JSONArray.parseArray(JSON.toJSONString(jsonObject.get(DEVICE_LIST)))));
             }
             this.saveOrUpdateHisData(String.valueOf(sequenceNbr), jsonObject, oldPipJsonData);
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
@@ -579,7 +588,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 this.saveTempReformNotice(notice);
             }
             // 插入业务单
-            jgReformNoticeMapper.insert(notice);
+            this.saveOrUpdate(notice);
             // 更新设备关系表
             if (!CollectionUtils.isEmpty(deviceList)) {
                 deviceList.stream().filter(obj -> !Objects.isNull(obj.get(equSeq)))
@@ -587,6 +596,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                                 .setEquId(obj.get(equSeq).toString())
                                 .setEquipTransferId(String.valueOf(sequenceNbr)))
                         .forEach(noticeEqs::add);
+                if (!ValidationUtil.isEmpty(model.getSequenceNbr())) {
+                    LambdaQueryWrapper<JgReformNoticeEq> lambda = new QueryWrapper<JgReformNoticeEq>().lambda();
+                    lambda.eq(JgReformNoticeEq::getEquipTransferId, model.getSequenceNbr());
+                    jgReformNoticeEqMapper.delete(lambda);
+                }
                 jgReformNoticeEqMapper.insertBatchSomeColumn(noticeEqs);
             }
             this.updateRedisBatch(Collections.singletonList(notice));
@@ -637,12 +651,12 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
     private JSONObject getNowPipJsonData(String projectContraptionId) {
         return new JSONObject(Optional.ofNullable(idxBizJgProjectContraptionMapper.getDetail(projectContraptionId))
-                                      .map(map -> {
-                                          commonService.convertStringToJsonobject(map, IdxBizJgProjectContraptionServiceImplService.jsonFields);
-                                          map.put(DEVICE_LIST, idxBizJgProjectContraptionMapper.selectEquipList((String) map.get(SEQUENCE_NBR)));
-                                          return map;
-                                      })
-                                      .orElse(Collections.emptyMap()));
+                .map(map -> {
+                    commonService.convertStringToJsonobject(map, IdxBizJgProjectContraptionServiceImplService.jsonFields);
+                    map.put(DEVICE_LIST, idxBizJgProjectContraptionMapper.selectEquipList((String) map.get(SEQUENCE_NBR)));
+                    return map;
+                })
+                .orElse(Collections.emptyMap()));
     }
 
     private void repeatUsedEquipCheck(List<Map<String, Object>> equipList, String companyCode) {

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

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
@@ -78,6 +79,7 @@ import java.util.stream.Collectors;
 public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto, JgTransferNotice, JgTransferNoticeMapper> implements IJgTransferNoticeService, ICompensateFlowDataOfRedis<JgTransferNotice> {
 
     private static final String SUBMIT_TYPE_FLOW = "1";
+    private static final String SUBMIT_TYPE_TEMP = "3";
     private static final String PROCESS_DEFINITION_KEY = "transferNotice";
     private static final String TABLE_PAGE_ID = "transferNoticeAdd";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("6610", "6614", "6615", "6617", "6616");
@@ -520,17 +522,24 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 }
                 this.repeatUsedEquipCheck(deviceList, reginParams.getCompany().getCompanyCode());
             }
-            // 获取告知单号
-            ResponseModel<List<String>> responseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.YZGZ.getCode(), 1);
-            if (CollectionUtils.isEmpty(responseModel.getResult())) {
-                return new ArrayList<>();
+            List<String> applyNoList = new ArrayList<>();
+            if (ValidationUtil.isEmpty(model.getApplyNo())){
+                // 获取告知单号
+                ResponseModel<List<String>> responseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.YZGZ.getCode(), 1);
+                if (CollectionUtils.isEmpty(responseModel.getResult())) {
+                    return new ArrayList<>();
+                }
+                applyNoList = responseModel.getResult();
+            }else{
+                applyNoList.add(model.getApplyNo());
             }
+
             // 启动工作流并返回信息
             List<WorkflowResultDto> workflowResultList = this.workFlowInfo(submitType, model.getReceiveCompanyCode());
             List<JgTransferNotice> list = new ArrayList<>();
             List<JgTransferNoticeEq> equipList = new ArrayList<>();
             //业务数据组装等
-            businessData(submitType, reginParams, model, deviceList, responseModel, workflowResultList, list, equipList);
+            businessData(submitType, reginParams, model, deviceList, applyNoList, workflowResultList, list, equipList);
             // 如果为保存并提交，则创建代办
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 buildTask(list, workflowResultList, Boolean.TRUE);
@@ -589,7 +598,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * 组装业务数据
      */
     private void businessData(String submitType, ReginParams reginParams, JgTransferNoticeDto model,
-                              List<Map<String, Object>> deviceList, ResponseModel<List<String>> responseModel,
+                              List<Map<String, Object>> deviceList, List<String> applyNoList,
                               List<WorkflowResultDto> workflowResultList, List<JgTransferNotice> list,
                               List<JgTransferNoticeEq> equipList) {
         CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
@@ -597,7 +606,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         BeanUtils.copyProperties(model, dto);
         dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
         int i = 0;
-        String applyNo = responseModel.getResult().get(i);
+        String applyNo = applyNoList.get(i);
         dto.setPromoter(reginParams.getUserModel().getUserId());
         dto.setApplyNo(applyNo);
         dto.setNoticeDate(new Date());
@@ -609,9 +618,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             dto.setInstanceStatus(workflowResultList.get(i).getNextExecutorRoleIds() + "," + workflowResultList.get(i).getExecutorRoleIds());
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
+            dto.setIsTemporaryStatus("0");
         } else {
             dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
         }
+        if (SUBMIT_TYPE_TEMP.equals(submitType)){
+            dto.setIsTemporaryStatus("1");
+        }
         dto.setEquCategory(
                 Optional.ofNullable(deviceList)
                         .filter(v -> !v.isEmpty() && v.get(0) != null)
@@ -619,6 +632,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                         .map(String::valueOf)
                         .orElse("")
         );
+        dto.setEquCategoryCode(
+                Optional.ofNullable(deviceList)
+                        .filter(v -> !v.isEmpty() && v.get(0) != null)
+                        .map(v -> v.get(0).get("EQU_CATEGORY_CODE"))
+                        .map(String::valueOf)
+                        .orElse("")
+        );
         dto.setEquList(
                 Optional.ofNullable(deviceList)
                         .filter(v -> !v.isEmpty() && v.get(0) != null)
@@ -646,7 +666,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         dto.setCreateDate(new Date());
 //        dto.setEquAddress(obj.getOrDefault("ADDRESS", "").toString());
         list.add(dto);
-        jgTransferNoticeMapper.insert(list.get(0));
+        this.saveOrUpdate(list.get(0));
         if (!CollectionUtils.isEmpty(deviceList)){
             deviceList.forEach(obj -> {
                 JgTransferNoticeEq jgRelationEquip = new JgTransferNoticeEq();
@@ -657,6 +677,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 jgRelationEquip.setEquListCode(String.valueOf(obj.get("EQU_LIST_CODE")));//设备种类编码
                 equipList.add(jgRelationEquip);
             });
+            if (!ValidationUtil.isEmpty(model.getSequenceNbr())) {
+                LambdaQueryWrapper<JgTransferNoticeEq> lambda = new QueryWrapper<JgTransferNoticeEq>().lambda();
+                lambda.eq(JgTransferNoticeEq::getEquipTransferId, model.getSequenceNbr());
+                jgTransferNoticeEqMapper.delete(lambda);
+            }
             jgTransferNoticeEqMapper.insertBatchSomeColumn(equipList);
         }
     }

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

@@ -591,7 +591,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 提交时进行校验设备是否在流程中使用（并发及同时打开多个相同的页面时才会出现此种情况）
             checkForRepeatUsedEquip(map, company);
             // 使用登记信息
-            JgUseRegistration jgUseRegistration = new JgUseRegistration();
+            //JgUseRegistration jgUseRegistration = new JgUseRegistration();
+            String sequenceNbr = Objects.toString(map.get("sequenceNbr"),null);
+            JgUseRegistration jgUseRegistration = ValidationUtil.isEmpty(sequenceNbr) ? new JgUseRegistration() :
+                    this.getBaseMapper().selectById(sequenceNbr);
             jgUseRegistration.setRegDate(new Date());
             jgUseRegistration.setCreateDate(new Date());
             LambdaQueryWrapper<IdxBizJgOtherInfo> otherLambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
@@ -695,26 +698,29 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 历史设备登记生成的 编辑时更新使用登记证管理表
                 updateRegistrationManage(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
             } else {
-
                 // 业务管理设备信息保存
                 JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
                 jgRelationEquip.setEquId(Objects.toString(map.get("equipId"), ""));
-                //            List<String> applicationFormCode = iCreateCodeServicevice.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
-                //            jgUseRegistration.setApplyNo(applicationFormCode.get(0));
-                //            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
-                ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
-                if (!ObjectUtils.isEmpty(listResponseModel)) {
-                    jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0));
+                if (ValidationUtil.isEmpty(jgUseRegistration.getApplyNo())){
+                    ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
+                    if (!ObjectUtils.isEmpty(listResponseModel)) {
+                        jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0));
+                    }
                 }
-                jgUseRegistration.setAuditStatus("待提交");//字段不用
+                jgUseRegistration.setAuditStatus("待提交");
                 jgUseRegistration.setStatus(WorkFlowStatusEnum.USE_SUBMIT.getPass());
                 jgUseRegistration.setRegType("2".equals(map.get("regType")) ? "2" : "0");
-                this.save(jgUseRegistration);
-                jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
+                this.saveOrUpdate(jgUseRegistration);
+                if (!ValidationUtil.isEmpty(sequenceNbr)) {
+                    LambdaQueryWrapper<JgUseRegistrationEq> lambda = Wrappers.<JgUseRegistrationEq>lambdaQuery()
+                            .eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr);
+                    jgRelationEquipMapper.delete(lambda);
+                }
+                jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr()+"");
                 jgRelationEquipMapper.insert(jgRelationEquip);
             }
             // 暂存历史表
-            updateHistory(map, Objects.toString(map.get("equipId"), ""), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
+            updateHistory(map, Objects.toString(map.get("equipId"), ""), jgUseRegistration.getSequenceNbr()+"", jgUseRegistration.getSupervisoryCode());
             if (!ObjectUtils.isEmpty(map.get("submit"))) {
                 // 删除暂存代办
                 commonServiceImpl.deleteTasksByRelationId(String.valueOf(jgUseRegistration.getSequenceNbr()));