Skip to content

A
amos-boot-biz
Commit daf35e63 authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.检验检测单位单位信息报错

parent b5a09dd8
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 27 deletions
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BizTypeEnum.java
View file @ daf35e63
...@@ -22,7 +22,7 @@ public enum BizTypeEnum { ...@@ -22,7 +22,7 @@ public enum BizTypeEnum {
SUPERVISE("supervise", "监督检验","115"), SUPERVISE("supervise", "监督检验","115"),
FIRST_INSPECTION("firstinspect", "定检","116"), FIRST_INSPECTION("firstinspect", "定检","116"),
DETECTION("detection", "检测","117"), DETECTION("detection", "检测","117"),
BUSINESS_OPEN("businessOpen", "检验业务开通","114"); BUSINESS_OPEN("businessOpen", "检验检测业务开通","114");
private String code; private String code;
private String name; private String name;
......
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
View file @ daf35e63
...@@ -33,10 +33,12 @@ import com.yeejoin.amos.boot.module.jyjc.biz.feign.TzsServiceFeignClient; ...@@ -33,10 +33,12 @@ import com.yeejoin.amos.boot.module.jyjc.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jyjc.biz.service.TaskModelServiceImpl; 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.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto; import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.BaseUnitLicence;
import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.BaseUnitLicenceMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.vo.TzsUserInfoVo; import com.yeejoin.amos.boot.module.ymt.api.vo.TzsUserInfoVo;
...@@ -84,8 +86,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -84,8 +86,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
@Autowired @Autowired
JyjcOpeningApplicationMapper jyjcOpeningApplicationMapper; JyjcOpeningApplicationMapper jyjcOpeningApplicationMapper;
@Resource(type = JyjcBaseMapper.class)
private JyjcBaseMapper baseMapper;
@Value("${process-definition-key.jyjc.openapplication:}") @Value("${process-definition-key.jyjc.openapplication:}")
private String processDefinitionKey; private String processDefinitionKey;
...@@ -112,6 +112,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -112,6 +112,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
private TzBaseEnterpriseInfoMapper enterpriseInfoMapper; private TzBaseEnterpriseInfoMapper enterpriseInfoMapper;
@Autowired @Autowired
BaseUnitLicenceMapper baseUnitLicenceMapper;
@Autowired
private TzsUserInfoMapper userInfoMapper; private TzsUserInfoMapper userInfoMapper;
@Autowired @Autowired
...@@ -403,15 +406,18 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -403,15 +406,18 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
} }
private void setBaseUnitLicences(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel, boolean isNeedFilter) { private void setBaseUnitLicences(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel, boolean isNeedFilter) {
List<TzBaseUnitLicenceDto> baseUnitLicences = baseMapper.selectBaseUnitLicenceList(MapBuilder.<String, Object>create().put("unitCode", unitCode).put("licenceType", "jyjc").build()); List<BaseUnitLicence> baseUnitLicences = baseUnitLicenceMapper.selectList(new LambdaQueryWrapper<BaseUnitLicence>().eq(BaseUnitLicence::getUnitCode, unitCode).in(BaseUnitLicence::getCertTypeCode, Arrays.asList(jyCertTypeCode, jcCertTypeCode)));
baseUnitLicences.forEach(licenceDto -> { List<TzBaseUnitLicenceDto> baseUnitLicencesDtos = baseUnitLicences.stream().map(l->{
licenceDto.setCertTypeCode(this.castCode2Str(licenceDto.getCertTypeCode())); TzBaseUnitLicenceDto licenceDto = new TzBaseUnitLicenceDto();
}); BeanUtil.copyProperties(l,licenceDto);
licenceDto.setCertTypeCode(this.castCode2Str(l.getCertTypeCode()));
return licenceDto;
}).collect(Collectors.toList());
if (isNeedFilter) { if (isNeedFilter) {
baseUnitLicences = baseUnitLicences.stream().filter(u -> u.getCertTypeCode().equals(jyjcOpeningApplicationModel.getOpenBizType())).collect(Collectors.toList()); baseUnitLicencesDtos = baseUnitLicencesDtos.stream().filter(u -> u.getCertTypeCode().equals(jyjcOpeningApplicationModel.getOpenBizType())).collect(Collectors.toList());
jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicences); jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicencesDtos);
} else { } else {
jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicences); jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicencesDtos);
} }
} }
...@@ -432,10 +438,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -432,10 +438,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
private void setJYJCUserList(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel, boolean isNeedFilter) { private void setJYJCUserList(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel, boolean isNeedFilter) {
LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper = new LambdaQueryWrapper<>();
userInfoQueryWrapper.eq(TzsUserInfo::getUnitCode, unitCode); userInfoQueryWrapper.eq(TzsUserInfo::getUnitCode, unitCode);
if (StringUtils.isBlank(jyjcOpeningApplicationModel.getWorkflowProstanceId())) { userInfoQueryWrapper.eq(BaseEntity::getIsDelete, false);
// 如果未开启流程则只查询未被删除的用户
userInfoQueryWrapper.eq(BaseEntity::getIsDelete, false);
}
List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper); List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
if (!ValidationUtil.isEmpty(userInfos)) { if (!ValidationUtil.isEmpty(userInfos)) {
List<TzsUserInfoVo> tzsUserInfoVos = userInfos.stream().map(userInfo -> { List<TzsUserInfoVo> tzsUserInfoVos = userInfos.stream().map(userInfo -> {
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @ daf35e63
...@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto; ...@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsBaseInstitutionDto; import com.yeejoin.amos.boot.module.tcm.api.dto.TzsBaseInstitutionDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.*; import com.yeejoin.amos.boot.module.tcm.api.entity.*;
import com.yeejoin.amos.boot.module.tcm.api.enums.EnterpriseEnums; import com.yeejoin.amos.boot.module.tcm.api.enums.EnterpriseEnums;
import com.yeejoin.amos.boot.module.tcm.api.enums.LicenceTypeEnum;
import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum; import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper; import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper; import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
...@@ -40,6 +41,7 @@ import com.yeejoin.amos.feign.privilege.Privilege; ...@@ -40,6 +41,7 @@ import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel; import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -106,6 +108,12 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -106,6 +108,12 @@ public class TzBaseEnterpriseInfoServiceImpl
@Autowired @Autowired
private EquipmentCategoryServiceImpl equipmentCategoryService; private EquipmentCategoryServiceImpl equipmentCategoryService;
private static final Map<String ,String> JYJC_CERT_MAP = new HashMap<>();
static {
JYJC_CERT_MAP.put("1233-1","检验机构");
JYJC_CERT_MAP.put("1233-2","检测机构");
}
/** /**
* 用户选择信心redis获取 * 用户选择信心redis获取
**/ **/
...@@ -623,21 +631,10 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -623,21 +631,10 @@ public class TzBaseEnterpriseInfoServiceImpl
ReginParams selectedOrgInfo = getSelectedOrgInfo(); ReginParams selectedOrgInfo = getSelectedOrgInfo();
String companyType = selectedOrgInfo.getCompany().getCompanyType(); String companyType = selectedOrgInfo.getCompany().getCompanyType();
// 根据新的单位类型代码查询许可证书类型名称 // 根据新的单位类型代码查询许可证书类型名称
Optional<String> certTypeOptional; fillCertTypeName(baseUnitLicence, dictionaries, companyType);
if (INSPECTION_AND_TESTING_INSTITUTIONS.equals(companyType)) {
certTypeOptional = Optional.of(baseUnitLicence.getCertType());
} else {
certTypeOptional = dictionaries.stream()
.filter(d -> "UNIT_TYPE_NEW".equals(d.getType()) && baseUnitLicence.getCertTypeCode().startsWith(d.getCode()))
.map(DataDictionary::getName)
.findFirst();
}
// 设置许可证书类型
certTypeOptional.ifPresent(baseUnitLicence::setCertType);
// 查询项目代码对应的名称 // 查询项目代码对应的名称
Optional<String> itemCodeOptional = dictionaries.stream() Optional<String> itemCodeOptional = dictionaries.stream()
.filter(d -> ((!ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-")) || HZXM.equals(d.getType())) && d.getCode().equals(baseUnitLicence.getItemCode())) .filter(d -> ((!ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-")) || HZXM.equals(d.getType())) && d.getCode().equals(baseUnitLicence.getItemCode()))
.map(DataDictionary::getName) .map(DataDictionary::getName)
...@@ -686,6 +683,23 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -686,6 +683,23 @@ public class TzBaseEnterpriseInfoServiceImpl
appraisalTypeOptional.ifPresent(baseUnitLicence::setAppraisalType); appraisalTypeOptional.ifPresent(baseUnitLicence::setAppraisalType);
} }
private void fillCertTypeName(BaseUnitLicence baseUnitLicence, List<DataDictionary> dictionaries, String companyType) {
if (INSPECTION_AND_TESTING_INSTITUTIONS.equals(companyType)) {
if(StringUtils.isEmpty(baseUnitLicence.getCertType())){
String certTypeName = JYJC_CERT_MAP.get(baseUnitLicence.getCertTypeCode());
baseUnitLicence.setCertType(certTypeName);
}
baseUnitLicence.setLicenceType(LicenceTypeEnum.JYJC.getCode());
} else {
Optional<String> certTypeOptional = dictionaries.stream()
.filter(d -> "UNIT_TYPE_NEW".equals(d.getType()) && baseUnitLicence.getCertTypeCode().startsWith(d.getCode()))
.map(DataDictionary::getName)
.findFirst();
// 设置许可证书类型
certTypeOptional.ifPresent(baseUnitLicence::setCertType);
}
}
private void updateUserInfo(ArrayList<String> newDate, String creditCode) { private void updateUserInfo(ArrayList<String> newDate, String creditCode) {
LambdaQueryWrapper<TzsUserInfo> lambda = new QueryWrapper<TzsUserInfo>().lambda(); LambdaQueryWrapper<TzsUserInfo> lambda = new QueryWrapper<TzsUserInfo>().lambda();
lambda.eq(TzsUserInfo::getUnitCode, creditCode); lambda.eq(TzsUserInfo::getUnitCode, creditCode);
......
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