From bf15135228cbb9ac186cc8cc39e9da32d3f1d90f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 六月 2024 15:51:19 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 58c7774..d72bf05 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1895,7 +1895,7 @@
.apply(" t1.BASE_ID in ( select du.id from dispatch_unit du where du.STATUS = 0 and du.ISDELETED = 0 ) ")
);
if(!CollectionUtils.isNotEmpty(duSolutionList)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝淇濋櫓鏂规涓嬫湭鏌ヨ鍒版淳閬ｅ崟浣嶄俊鎭紝璇风‘淇濇淳閬ｅ崟浣嶅拰宸ヤ綔閰嶇疆骞跺鏍搁�氳繃锛�");
}
//鏌ヨ鎵�鏈夋淳閬ｅ崟浣嶄笅鐨勫伐绉�
List<Integer> duSolutionIdList = duSolutionList.stream().map(i->i.getId()).collect(Collectors.toList());
@@ -1907,7 +1907,7 @@
.eq(checkNewData,Worktype::getDataType,Constants.TWO)
.in(DuWorktype::getDuSolutionId,duSolutionIdList));
if(!CollectionUtils.isNotEmpty(duWorktypeList)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝淇濋櫓鏂规涓嬫湭鏌ヨ鍒板伐绉嶄俊鎭紝璇风‘淇濇淳閬ｅ崟浣嶅拰宸ヤ綔閰嶇疆骞跺鏍搁�氳繃锛�");
}
if(CollectionUtils.isNotEmpty(applyDetailList)){
@@ -1934,7 +1934,7 @@
member.setCompanyId(insuranceApply.getCompanyId());
member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚鍛樺伐淇℃伅韬唤璇佷俊鎭敊璇痆"+member.getName()+"]");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鎶曚繚鍛樺伐銆�"+member.getName()+"銆戣韩浠借瘉淇℃伅銆�"+applyDetail.getIdcardNo()+"銆戦敊璇�");
}
member.setIdcardNo(applyDetail.getIdcardNo());
member.setApplyId(insuranceApply.getId());
@@ -1957,7 +1957,7 @@
||Objects.isNull(applyDetail.getDuId())
||Objects.isNull(applyDetail.getWorktypeId())
){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚鍛樺伐淇℃伅鏁版嵁缂哄け");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鎶曚繚鍛樺伐淇℃伅鏁版嵁缂哄け锛岃鎸夌収瑕佹眰濉啓鍛樺伐鐨勬湁鏁堜俊鎭紒");
}
applyDetail.setCreateDate(new Date());
applyDetail.setCreator(loginUserInfo.getId());
@@ -2011,18 +2011,18 @@
//鑾峰彇璁＄畻鎬诲ぉ鏁�
Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
if(Constants.equalsInteger(maxDays,0)||Objects.isNull(applyDetail.getFee())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚淇℃伅寮傚父锛氭�诲ぉ鏁颁笌鎬婚噾棰濋敊璇�");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚淇℃伅寮傚父锛氭姇淇濇�诲ぉ鏁颁笌鎬婚噾棰濋敊璇�");
}
applyDetail.setPrice(
applyDetail.getFee().divide(new BigDecimal(maxDays),7,RoundingMode.HALF_UP)
);
//楠岃瘉娲鹃仯鍗曚綅淇℃伅鏄惁瀛樺湪
if(duSolutionList.stream().filter(d->d.getDispatchUnitId().equals(applyDetail.getDuId())).collect(Collectors.toList()).size()<=Constants.ZERO){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+applyDetail.getIdcardNo()+"銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
}
if(duWorktypeList.stream().filter(d->d.getWorkTypeId().equals(applyDetail.getWorktypeId()))
.collect(Collectors.toList()).size()<=Constants.ZERO){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+applyDetail.getIdcardNo()+"銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
}
}
applyDetailJoinMapper.insertBatchSomeColumn(applyDetailList);
--
Gitblit v1.9.3