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/resources/mapper/JgUseRegistrationMapper.xml

@@ -500,9 +500,11 @@
             ibjui."CITY_NAME"                                 as installCity,
             ibjui."COUNTY_NAME"                               as installCounty,
             ibjci."USC_UNIT_CREDIT_CODE"                      as uscUnitCreditCode,
-            ibjci."USC_UNIT_NAME"                             as uscUnitName
+            ibjci."USC_UNIT_NAME"                             as uscUnitName,
+            re."INSTALLATION_IS_COMPLETE"                     as installationIsComplete
         FROM "idx_biz_jg_construction_info" AS ibjci
         left join "idx_biz_jg_use_info" as ibjui on ibjui."RECORD" = ibjci."RECORD"
+        left join  "idx_biz_jg_register_info" as re on re."RECORD" = ibjci."RECORD"
         WHERE ibjci."RECORD" = #{id}
         ORDER BY ibjci."rec_date" desc
         LIMIT 1

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

@@ -3324,9 +3324,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 暂存历史表
                 updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
 
-                TaskV2Model taskV2Model = new TaskV2Model();
-                taskV2Model.setRoutePath("");
-
                 //监督管理信息
                 LambdaQueryWrapper<IdxBizJgSupervisionInfo> lambdaSup = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda();
                 lambdaSup.eq(IdxBizJgSupervisionInfo::getRecord, jgRelationEquip.getEquId());
@@ -3346,6 +3343,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 registerInfo.setEquPrice(String.valueOf(map.get("equPrice")));
                 registerInfo.setProductPhoto(JSONObject.toJSONString(map.get("productPhoto")));
                 registerInfo.setOtherAccessoriesReg(JSONObject.toJSONString(map.get("otherAccessoriesReg")));
+                registerInfo.setInstallationIsComplete(map.getOrDefault("installationIsComplete", "1").toString());
                 idxBizJgRegisterInfoMapper.updateById(registerInfo);
 
                 // 设计信息

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/IdxBizJgRegisterInfoDto.java

@@ -91,4 +91,8 @@ public class IdxBizJgRegisterInfoDto extends BaseDto {
     @ApiModelProperty(value = "检验是否在有限期内：1-有限期内 ；2-不在有效期内【历史无证设备需要】")
     private String inInspectionPeriod;
 
+
+    @ApiModelProperty(value = "安装资料是否完整齐全：1-齐全；2-不齐全【历史无证设备需要】")
+    private String installationIsComplete;
+
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgRegisterInfo.java

@@ -216,5 +216,11 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
     @TableField("\"IN_INSPECTION_PERIOD\"")
     private String inInspectionPeriod;
 
+    /**
+     * 安装资料是否完整齐全：1-齐全；2-不齐全【历史无证设备需要】
+     */
+    @TableField("\"INSTALLATION_IS_COMPLETE\"")
+    private String installationIsComplete;
+
 
 }