Merge branch 'develop_tzs_register' of…

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

@@ -42,4 +42,6 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
     Page<IdxBizJgProjectContraption> queryForUnitByProjectContraptionPage(@Param("page") Page<IdxBizJgProjectContraption> page,
                                                                           @Param("dto") Map<String, String> params,
                                                                           @Param("sort") SortVo sortMap);
+
+    JgUseRegistrationManage getLatestJgUseRegistrationManage(@Param("useUnitCreditCode")String useUnitCreditCode, @Param("equDefineCode")String equDefineCode);
 }

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

@@ -436,4 +436,24 @@
         </if>
         ibjpc.rec_date DESC
     </select>
+
+    <select id="getLatestJgUseRegistrationManage"
+            resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage">
+        SELECT DISTINCT tjur.*
+        FROM
+        tzs_jg_use_registration_manage tjur
+        LEFT JOIN idx_biz_jg_register_info ri ON ri.USE_ORG_CODE=tjur.use_registration_code
+        LEFT JOIN idx_biz_jg_use_info ui on ui."RECORD" = ri."RECORD"
+        WHERE
+        ri."EQU_CATEGORY" = '2300'
+        and ui."DATA_SOURCE" like 'jg_his%'
+        and ui."DATA_SOURCE" not like 'jg_his_black%'
+        and (ri."USE_ORG_CODE" is not null or ri."USE_ORG_CODE" != '')
+        and tjur.is_delete=0
+        and tjur.certificate_status='已登记'
+        and tjur.use_unit_credit_code=#{useUnitCreditCode}
+        and tjur.equ_define_code=#{equDefineCode}
+        ORDER BY tjur.certificate_no DESC
+        LIMIT 1
+    </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

@@ -2703,15 +2703,16 @@ public List<EquipmentClassifyDto> getEquClassifyByCode(String parentCode) {
      */
     @Override
     public JgUseRegistrationManage getLatestJgUseRegistrationManage(String useUnitCreditCode, String equDefineCode) {
-        LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(JgUseRegistrationManage::getUseUnitCreditCode, useUnitCreditCode)
-                .eq(JgUseRegistrationManage::getEquDefineCode, equDefineCode)
-                .eq(JgUseRegistrationManage::getIsDelete, 0)
-                .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
-                .orderByDesc(JgUseRegistrationManage::getCertificateNo);
-        return jgUseRegistrationManageMapper.selectList(queryWrapper).stream()
-                .findFirst()
-                .orElse(null);
+//        LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<>();
+//        queryWrapper.eq(JgUseRegistrationManage::getUseUnitCreditCode, useUnitCreditCode)
+//                .eq(JgUseRegistrationManage::getEquDefineCode, equDefineCode)
+//                .eq(JgUseRegistrationManage::getIsDelete, 0)
+//                .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
+//                .orderByDesc(JgUseRegistrationManage::getCertificateNo);
+//        return jgUseRegistrationManageMapper.selectList(queryWrapper).stream()
+//                .findFirst()
+//                .orElse(null);
+        return jgUseRegistrationManageMapper.getLatestJgUseRegistrationManage(useUnitCreditCode,equDefineCode);
     }
 
     /**