Merge branch 'develop_tzs_test' of http://39.100.92.250:5000/moa/amos-boot-biz…

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

@@ -2493,7 +2493,8 @@ public class CommonServiceImpl implements ICommonService {
         DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         Pattern timePattern = Pattern.compile("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}");
         //如果是历史无证的修改类型为SP_TT并且枚举没有在登记类型中
-        if (Objects.isNull(RegistrationTypeEnum.getNameByType(formData.getString("type"))) && "jg_his_black".equals(formData.getString("dataSource"))) {
+        if ("set_sp".equals(formData.getString("historyEquType"))
+                || (Objects.isNull(RegistrationTypeEnum.getNameByType(formData.getString("type"))) && "jg_his_black".equals(formData.getString("dataSource")))) {
             formData.put("type", "SP_TT");
         }
 

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

@@ -189,11 +189,11 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
                     })) {
                 throw new BadRequest("委托检验下次检验日期超期，请重新填写后提交！");
             }
-            List<IdxBizJgDesignInfo> designInfoList = idxBizJgDesignInfoServiceImpl.checkOverDesignRegNum(
-                    equipmentLists.stream()
-                            .map(v -> (String) v.get("record"))
-                            .collect(Collectors.toList())
-            );
+//            List<IdxBizJgDesignInfo> designInfoList = idxBizJgDesignInfoServiceImpl.checkOverDesignRegNum(
+//                    equipmentLists.stream()
+//                            .map(v -> (String) v.get("record"))
+//                            .collect(Collectors.toList())
+//            );
             //可多次发起，不限制次数
 //            if (designInfoList.stream().anyMatch(info -> Optional.ofNullable(info.getOverDesignRegNum()).orElse(0) >= 2)) {
 //                log.error("超设计使用年限变更登记设备最多延期两次, 设备record: {}", designInfoList.stream().filter(info -> info.getOverDesignRegNum() >= 2)