Commit 3b538da7 authored by suhuiguang's avatar suhuiguang

refact(检验开通):需求变更

1.3库数据单位类型调整为已单位信息表
parent 35e87aeb
...@@ -53,6 +53,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.*; ...@@ -53,6 +53,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -143,6 +144,9 @@ public class DataHandlerServiceImpl { ...@@ -143,6 +144,9 @@ public class DataHandlerServiceImpl {
private final IdxBizJgRegisterInfoMapper registerInfoMapper; private final IdxBizJgRegisterInfoMapper registerInfoMapper;
@Value("${jyjc.open.online: true}")
private Boolean onlineJyjc;
/** /**
* 安装告知压力管道历史数据修复-详情中的设备列表修改为汇总表格式 * 安装告知压力管道历史数据修复-详情中的设备列表修改为汇总表格式
...@@ -1442,7 +1446,7 @@ public class DataHandlerServiceImpl { ...@@ -1442,7 +1446,7 @@ public class DataHandlerServiceImpl {
esBaseEnterpriseInfo.setLicenses(licenses); esBaseEnterpriseInfo.setLicenses(licenses);
try { try {
esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses)); 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) { } catch (Exception e) {
log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e); log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e);
} }
......
...@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseUnitLicenceMapper; ...@@ -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 com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
...@@ -41,6 +42,10 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler { ...@@ -41,6 +42,10 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
private final EsUserInfoDao esUserInfoDao; private final EsUserInfoDao esUserInfoDao;
@Value("${jyjc.open.online: true}")
private Boolean onlineJyjc;
@Override @Override
public String supportType() { public String supportType() {
return "enterprise"; return "enterprise";
...@@ -78,7 +83,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler { ...@@ -78,7 +83,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
esBaseEnterpriseInfo.setLicenses(licenses); esBaseEnterpriseInfo.setLicenses(licenses);
try { try {
esBaseEnterpriseInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesEp(licenses)); 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) { } catch (Exception e) {
log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e); log.error("企业信息单位类型或者取资质最小日期失败:{}", enterpriseInfo, e);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment