From bcae1eeb59ff2094f14043a0488b1abb25130831 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 六月 2025 14:23:02 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 210 +++++++++++++++++++++++++++++++---------------------
1 files changed, 126 insertions(+), 84 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 4e99ce8..acc8c9a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -21,6 +21,7 @@
import com.doumee.dao.business.join.ApplyDetailJoinMapper;
import com.doumee.dao.business.join.DispatchUnitJoinMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
+import com.doumee.dao.business.join.SolutionWorktypeJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -39,6 +40,8 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -67,6 +70,8 @@
private SolutionsMapper solutionsMapper;
@Autowired
private InsuranceApplyMapper insuranceApplyMapper;
+ @Autowired
+ private SolutionWorktypeJoinMapper solutionWorktypeJoinMapper;
@Override
public Integer create(Member member) {
@@ -224,50 +229,43 @@
LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
//浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
if(loginUserInfo.getType().equals(Constants.ONE)){
- queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+ queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId())
+ .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id where a.member_id = t.id and b.company_id = "+loginUserInfo.getCompanyId()+" and b.status in (" +
+ " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
+ " and a.end_time >= now() ) ", Member::getValidNum )
+
+ .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id where a.member_id = t.id and b.company_id = "+loginUserInfo.getCompanyId()+" and b.status in (" +
+ " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
+ " and a.end_time < now() ) ", Member::getInvalidNum );
}else{
if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
}else{
queryWrapper.eq(InsuranceApply::getCompanyId, -1);
}
- queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
+ queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId())
+ .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id where a.member_id = t.id and b.status in (" +
+ " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
+ " and a.end_time >= now() ) ", Member::getValidNum )
+ .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id where a.member_id = t.id and b.status in (" +
+ " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
+ " and a.end_time < now() ) ", Member::getInvalidNum );
}
queryWrapper.selectAll(Member.class)
- .selectAs(DispatchUnit::getName,Member::getDuName)
- .selectAs(Worktype::getName,Member::getWorkTypeName)
- .selectAs(Solutions::getName,Member::getSolutionName)
- .selectAs(Company::getName,Member::getCompanyName)
- .select(" case when now() between t.start_time and t.end_time then 1 else 2 end solutionsStatus ")
- .leftJoin(InsuranceApply.class,InsuranceApply::getId,Member::getApplyId)
- .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
- .leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId)
- .leftJoin(Worktype.class,Worktype::getId,Member::getWorktypeId)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.and(StringUtils.isNotBlank(memberQueryDTO.getKeywords()),
i->i.like(Member::getName, memberQueryDTO.getKeywords()).or().like(
Member::getIdcardNo,memberQueryDTO.getKeywords()
))
.eq(Member::getIsdeleted, Constants.ZERO)
-// .eq(Member::getCompanyId, memberQueryDTO.getCompanyId())
.like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName())
.like(StringUtils.isNotBlank(memberQueryDTO.getIdCard()),Member::getIdcardNo, memberQueryDTO.getIdCard())
.like(StringUtils.isNotBlank(memberQueryDTO.getIdcardNo()),Member::getIdcardNo, memberQueryDTO.getIdcardNo())
- .like(StringUtils.isNotBlank(memberQueryDTO.getDuName()),DispatchUnit::getName, memberQueryDTO.getDuName())
- .eq(!Objects.isNull(memberQueryDTO.getDuId()),Member::getDuId, memberQueryDTO.getDuId())
- .eq(!Objects.isNull(memberQueryDTO.getSolutionsId()),Solutions::getBaseId, memberQueryDTO.getSolutionsId())
- .apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.ONE),"now() between t.start_time and t.end_time")
- .apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.TWO),"now() > t.end_time")
+
+ .apply(!Objects.isNull(memberQueryDTO.getSolutionsId())," t.id in( select a.member_id from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id " +
+ "inner join solutions s on b.solution_id = s.id where s.base_id = '"+memberQueryDTO.getSolutionsId()+"' ) ")
;
queryWrapper.orderByAsc(DispatchUnit::getName);
queryWrapper.orderByAsc(Member::getName);
-// for(PageWrap.SortData sortData: pageWrap.getSorts()) {
-// if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
-// queryWrapper.orderByDesc(sortData.getProperty());
-// } else {
-// queryWrapper.orderByAsc(sortData.getProperty());
-// }
-// }
PageData<Member> pageData = PageData.from(memberJoinMapper.selectJoinPage(page,Member.class, queryWrapper));
Integer sn = 0;
@@ -277,6 +275,7 @@
if(StringUtils.isNotBlank(member.getIdcardNo())){
member.setAge(Constants.getAgeByIdCard(member.getIdcardNo()));
}
+ member.setTotalNum(member.getInvalidNum()+member.getValidNum());
}
return pageData;
}
@@ -351,15 +350,18 @@
if(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())&&Objects.nonNull(memberQueryDTO.getValidTime())){
if(CollectionUtils.isNotEmpty(memberList)){
Solutions solutions = solutionsMapper.selectById(memberList.get(Constants.ZERO).getSolutionId());
- Date reduceEndTime = DateUtil.getMontageDate(
- DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
-// memberList = memberList.stream().filter(member->member.getDetailStartTime().getTime()<=reduceEndTime.getTime()
-// &&member.getDetailEndTime().getTime()>=reduceEndTime.getTime()).collect(Collectors.toList());
+// Date reduceEndTime = DateUtil.getMontageDate(
+// DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
+// Date reduceEndTime = DateUtil.getMontageDate(new Date(),3);
for (Member member:memberList) {
- //鍑忎繚涓氬姟 浣跨敤 閫夋嫨浜哄憳 鏍规嵁鏃ユ湡瀹炴椂鏌ヨ
- if(reduceEndTime.getTime()<=member.getStartTime().getTime()){
- member.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
+ //濡傛灉褰撳墠鏃ユ湡 灏忎簬 浜哄憳淇濆崟鏄庣粏璁板綍鐨勫紑濮嬫椂闂� 鍒欎娇鐢ㄥ紑濮嬫棩鏈� 寮�濮嬫棩鏈� = 缁撴潫鏃ユ湡 涓� 璐圭敤鍏ㄩ儴閫�鍥�
+// if(System.currentTimeMillis()<=member.getStartTime().getTime()){
+// member.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
+ if(System.currentTimeMillis()<=member.getDetailStartTime().getTime()){
+ member.setFee(member.getFee().multiply(new BigDecimal(-1)));
}else{
+ Date reduceEndTime = DateUtil.getMontageDate(
+ DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
member.setFee(
Constants.reduceFee(solutions,
Objects.isNull(member.getDetailServerCost())?
@@ -412,8 +414,10 @@
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
- Date reduceEndTime = DateUtil.getMontageDate(
- DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
+// Date reduceEndTime = DateUtil.getMontageDate(
+// DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
+
+// Date reduceEndTime = DateUtil.getMontageDate(new Date(),3);
int index = Constants.TWO;
Map<String,String> idCardMap = new HashMap<>();
for(MemberReduceImport model : dataList){
@@ -437,7 +441,10 @@
.eq(ApplyDetail::getApplyId,insuranceApply.getId())
.eq(ApplyDetail::getIdcardNo,model.getIdCard())
/* .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))*/
- .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3)));
+ .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3))
+ .orderByAsc(ApplyDetail::getEndTime)
+ .last(" limit 1 ")
+ );
if(detail == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍛樺伐銆�" + model.getName()+model.getIdCard() + "銆戦潪鍦ㄤ繚浜哄憳锛屾棤娉曡繘琛岃鎿嶄綔");
}
@@ -452,18 +459,19 @@
model.setWorktypeId(detail.getWorktypeId());
model.setMemberId(detail.getMemberId());
model.setWorkTypeName(detail.getWorkTypeName());
- if(reduceEndTime.getTime()<=detail.getStartTime().getTime()){
+ //濡傛灉褰撳墠鏃ユ湡 灏忎簬 浜哄憳淇濆崟鏄庣粏璁板綍鐨勫紑濮嬫椂闂� 鍒欎娇鐢ㄥ紑濮嬫棩鏈� 寮�濮嬫棩鏈� = 缁撴潫鏃ユ湡 涓� 璐圭敤鍏ㄩ儴閫�鍥�
+ if(System.currentTimeMillis()<=detail.getStartTime().getTime()){
model.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
}else{
+ Date reduceEndTime = DateUtil.getMontageDate(
+ DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
model.setFee(
Constants.reduceFee(solutions,
- Objects.isNull(detail.getDetailServerCost())?solutions.getPrice():solutions.getPrice().add(detail.getDetailServerCost()),
- insuranceApply.getStartTime(),
- insuranceApply.getEndTime(),
- detail.getStartTime(),
- reduceEndTime)
- .subtract(detail.getFee())
- );
+ Objects.isNull(detail.getDetailServerCost())?solutions.getPrice():solutions.getPrice().add(detail.getDetailServerCost()),
+ insuranceApply.getStartTime(),
+ insuranceApply.getEndTime(),
+ detail.getStartTime(),
+ reduceEndTime).subtract(detail.getFee()));
}
index += 1;
}
@@ -497,6 +505,13 @@
if(!loginUserInfo.getType().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氫汉鍛樻棤娉曡繘琛岃鎿嶄綔");
}
+ if(Objects.isNull(solutionId)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒 - 鏂规淇℃伅");
+ }
+ Solutions solutions = solutionsMapper.selectById(solutionId);
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+ }
ExcelImporter ie = null;
List<MemberImport> dataList =null;
try {
@@ -512,13 +527,16 @@
Map<String,String> idCardMap = new HashMap<>();
for(MemberImport model : dataList){
//鏍￠獙鍙傛暟鏄惁鍚堟硶
- validImportParam(model,idCardMap,dataList,index,solutionId);
+ validImportParam(model,idCardMap,dataList,index,solutions);
index += 1;
}
- List<DispatchUnit> dispatchUnitList = dispatchUnitJoinMapper.selectJoinList(DispatchUnit.class,
+ List<DispatchUnit> dispatchUnitList = new ArrayList<>();
+ List<SolutionWorktype> solutionWorktypeList = new ArrayList<>();
+ //2024骞�11鏈�6鏃�15:39:10 鍔犲叆 鏍规嵁鏂规鏄惁鏈変繚闄╂柟妗堣繘琛屽垽鏂�
+ if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+ dispatchUnitList = dispatchUnitJoinMapper.selectJoinList(DispatchUnit.class,
new MPJLambdaWrapper<DispatchUnit>()
.selectAll(DispatchUnit.class)
-// .select("(select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.solution_id="+solutionId+" limit 1) as du_solution_id" )
.select("(select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.solution_id="+solutionId+" order by b.CHECK_DATE desc limit 1) as du_solution_id" )
.eq(DispatchUnit::getIsdeleted,Constants.ZERO)
.eq(DispatchUnit::getStatus,Constants.ZERO)
@@ -526,70 +544,94 @@
.eq(loginUserInfo.getType().equals(Constants.ONE),DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
.exists("select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.status = 1 and b.solution_id="+solutionId )
);
- if(CollectionUtils.isNotEmpty(dispatchUnitList)){
- for (DispatchUnit dispatchUnit:dispatchUnitList) {
- List<Worktype> worktypeList = worktypeMapper.selectList(new QueryWrapper<Worktype>().lambda()
- .eq(Worktype::getIsdeleted,Constants.ZERO)
- .eq(Worktype::getDataType,Constants.TWO)
- .eq(Worktype::getStatus,Constants.ZERO)
- .apply("id in ( select dw.work_type_id from du_worktype dw where dw.status = 1" +
- " and dw.du_solution_id = "+dispatchUnit.getDuSolutionId()+" )")
- );
- dispatchUnit.setWorktypeList(worktypeList);
+ if(CollectionUtils.isNotEmpty(dispatchUnitList)){
+ for (DispatchUnit dispatchUnit:dispatchUnitList) {
+ List<Worktype> worktypeList = worktypeMapper.selectList(new QueryWrapper<Worktype>().lambda()
+ .eq(Worktype::getIsdeleted,Constants.ZERO)
+ .eq(Worktype::getDataType,Constants.TWO)
+ .eq(Worktype::getStatus,Constants.ZERO)
+ .apply("id in ( select dw.work_type_id from du_worktype dw where dw.status = 1" +
+ " and dw.du_solution_id = "+dispatchUnit.getDuSolutionId()+" )")
+ );
+ dispatchUnit.setWorktypeList(worktypeList);
+ }
+ }
+ }else{
+ //鏂规涓嶉�夋嫨娲鹃仯鍗曚綅鎯呭喌涓嬬殑涓氬姟
+ solutionWorktypeList = solutionWorktypeJoinMapper.selectJoinList(SolutionWorktype.class,
+ new MPJLambdaWrapper<SolutionWorktype>()
+ .selectAll(SolutionWorktype.class)
+ .selectAs(Worktype::getName,SolutionWorktype::getWorktypeName)
+ .leftJoin(Worktype.class,Worktype::getId,SolutionWorktype::getWorktypeId)
+ .eq(SolutionWorktype::getSolutionId,solutions.getId())
+ );
+ if(CollectionUtils.isEmpty(solutionWorktypeList)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝淇濋櫓鏂规涓嬫湭鏌ヨ鍒板伐绉嶄俊鎭�");
}
}
+ //String pattern = "^[\\u4e00-\\u9fa5\\d路]+$";
+ String pattern = "^[\\u4e00-\\u9fa5路]*$";
+ Pattern r = Pattern.compile(pattern);
index = Constants.TWO;
for(MemberImport model : dataList){
- //鏍￠獙浜哄憳鏄惁宸茬粡鍦ㄥ弬淇濅腑
- isMemberValidForSolution(model,index,solutionId);
+ Matcher m = r.matcher(model.getName());
+ if (!m.matches()) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝"+model.getName() + "濮撳悕鏃犳晥锛岃妫�鏌ュ悗閲嶈瘯");
+ }
//妫�鏌ユ淳閬ｅ崟浣嶅拰宸ョ鏈夋晥鎬�
- dealDuAndWorktype(model,index,dispatchUnitList);
+ dealDuAndWorktype(model,index,dispatchUnitList,solutions,solutionWorktypeList);
index += 1;
+ model.setSex(Constants.getSexByIdCard(model.getIdCard()));
}
return dataList;
}
- private void isMemberValidForSolution(MemberImport model, int index, Integer solutionId) {
- /* ApplyDetail detail = applyDetailJoinMapper.selectJoinOne(ApplyDetail.class,new MPJLambdaWrapper<ApplyDetail>()
- .last("limit 1"));
- if(detail!=null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛岃韩浠借瘉涓恒��"+model.getIdCard()+"銆戜汉鍛樺凡缁忓湪璇ユ柟妗堜笅瀛樺湪鎶曚繚璁板綍锛�");
- }*/
- }
- private void dealDuAndWorktype(MemberImport model, int index, List<DispatchUnit> dispatchUnitList ) {
-
- if(CollectionUtils.isNotEmpty(dispatchUnitList)){
- Optional<DispatchUnit> dispatchUnitOptional= dispatchUnitList.stream().filter(m->m.getName().equals(model.getDuName())).findFirst();
- if(dispatchUnitOptional.isPresent()){
- DispatchUnit dispatchUnit = dispatchUnitOptional.get();
- model.setDuId(dispatchUnit.getId());
- if(StringUtils.isNotBlank(model.getWorkTypeName())&&CollectionUtils.isNotEmpty(dispatchUnit.getWorktypeList())){
- Optional<Worktype> worktypeOptional= dispatchUnit.getWorktypeList().stream().filter(m->m.getName().replaceAll(" ","").equals(model.getWorkTypeName().replaceAll(" ",""))).findFirst();
- if(worktypeOptional.isPresent()){
- Worktype worktype = worktypeOptional.get();
- model.setWorktypeId(worktype.getId());
+ private void dealDuAndWorktype(MemberImport model, int index, List<DispatchUnit> dispatchUnitList , Solutions solutions,List<SolutionWorktype> solutionWorktypeList) {
+ //2024骞�11鏈�6鏃�15:39:10 鍔犲叆 鏍规嵁鏂规鏄惁鏈変繚闄╂柟妗堣繘琛屽垽鏂�
+ if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+ if(CollectionUtils.isNotEmpty(dispatchUnitList)){
+ Optional<DispatchUnit> dispatchUnitOptional= dispatchUnitList.stream().filter(m->m.getName().equals(model.getDuName())).findFirst();
+ if(dispatchUnitOptional.isPresent()){
+ DispatchUnit dispatchUnit = dispatchUnitOptional.get();
+ model.setDuId(dispatchUnit.getId());
+ if(StringUtils.isNotBlank(model.getWorkTypeName())&&CollectionUtils.isNotEmpty(dispatchUnit.getWorktypeList())){
+ Optional<Worktype> worktypeOptional= dispatchUnit.getWorktypeList().stream().filter(m->m.getName().replaceAll(" ","").equals(model.getWorkTypeName().replaceAll(" ",""))).findFirst();
+ if(worktypeOptional.isPresent()){
+ Worktype worktype = worktypeOptional.get();
+ model.setWorktypeId(worktype.getId());
+ }
}
}
}
- }
- if(Objects.isNull(model.getDuId())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹淳閬ｅ崟浣嶃��"+model.getDuName()+"銆戜笉姝ｇ‘锛�");
+ if(Objects.isNull(model.getDuId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹淳閬ｅ崟浣嶃��"+model.getDuName()+"銆戜笉姝ｇ‘锛�");
+ }
+ }else{
+ Optional<SolutionWorktype> worktypeOptional= solutionWorktypeList.stream().filter(m->m.getWorktypeName().replaceAll(" ","")
+ .equals(model.getWorkTypeName().replaceAll(" ",""))).findFirst();
+ if(worktypeOptional.isPresent()){
+ SolutionWorktype worktype = worktypeOptional.get();
+ model.setWorktypeId(worktype.getId());
+ }
}
if(Objects.isNull(model.getWorktypeId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹伐绉嶃��"+model.getWorkTypeName()+"銆戜笉姝ｇ‘锛�");
}
}
- private void validImportParam(MemberImport model, Map<String, String> idCardMap, List<MemberImport> dataList,int index,Integer solutionId) {
+ private void validImportParam(MemberImport model, Map<String, String> idCardMap, List<MemberImport> dataList,int index,Solutions solutions) {
if(StringUtils.isBlank(model.getName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹鍚嶄笉鑳戒负绌猴紒");
}
if(StringUtils.isBlank(model.getIdCard())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹韩浠借瘉鍙蜂笉鑳戒负绌猴紒");
}
- if(StringUtils.isBlank(model.getDuName())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹淳閬ｅ崟浣嶄笉鑳戒负绌猴紒");
+ //2024骞�11鏈�6鏃�15:39:10 鍔犲叆 鏍规嵁鏂规鏄惁鏈変繚闄╂柟妗堣繘琛屽垽鏂�
+ if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+ if(StringUtils.isBlank(model.getDuName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹淳閬ｅ崟浣嶄笉鑳戒负绌猴紒");
+ }
}
if(StringUtils.isBlank(model.getWorkTypeName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹伐绉嶄笉鑳戒负绌猴紒");
--
Gitblit v1.9.3