Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -53,6 +53,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -143,6 +144,9 @@ public class DataHandlerServiceImpl {
 
     private final IdxBizJgRegisterInfoMapper registerInfoMapper;
 
+    @Value("${jyjc.open.online: true}")
+    private Boolean onlineJyjc;
+
 
     /**
      * 安装告知压力管道历史数据修复-详情中的设备列表修改为汇总表格式
@@ -1442,7 +1446,7 @@ public class DataHandlerServiceImpl {
             esBaseEnterpriseInfo.setLicenses(licenses);
             try {
                 esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses));
-                esBaseEnterpriseInfo.setUnitType(RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
+                esBaseEnterpriseInfo.setUnitType(onlineJyjc ? enterpriseInfo.getUnitType() : RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
             } catch (Exception e) {
                 log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e);
             }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java

@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseUnitLicenceMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -41,6 +42,10 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
 
     private final EsUserInfoDao esUserInfoDao;
 
+    @Value("${jyjc.open.online: true}")
+    private Boolean onlineJyjc;
+
+
     @Override
     public String supportType() {
         return "enterprise";
@@ -78,7 +83,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
                 esBaseEnterpriseInfo.setLicenses(licenses);
                 try {
                     esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses));
-                    esBaseEnterpriseInfo.setUnitType(RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
+                    esBaseEnterpriseInfo.setUnitType(onlineJyjc ? enterpriseInfo.getUnitType() : RefreshCmService.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
                 } catch (Exception e) {
                     log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e);
                 }