From d66eccc722b46fbb4b57bf28736b6f63a5ed0504 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 02 二月 2024 14:37:50 +0800
Subject: [PATCH] Mr.Shi
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 84 insertions(+), 21 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 0d06fbd..2a99876 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -101,6 +101,8 @@
@Autowired
private SolutionsMapper solutionsMapper;
+ @Autowired
+ private NoticesMapper noticesMapper;
/**
* 骞冲彴閫�鍥炴姇淇�
* @param param
@@ -126,7 +128,7 @@
ApplyChange update = new ApplyChange();
update.setEditDate(new Date());
update.setEditor(user.getId());
- update.setStatus(Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey());
+ update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo(param.getCheckInfo());
update.setCheckUserId(user.getId());
@@ -510,10 +512,23 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+ if(Objects.isNull(insuranceApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(insuranceApply.getIsdeleted().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�");
+ }
+ Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+ }
+
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Constants.ApplyLogType applyLogType = null;
String info = "";
ApplyChange update = new ApplyChange();
+ Constants.NoticeType noticeType = Constants.NoticeType.FOUR;
if(param.getDealBackApply() ==1){
//濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
@@ -522,12 +537,8 @@
applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
info = applyLogType.getInfo();
info = info.replace("${param}", param.getCheckInfo());
-//
- if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
- update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
- }else if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())){
- update.setStatus(Constants.ApplyChangeStatus.UPLOAD.getKey());
- }
+ update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+ noticeType = Constants.NoticeType.FIVE;
}else{
//濡傛灉鏄悓鎰�,涓ょ鐢宠閫�鍥炵姸鎬侀兘鍙搷浣�
if(!(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
@@ -537,6 +548,7 @@
update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
applyLogType = Constants.ApplyLogType.CA_PLATFORM_AGREE_BACK_APPLY;
}
+
update.setEditDate(new Date());
update.setEditor(user.getId());
//鍚屾剰閫�鍥烇紝鐩存帴鍥炲埌鏈�鍒濈姸鎬侊紝濡傛灉椹冲洖閫�鍥炵敵璇凤紝鍒欎繚鍗曠姸鎬佸洖鍒板緟涓婁紶淇濋櫓鍗�
@@ -545,6 +557,18 @@
update.setCheckUserId(user.getId());
update.setId(model.getId());
applyChangeMapper.updateById(update);
+
+
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+ if(model.getType().equals(Constants.ONE)){
+ noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+ }
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),solutions.getName(),
+ model.getCompanyId(), noticeType);
+ noticesMapper.insert(notices);
ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
@@ -568,7 +592,6 @@
if (!loginUserInfo.getType().equals(Constants.ONE)) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
}
- BigDecimal fee = BigDecimal.ZERO;
InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
if (Objects.isNull(insuranceApply)) {
@@ -606,12 +629,13 @@
applyChange.setStatus(Constants.ZERO);
applyChangeMapper.insert(applyChange);
- this.dealApplyChangeData(applyChange,insuranceApply,companySolution,solutions,loginUserInfo,fee);
+ BigDecimal fee = this.dealApplyChangeData(applyChange,insuranceApply,companySolution,solutions,loginUserInfo,BigDecimal.ZERO);
ApplyChange applyChangeFee = new ApplyChange();
applyChangeFee.setId(applyChange.getId());
applyChangeFee.setFee(fee);
applyChangeMapper.updateById(applyChangeFee);
+
this.saveApplyLog(applyChange,Constants.ApplyChangeLogStatus.UPLOAD,null);
return applyChange.getId();
@@ -640,7 +664,9 @@
if(Objects.isNull(dbApplyChange)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!dbApplyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
+ if(! (dbApplyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())
+ || dbApplyChange.getStatus().equals(Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey()) )
+ ){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "涓氬姟淇濈敵璇峰崟鐘舵�侀敊璇�");
}
@@ -676,12 +702,12 @@
applyChange.setEditDate(new Date());
applyChange.setEditor(loginUserInfo.getId());
+ applyChange.setApplyStartTime(applyChange.getValidTime());
applyChange.setStatus(Constants.ZERO);
- BigDecimal fee = BigDecimal.ZERO;
//鍒犻櫎鍘嗗彶鏁版嵁
applyChagneDetailJoinMapper.delete(new QueryWrapper<ApplyChagneDetail>().lambda().eq(ApplyChagneDetail::getApplyChangeId,applyChange.getId()));
- this.dealApplyChangeData(applyChange,insuranceApply,companySolution,solutions,loginUserInfo,fee);
+ BigDecimal fee = this.dealApplyChangeData(applyChange,insuranceApply,companySolution,solutions,loginUserInfo,BigDecimal.ZERO);
applyChange.setFee(fee);
applyChangeMapper.updateById(applyChange);
this.saveApplyLog(applyChange,Constants.ApplyChangeLogStatus.UPLOAD,null);
@@ -689,7 +715,7 @@
}
- public void dealApplyChangeData(ApplyChange applyChange,InsuranceApply insuranceApply,CompanySolution companySolution,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal fee){
+ public BigDecimal dealApplyChangeData(ApplyChange applyChange,InsuranceApply insuranceApply,CompanySolution companySolution,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal fee){
//鏌ヨ淇濋櫓鏂规涓嬬殑鎵�鏈夋淳閬ｅ崟浣�
@@ -725,7 +751,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
}
//鍔犱繚鏄庣粏鏁版嵁 璁＄畻閲戦 鏍规嵁鎵瑰崟鏃堕棿 璁＄畻
- applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(insuranceApply.getStartTime(),1));
+ applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),1));
CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
@@ -741,7 +767,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽噺淇�");
}
//鍑忎繚鏄庣粏鏁版嵁 璁＄畻閲戦 鏍规嵁鎵瑰崟鏃堕棿 鍓嶄竴澶� 璁＄畻
- applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(insuranceApply.getStartTime(),3));
+ applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),3));
CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo,detailFee);
@@ -753,6 +779,7 @@
if (CollectionUtils.isNotEmpty(changeDetailList)) {
this.changeDetail(applyChange,changeDetailList,duWorktypeList,duSolutionList,loginUserInfo);
}
+ return fee;
}
@@ -798,6 +825,7 @@
if (applyChagneDetailJoinMapper.selectJoinCount(
new MPJLambdaWrapper<ApplyChagneDetail>()
.leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+ .eq(ApplyChange::getApplyId,applyChange.getApplyId())
.eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
.in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
) > Constants.ZERO) {
@@ -822,7 +850,7 @@
applyChagneDetail.setType(Constants.ONE);
applyChagneDetail.setStartTime(DateUtil.getMontageDate(applyDetail.getStartTime(),1));
- applyChagneDetail.setEndTime(DateUtil.getMontageDate(applyChange.getStartTime(),3));
+ applyChagneDetail.setEndTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),3));
applyChagneDetail.setFee( detailFee.multiply(new BigDecimal(-1)));
applyChagneDetailJoinMapper.insert(applyChagneDetail);
@@ -891,6 +919,7 @@
new MPJLambdaWrapper<ApplyChagneDetail>()
.leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
.eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
+ .eq(ApplyChange::getApplyId,applyChange.getApplyId())
.in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
) > Constants.ZERO) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
@@ -963,10 +992,11 @@
List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
.eq(ApplyDetail::getApplyId, applyChange.getApplyId())
.eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
- .le(ApplyDetail::getStartTime, DateUtil.getDate(new Date(),"yyyy-MM-dd HH:mm:ss"))
- .ge(ApplyDetail::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd HH:mm:ss")));
+ .ge(ApplyDetail::getEndTime, new Date()));
if(applyDetailList.size()>Constants.ONE){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯革紝瀛樺湪澶氭潯鏁版嵁");
+ }else if(applyDetailList.size()==Constants.ZERO){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒版姇淇濊褰�");
}
ApplyDetail applyDetail = applyDetailList.get(Constants.ZERO);
if(applyChange.getValidTime().compareTo( applyDetail.getEndTime())>0){
@@ -1128,7 +1158,7 @@
public void changeOpt(ApplyChangeOptDTO applyChangeOptDTO){
if(Objects.isNull(applyChangeOptDTO)
||Objects.isNull(applyChangeOptDTO.getApplyId())
- ||StringUtils.isBlank(applyChangeOptDTO.getOptIllustration())){
+ ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -1144,11 +1174,20 @@
if(applyChange.getIsdeleted().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�");
}
+ Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+ }
+
Constants.ApplyChangeLogStatus applyChangeLogStatus = Constants.ApplyChangeLogStatus.RETURN_APPLY;
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+ if(applyChange.getType().equals(Constants.ONE)){
+ noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+ }
if(applyChangeOptDTO.getOptType().equals(3)){
//鍙戣捣閫�鍥炵敵璇�
- if(loginUserInfo.getType().equals(Constants.ONE)){
+ if(!loginUserInfo.getType().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
}
if(!(applyChange.getStatus().equals(Constants.ApplyChangeStatus.UPLOAD.getKey())
@@ -1161,6 +1200,14 @@
}else{
applyChange.setStatus(Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey());
}
+
+ //瀛樺偍寰呭姙淇℃伅
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,applyChange.getId(),solutions.getName(),
+ applyChange.getCompanyId(), Constants.NoticeType.THREE);
+ noticesMapper.insert(notices);
+
}else if(applyChangeOptDTO.getOptType().equals(4)){
applyChangeLogStatus = Constants.ApplyChangeLogStatus.PLATFORM_AGREE;
@@ -1192,13 +1239,19 @@
}else if(applyChangeOptDTO.getOptType().equals(6)){
//浼佷笟鍏抽棴
applyChangeLogStatus = Constants.ApplyChangeLogStatus.CLOSE;
- if(loginUserInfo.getType().equals(Constants.ONE)){
+ if(!loginUserInfo.getType().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
}
if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
}
applyChange.setStatus(Constants.ApplyChangeStatus.CLOSE.getKey());
+
+
+ //瀛樺偍寰呭姙淇℃伅
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));
+
}else{
throw new BusinessException(ResponseStatus.BAD_REQUEST );
}
@@ -1326,6 +1379,14 @@
if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠＄悊鍛樼‘璁");
}
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+ if(Objects.isNull(insuranceApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇繚鍗曚俊鎭�");
+ }
+ Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+ }
String fileUrl = null;
if(Constants.equalsObject(model.getType(), Constants.ONE)){
fileUrl = ExcelExporter.build(ApplyChange.class).exportChangeUnitExcelToPdf(model,"鎹㈠巶鐢宠琛�");
@@ -1349,6 +1410,8 @@
update.setSignApplyNo(applyNo);
applyChangeMapper.updateById(update);
+
+
return link;
}
--
Gitblit v1.9.3