Commit c85bb67d authored by suhuiguang's avatar suhuiguang

refact(注册开通):流程调整

1.证书按照单位类型进行过滤
parent 6fae6c5d
...@@ -374,6 +374,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -374,6 +374,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationRequstDto dto) { public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationRequstDto dto) {
ReginParams reginParams = commonService.getReginParamsOfCurrentUser(); ReginParams reginParams = commonService.getReginParamsOfCurrentUser();
String companyLevel = CommonServiceImpl.getCompanyLevel(reginParams.getCompany());
String currentUserId = RequestContext.getExeUserId(); String currentUserId = RequestContext.getExeUserId();
String level = reginParams.getCompany().getLevel(); String level = reginParams.getCompany().getLevel();
if (BaseController.COMPANY_TYPE_COMPANY.equals(level)) { if (BaseController.COMPANY_TYPE_COMPANY.equals(level)) {
...@@ -394,6 +395,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -394,6 +395,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
openingApplicationModel.setIdentityType(dto.getType()); openingApplicationModel.setIdentityType(dto.getType());
openingApplicationModel.setOpenBizTypeName(this.getOpenBizTypeName(openingApplicationModel.getOpenBizType())); openingApplicationModel.setOpenBizTypeName(this.getOpenBizTypeName(openingApplicationModel.getOpenBizType()));
openingApplicationModel.setUnitCode(this.desensitizeIdCard(openingApplicationModel.getUnitCode())); openingApplicationModel.setUnitCode(this.desensitizeIdCard(openingApplicationModel.getUnitCode()));
openingApplicationModel.setCompanyLevel(companyLevel);
} }
return result; return result;
} }
...@@ -454,7 +456,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -454,7 +456,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
jyjcOpeningApplicationModel.setUnitCodeName(company.getCompanyName()); jyjcOpeningApplicationModel.setUnitCodeName(company.getCompanyName());
jyjcOpeningApplicationModel.setUnitCode(unitCode); jyjcOpeningApplicationModel.setUnitCode(unitCode);
// 证书资质信息 // 证书资质信息
setBaseUnitLicences2(unitCode, jyjcOpeningApplicationModel); setBaseUnitLicences2(unitCode, jyjcOpeningApplicationModel, company.getCompanyType());
// 企业基本信息 // 企业基本信息
setBaseEnterpriseInfo(unitCode, jyjcOpeningApplicationModel); setBaseEnterpriseInfo(unitCode, jyjcOpeningApplicationModel);
} }
...@@ -538,8 +540,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -538,8 +540,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
} }
private void setBaseUnitLicences2(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel) { private void setBaseUnitLicences2(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel, String unitType) {
List<BaseEnterpriseCert> enterpriseCerts = enterpriseCertService.getBaseMapper().selectList(new LambdaQueryWrapper<BaseEnterpriseCert>().eq(BaseEnterpriseCert::getUnitCode, unitCode)); List<BaseEnterpriseCert> enterpriseCerts = enterpriseCertService.getBaseMapper().selectList(new LambdaQueryWrapper<BaseEnterpriseCert>().eq(BaseEnterpriseCert::getUnitCode, unitCode).eq(BaseEnterpriseCert::getUnitType, unitType));
List<BaseEnterpriseCertDto> certDtos = enterpriseCerts.parallelStream().map(c -> { List<BaseEnterpriseCertDto> certDtos = enterpriseCerts.parallelStream().map(c -> {
BaseEnterpriseCertDto enterpriseCertDto = new BaseEnterpriseCertDto(); BaseEnterpriseCertDto enterpriseCertDto = new BaseEnterpriseCertDto();
BeanUtils.copyProperties(c, enterpriseCertDto); BeanUtils.copyProperties(c, enterpriseCertDto);
...@@ -822,7 +824,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp ...@@ -822,7 +824,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
messageModel.setBody("资料校对通过,请尽快处理后续环节!"); messageModel.setBody("资料校对通过,请尽快处理后续环节!");
messageModel.setRelationId(relationId); messageModel.setRelationId(relationId);
messageModel.setTerminal("WEB"); messageModel.setTerminal("WEB");
messageModel.setRoutePath(msgDetailPath); messageModel.setRoutePath(msgDetailPath + "&relationId=" + relationId);
messageModel.setCompanyType(companyType); messageModel.setCompanyType(companyType);
messageModel.setIsRead(false); messageModel.setIsRead(false);
messageModel.setIsSendWeb(true); messageModel.setIsSendWeb(true);
......
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