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

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

@@ -982,13 +982,13 @@
             tjin."CONSTRUCTION_IS_XI_XIAN"           as  installIsXixian,
             tjin."CONSTRUCTION_LEADER_PHONE"         as  installLeaderPhone ,
             tjin."USC_DATE"                          as  installStartDate ,
-            ibjui."ESTATE_UNIT_NAME"                 as  installPropertyUnitName ,
+            ibjui."USC_UNIT_NAME"                    as  installPropertyUnitName ,
             tjin."PROXY_STATEMENT_ATTACHMENT"        as  installProxyStatementAttachment ,
             tjin."CONSTRUCTION_CONTRACT_ATTACHMENT"  as  installContractAttachment ,
             tjin."CONSTRUCTION_OTHER_ACCESSORIES"    as  insOtherAccessories
         FROM "idx_biz_jg_construction_info" AS tjin
             left join "idx_biz_jg_use_info" AS ibjui on tjin."RECORD" = ibjui."RECORD"
-        WHERE tjin."RECORD" = #{id} order by tjin.USC_DATE desc
+        WHERE tjin."RECORD" = #{id} order by tjin."USC_DATE" desc
             LIMIT 1
     </select>
 
@@ -997,7 +997,7 @@
             ibjci."CONSTRUCTION_LEADER_NAME"                  as  installLeaderName ,
             ibjci."CONSTRUCTION_LEADER_PHONE"                 as  installLeaderPhone ,
             ibjci."USC_DATE"                                  as  installStartDate ,
-            ibjui."ESTATE_UNIT_NAME"                          as  installPropertyUnitName ,
+            ibjci."USC_UNIT_NAME"                             as  installPropertyUnitName ,
             ibjci."PROXY_STATEMENT_ATTACHMENT"                as  installProxyStatementAttachment ,
             ibjci."CONSTRUCTION_CONTRACT_ATTACHMENT"          as  installContractAttachment ,
             ibjci."CONSTRUCTION_OTHER_ACCESSORIES"            as  insOtherAccessories,
@@ -1012,7 +1012,7 @@
         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.USC_DATE desc
+        ORDER BY ibjci."USC_DATE" desc
         LIMIT 1
     </select>
 

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

@@ -1542,6 +1542,11 @@ public class CommonServiceImpl implements ICommonService {
                     serviceClass = CommonServiceImpl.class,
                     queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
                     secondParamValue = "CQ"
+            ),
+            @FieldMapping.FieldMap(sourceField = "second.uscUnitName",
+                    targetField = "second.uscUnitName",
+                    serviceClass = CommonServiceImpl.class,
+                    queryMethod = "queryBaseUnitNameByCreditCode"
             )
     })
     public Object invokeBusinessType(Map<String, Object> map) {

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

@@ -1650,7 +1650,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 street = useInfo.getFactoryUseSiteStreet() + "_" + useInfo.getStreetName();
                 fullAddress += useInfo.getStreetName();
             }
-            if (!ValidationUtil.isEmpty(useInfo.getAddress())) {
+            if (!ValidationUtil.isEmpty(useInfo.getAddress()) && !"null".equals(useInfo.getAddress())) {
                 fullAddress += useInfo.getAddress();
             }
 

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

@@ -248,7 +248,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             ProcessTaskDTO complete = workflowService.completeOrReject(taskId, dto, operate);
             // 更新下一步执行人、创建待办
             updateExecuteIds(instanceId, id, operate, complete);
-            this.delRepeatUseEquipData(contract.getSequenceNbr(), contract.getStatus(), contract.getUseUnitCode());
             // 更新维保信息
             if (map.containsKey("formData") && !ObjectUtils.isEmpty(map.get("formData"))) {
                 JgMaintenanceContract maintenanceContract = new JgMaintenanceContract();
@@ -274,6 +273,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 }
                 this.getBaseMapper().updateById(result);
             }
+            this.delRepeatUseEquipData(contract.getSequenceNbr(), contract.getStatus(), contract.getUseUnitCode());
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {