feat(jyjc):检验检测业务管理

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcBizManageModel.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.jyjc.api.model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class JyjcBizManageModel extends JyjcOpeningApplicationModel {
@@ -21,4 +23,9 @@ public class JyjcBizManageModel extends JyjcOpeningApplicationModel {
      * 机构分类名称
      */
     private String agencyClassifyName;
+
+    /**
+     * 新开通区域
+     */
+    private List<String> newDetectionRegion;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcBizManageServiceImpl.java

@@ -78,8 +78,7 @@ public class JyjcBizManageServiceImpl {
             setAreaStatusByIdentify(company, r, bizManageModel);
             bizManageModel.setCompanyCode(company.getCompanyCode());
             bizManageModel.setOpenBizTypeName(Optional.of(OpenBizTypeEnumV2.getOneByCode(bizManageModel.getOpenBizType())).map(OpenBizTypeEnumV2::getDescription).orElse(""));
-            // 真实开通区域，所有区域-排查区域
-            bizManageModel.setDetectionRegionName(this.buildRegionName(detectionRegionCodeNameMap, r.getDetectionRegion().stream().filter(d -> !Optional.ofNullable(r.getExclusionRegion()).orElse(new ArrayList<>()).contains(d)).collect(Collectors.toList())));
+            bizManageModel.setDetectionRegionName(this.buildRegionName(detectionRegionCodeNameMap, r.getDetectionRegion()));
             bizManageModel.setExclusionRegionName(this.buildRegionName(detectionRegionCodeNameMap, r.getExclusionRegion()));
             bizManageModel.setAgencyClassifyName(agencyClassifyNameCodeNameMap.getOrDefault(bizManageModel.getAgencyClassify(), ""));
             return bizManageModel;
@@ -281,7 +280,9 @@ public class JyjcBizManageServiceImpl {
 
     public JyjcBizManageModel getBasicInfo(String appSeq) {
         JyjcOpeningApplication openingApplication = openingApplicationService.getById(appSeq);
-        return BeanUtil.copyProperties(openingApplication, JyjcBizManageModel.class);
+        JyjcBizManageModel manageModel = BeanUtil.copyProperties(openingApplication, JyjcBizManageModel.class);
+        manageModel.setNewDetectionRegion(openingApplication.getDetectionRegion().stream().filter(e -> !Optional.ofNullable(openingApplication.getExclusionRegion()).orElse(new ArrayList<>()).contains(e)).collect(Collectors.toList()));
+        return manageModel;
     }
 
     public Map<String, Object> getOne(String appSeq) {