fix(jg)：企业资质应该取用最新的3条，目前取用的是最上面的三条

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

@@ -419,7 +419,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         String equCode = (String) equipmentInfoForm.get(EQU_CODE);
         String sequenceNbr = (String) equipmentInfoForm.get(SEQUENCE_NBR);
         List<Integer> results = Stream.of(idxBizJgRegisterInfoMapper.selectByEquCodeAndClaimStatus(equCode, sequenceNbr),
-                idxBizJgRegisterInfoMapper.selectInstallNoticeEqByEquCode(equCode)
+                idxBizJgRegisterInfoMapper.selectInstallNoticeEqByEquCode(equCode, sequenceNbr)
         ).collect(Collectors.toList());
 
         if (results.stream().anyMatch(count -> count > 0)) {

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

@@ -625,6 +625,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         String useCode = String.valueOf(informObj.get("installUnitCreditCode"));
         LambdaQueryWrapper<TzBaseUnitLicence> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TzBaseUnitLicence::getUnitCode, useCode);
+        wrapper.orderByDesc(TzBaseUnitLicence::getExpiryDate);
+        wrapper.orderByDesc(TzBaseUnitLicence::getRecDate);
         wrapper.last(" LIMIT 3");
         List<TzBaseUnitLicence> list = baseUnitLicenceMapper.selectList(wrapper);
 

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

@@ -3019,8 +3019,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 设备安装信息更新
                 this.historyEquUpdateInstallInfo(map);
 
-                // 设备维保信息更新
-                this.historyEquUpdateMaintenanceInfo(map);
+                // 设备维保信息更新,只有电梯
+                if ("3000".equals(map.get("equList"))){
+                    this.historyEquUpdateMaintenanceInfo(map);
+                }
 
                 // 历史设备 生成证书管理表记录 & 生成安装 维保等操作记录
                 this.historyEquGenManageRelated(map, jgUseRegistration, registerInfo, idxBizJgFactoryInfo);
@@ -3047,8 +3049,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         SimpleDateFormat format = new SimpleDateFormat();
         IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
         if (!ValidationUtil.isEmpty(info.getSequenceNbr())) {
-            info.setMeUnitName(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[1]);
-            info.setMeUnitCreditCode(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[0]);
+            String meUnitName = String.valueOf(map.get("meUnitName"));
+            info.setMeUnitName(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[1] : null);
+            info.setMeUnitCreditCode(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[0] : null);
             info.setMeMaster(ValidationUtil.isEmpty(map.get("maintenanceManagerOneName")) ? null : String.valueOf(map.get("maintenanceManagerOneName")));
             info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("maintenanceManagerOnePhone")) ? null : String.valueOf(map.get("maintenanceManagerOnePhone")));
             info.setMeMasterId(ValidationUtil.isEmpty(map.get("maintenanceManagerOneID")) ? null : String.valueOf(map.get("maintenanceManagerOneID")));

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

@@ -59,5 +59,5 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
 
     Integer selectByEquCodeAndClaimStatus(@Param("equCode") String equCode, @Param("sequenceNbr") String sequenceNbr);
 
-    Integer selectInstallNoticeEqByEquCode(@Param("equCode") String equCode);
+    Integer selectInstallNoticeEqByEquCode(@Param("equCode") String equCode, @Param("sequenceNbr") String sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgRegisterInfoMapper.xml

@@ -34,6 +34,9 @@
 		FROM tzs_jg_installation_notice_eq tjine
 		JOIN idx_biz_jg_register_info ibjri ON ibjri.record = tjine.equ_id
 		WHERE ibjri.equ_code = #{equCode}
+		<if test="sequenceNbr != null and sequenceNbr != ''">
+			AND ibjri.sequence_nbr != #{sequenceNbr}
+		</if>
 	</select>
 
 	<update id="updateCylinderCategoryByRecordBatch">