feat(jg): 安全追溯错误问题修复

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -375,6 +375,10 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     Map<String, String> queryTcmUnitInfoBySeq(@Param("unitSeq") String unitSeq, @Param("unitType") String unitType);
 
     String queryTcmUnitSeqByCreditCode(@Param("unitCreditCode") String unitCreditCode, @Param("unitType") String unitType);
+
     // 产权单位调整为可输入或选择--结束
+    List<Map<String, Object>> queryInMaintenanceRecord();
+
+    List<Map<String, Object>> queryInInspectionRecord();
 }
 

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

@@ -1177,7 +1177,7 @@
             SELECT "RECORD","NEXT_INSPECT_DATE",rowNum1
             FROM
             (
-                SELECT ROW_NUMBER () OVER ( PARTITION BY "RECORD" ORDER BY "INSPECT_DATE" DESC) AS rowNum1,"RECORD", "NEXT_INSPECT_DATE"
+                SELECT ROW_NUMBER () OVER ( PARTITION BY "RECORD" ORDER BY "INSPECT_DATE" DESC, REC_DATE DESC) AS rowNum1,"RECORD", "NEXT_INSPECT_DATE"
                 FROM
                 idx_biz_jg_inspection_detection_info where "NEXT_INSPECT_DATE" is not null
             ) d
@@ -3501,4 +3501,49 @@
             and unit_type = #{unitType}
         </if>
     </select>
+
+    <select id="queryInMaintenanceRecord" resultType="java.util.Map">
+        SELECT
+            ui."RECORD"
+        FROM
+            idx_biz_jg_use_info ui
+                LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
+                LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = ui."RECORD"
+                LEFT JOIN (
+                SELECT
+                    "RECORD", "INFORM_END", rowNum1
+                FROM
+                    (
+                        SELECT ROW_NUMBER() OVER (PARTITION BY "RECORD" ORDER BY "REC_DATE" DESC) AS rowNum1, "RECORD", "INFORM_END"
+                        FROM
+                            idx_biz_jg_maintenance_record_info where "INFORM_END" is not null
+                    ) d
+                WHERE d.rowNum1 = 1 and  d."INFORM_END" >= CURRENT_DATE
+            ) tt on tt."RECORD" = ui."RECORD"
+        WHERE si."ORG_BRANCH_CODE" like '50%'
+          and oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
+          and tt."INFORM_END" is not null
+    </select>
+
+    <select id="queryInInspectionRecord" resultType="java.util.Map">
+        SELECT
+            ui."RECORD"
+        FROM
+            idx_biz_jg_use_info ui
+                LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
+                LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = ui."RECORD"
+                LEFT JOIN (
+                SELECT "RECORD", "NEXT_INSPECT_DATE", rowNum1
+                FROM
+                    (
+                        SELECT ROW_NUMBER () OVER ( PARTITION BY "RECORD" ORDER BY "INSPECT_DATE" DESC, "REC_DATE" DESC) AS rowNum1, "RECORD", "NEXT_INSPECT_DATE"
+                        FROM
+                            idx_biz_jg_inspection_detection_info where "NEXT_INSPECT_DATE" is not null
+                    ) d
+                WHERE d.rowNum1 =1 and  d."NEXT_INSPECT_DATE" >= CURRENT_DATE
+            ) tt on tt."RECORD" = ui."RECORD"
+        WHERE si."ORG_BRANCH_CODE" like '50%'
+          AND oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
+          AND tt."NEXT_INSPECT_DATE" is not null
+    </select>
 </mapper>

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

@@ -2501,9 +2501,11 @@ public class CommonServiceImpl implements ICommonService {
             wrapper.eq(TzBaseEnterpriseInfo::getUseUnitCode, formData.getString("estateUnitName").split("_")[0]);
             //产权单位联系电话
             TzBaseEnterpriseInfo tzBaseEnterpriseInfo = enterpriseInfoMapper.selectOne(wrapper);
-            String contactPhone = tzBaseEnterpriseInfo.getContactPhone();
-            if (StringUtils.isNotEmpty(contactPhone)) {
-                formData.put("estatePhone", contactPhone);
+            if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfo)) {
+                String contactPhone = tzBaseEnterpriseInfo.getContactPhone();
+                if (StringUtils.isNotEmpty(contactPhone)) {
+                    formData.put("estatePhone", contactPhone);
+                }
             }
             formData.put("CQUnitCode", formData.getString("estateUnitName").split("_")[0]);
             formData.put("estateUnitName", formData.getString("estateUnitName").split("_")[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/IdxBizJgInspectionDetectionInfoServiceImpl.java

@@ -31,7 +31,7 @@ public class IdxBizJgInspectionDetectionInfoServiceImpl extends BaseService<IdxB
     public IdxBizJgInspectionDetectionInfo queryNewestDetailByRecord(String record) {
         IdxBizJgInspectionDetectionInfo result = new IdxBizJgInspectionDetectionInfo();
         QueryWrapper<IdxBizJgInspectionDetectionInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(IdxBizJgInspectionDetectionInfo::getRecord,record).orderByDesc(IdxBizJgInspectionDetectionInfo::getInspectDate);
+        queryWrapper.lambda().eq(IdxBizJgInspectionDetectionInfo::getRecord,record).orderByDesc(IdxBizJgInspectionDetectionInfo::getInspectDate, IdxBizJgInspectionDetectionInfo::getRecDate);
         List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = list(queryWrapper);
         if (!ValidationUtil.isEmpty(inspectionDetectionInfoList)) {
             BeanUtils.copyProperties(inspectionDetectionInfoList.get(0), result);