fix(jyjc)：申请开通

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/OpenBizTypeEnumV2.java

 package com.yeejoin.amos.boot.module.jyjc.api.enums;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
@@ -9,28 +10,38 @@ import java.util.Optional;
  * @author Administrator
  */
 @Getter
+@AllArgsConstructor
 public enum OpenBizTypeEnumV2 {
 
     /**
      * 业务类型
      */
-    JY("jy", "检验机构", "检验业务"),
-    JC("jc", "检测机构", "检测业务"),
-    SYDW("jc-sydw", "使用单位", "使用单位电梯检测"),
-    AGW("jc-agw", "安装改造维修单位", "安改维电梯检测");
+    JY("jy", "检验机构", "检验业务", true),
+    JC("jc", "检测机构", "检测业务", true),
+    SYDW("jc-sydw", "使用单位", "使用单位电梯检测", false),
+    AGW("jc-agw", "安装改造维修单位", "安改维电梯检测", false);
+
+    /**
+     * 唯一标识
+     */
     private final String code;
 
 
+    /**
+     * 单位类型
+     */
     private final String unitType;
 
+    /**
+     * 描述
+     */
     private final String description;
 
+    /**
+     * 是否需要资质
+     */
+    private final boolean needSaveLicense;
 
-    OpenBizTypeEnumV2(String code, String unitType, String description) {
-        this.code = code;
-        this.unitType = unitType;
-        this.description = description;
-    }
 
     public static OpenBizTypeEnumV2 getOneByCode(String code) {
         Optional<OpenBizTypeEnumV2> op = Arrays.stream(OpenBizTypeEnumV2.values()).filter(e -> e.getCode().equals(code)).findFirst();

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

@@ -39,8 +39,8 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.*;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.api.vo.JyjcOpeningApplicationVo;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
-import com.yeejoin.amos.boot.module.jyjc.biz.message.factoty.OpenAppMsgFactory;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.boot.module.jyjc.biz.message.factoty.OpenAppMsgFactory;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.TaskModelServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.BaseUnitLicence;
@@ -151,7 +151,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     private SnowflakeIdUtil sequence;
 
     @Resource
-    private  OpenAppMsgFactory  openAppMsgFactory;
+    private OpenAppMsgFactory openAppMsgFactory;
 
     /**
      * 编辑、工作台暂存逻辑
@@ -341,7 +341,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             // 将历史同单位类型+同机构类别的开通申请作废掉
             for (Long id : ids) {
                 JyjcInspectionHistory historyOpened = inspectionHistoryService.getBySSeq(id);
-                if(historyOpened != null){
+                if (historyOpened != null) {
                     JSONObject hisDataOpened = historyOpened.getHistoryData();
                     List<BaseEnterpriseCertDto> certOpened = hisDataOpened.getJSONArray(BizCommonConstant.UNIT_LICENCE_KEY).toJavaList(BaseEnterpriseCertDto.class);
                     boolean matchHisOpened = certOpened.stream().anyMatch(c -> agencyTypeLast.contains(c.getAgencyType()));
@@ -472,7 +472,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             applyStartTime = date + " 00:00:00";
             applyEndTime = date + " 23:59:59";
         }
-        Page<JyjcOpeningApplicationModel> result = jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, dto, applyStartTime, currentUserId, applyEndTime,orgCode);
+        Page<JyjcOpeningApplicationModel> result = jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, dto, applyStartTime, currentUserId, applyEndTime, orgCode);
         for (JyjcOpeningApplicationModel openingApplicationModel : result.getRecords()) {
             openingApplicationModel.setIdentityType(dto.getType());
             openingApplicationModel.setOpenBizTypeName(this.getOpenBizTypeName(openingApplicationModel.getOpenBizType()));
@@ -547,7 +547,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     }
 
 
-
     private String getOpenBizTypeByIdentity(String unitType) {
         OpenBizTypeEnumV2 bizTypeEnumV2 = OpenBizTypeEnumV2.getOneByUnitType(unitType);
         if (bizTypeEnumV2 == null) {
@@ -849,7 +848,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 // 更新json
                 commonService.saveOrUpdateHistory(jyjcOpeningApplication.getOpenBizType(), JSONObject.parseObject(JSONObject.toJSONString(params)), jyjcOpeningApplication.getSequenceNbr());
                 // 将审批通过的资质信息写入到企业资质表
-                this.saveLicenseData2Company(jyjcOpeningApplication);
+                this.processApplication(jyjcOpeningApplication);
             }
             jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
             // 已完成 作废逻辑
@@ -895,6 +894,16 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return Optional.ofNullable(OpenBizTypeEnumV2.getOneByCode(openBizType)).map(OpenBizTypeEnumV2::getUnitType).orElse(null);
     }
 
+    /**
+     * 需要资质的才进行进行记录资质
+     *
+     * @param application 开通申请
+     */
+    private void processApplication(JyjcOpeningApplication application) {
+        Optional.ofNullable(OpenBizTypeEnumV2.getOneByCode(application.getOpenBizType()))
+                .filter(OpenBizTypeEnumV2::isNeedSaveLicense).ifPresent(o -> saveLicenseData2Company(application));
+    }
+
     private void saveLicenseData2Company(JyjcOpeningApplication jyjcOpeningApplication) {
         JyjcInspectionHistory history = inspectionHistoryService.getBySSeq(jyjcOpeningApplication.getSequenceNbr());
         JSONObject hisData = history.getHistoryData();
@@ -933,7 +942,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                         licence.setAgencyTypeName(commonService.getDictName(Arrays.asList("1233-1", "1233-2"), licence.getAgencyType()));
                         licence.setUnitCode(jyjcOpeningApplication.getUnitCode());
                         licence.setUnitName(jyjcOpeningApplication.getUnitCodeName());
-                        licence.setLicenceType( LicenceTypeEnum.JY_JC.getCode());
+                        licence.setLicenceType(LicenceTypeEnum.JY_JC.getCode());
                         licence.setEnterpriseCertSeq(cert.getSequenceNbr().toString());
                         licences.add(licence);
                     });