安装告知代码优化

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

@@ -30,6 +30,9 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty(value = "告知单编号")
     private String applyNo;
 
+    @ApiModelProperty(value = "设备监管码")
+    private String supervisoryCode;
+
     @ApiModelProperty(value = "设备种类")
     private String equList;
 
@@ -179,6 +182,7 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty(value = "是否西咸")
     private String isXixian;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "告知日期")
     private Date noticeDate;
 

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

@@ -30,6 +30,12 @@ public class JgInstallationNotice extends BaseEntity {
     private String applyNo;
 
     /**
+     * 设备监管码
+     */
+    @TableField("supervisory_code")
+    private String supervisoryCode;
+
+    /**
      * 设备种类
      */
     @TableField("equ_list")

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

@@ -6,6 +6,7 @@
         select
             isn.sequence_nbr AS sequenceNbr,
             isn.apply_no AS applyNo,
+            isn.supervisory_code AS supervisoryCode,
             isn.notice_date AS noticeDate,
             isn.use_unit_name AS useUnitName,
             isn.receive_org_name AS receiveOrgName,

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

@@ -613,19 +613,19 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             if("0".equals(op)) {
                 jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
                 this.generateInstallationNoticeReport(jgInstallationNotice.getSequenceNbr());
+                // 更新其他业务表
+                tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
+                tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());
+                tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
+                jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
+                jgInstallationNotice.setSupervisoryCode(mapCode.get("superviseCode").toString());
+                tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
+                tzsJgRegistrationInfoMapper.updateById(tzsJgRegistrationInfo);
+                jgInstallationNoticeMapper.updateById(jgInstallationNotice);
             } else {
                 jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
                 jgInstallationNotice.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
             }
-            jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
-            jgInstallationNoticeMapper.updateById(jgInstallationNotice);
-
-            // 更新其他业务表
-            tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
-            tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());
-            tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
-            tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
-            tzsJgRegistrationInfoMapper.updateById(tzsJgRegistrationInfo);
         }
 
 //        // 组装监管码