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/JgMaintainNoticeMapper.xml

@@ -105,7 +105,7 @@
                ui.CITY_NAME                   AS useUnitCityName,
                ui.COUNTY_NAME                 AS useUnitCountyName,
                ei.ADDRESS                     AS useUnitAddress,
-               ei.use_code AS useCode
+               eio.use_code                   AS useCode
         FROM tzs_jg_maintain_notice isn
                  LEFT JOIN tzs_jg_maintain_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
                  LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
@@ -114,6 +114,7 @@
                  LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
                  LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
                  LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
+                 LEFT JOIN tz_base_enterprise_info eio ON eio.use_code = isn.install_unit_credit_code
         WHERE isn.sequence_nbr = #{sequenceNbr} 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/JgMaintainNoticeServiceImpl.java

@@ -273,20 +273,17 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             throw new IllegalArgumentException("维修告知单不存在");
         }
         Map<String, Object> installation = informationList.get(0);
-
         String useCode = String.valueOf(installation.get("useCode"));
         LambdaQueryWrapper<TzBaseUnitLicence> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(TzBaseUnitLicence::getUnitCode, useCode);
+        // 因模板许可证编号配置最多支持三个，再多样式混乱，目前返回三个
+        wrapper.eq(TzBaseUnitLicence::getUnitCode, useCode).last("limit 3");
         List<TzBaseUnitLicence> list = baseUnitLicenceMapper.selectList(wrapper);
         ArrayList<String> installLicenseNoList = new ArrayList<>();
         ArrayList<String> installLicenseExpirationDateList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(tzBaseUnitLicence -> {
-                // 因模板许可证编号配置最多支持三个，再多样式混乱，目前返回三个
-                if (installLicenseNoList.size() < 3) {
-                    installLicenseNoList.add(tzBaseUnitLicence.getCertNo());
-                    installLicenseExpirationDateList.add(DateUtils.convertDateToString(tzBaseUnitLicence.getExpiryDate(), DateUtils.DATE_PATTERN));
-                }
+                installLicenseNoList.add(tzBaseUnitLicence.getCertNo());
+                installLicenseExpirationDateList.add(DateUtils.convertDateToString(tzBaseUnitLicence.getExpiryDate(), DateUtils.DATE_PATTERN));
             });
         }
         Function<String, String> getValue = key -> installation.getOrDefault(key, "").toString();