From 8603613a12466bd41aaeb8db6da56a56c24f8450 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 04 二月 2024 18:31:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 108 ++++++++++++++++++++---------------------------------
1 files changed, 41 insertions(+), 67 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 76c919b..a023f78 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
@@ -369,7 +369,7 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Constants.ApplyLogType applyLogType = null;
String info = "";
- //濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
+ //濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
@@ -485,8 +485,9 @@
}
//鍒犻櫎鍏朵粬寰呭姙
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
- Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),model.getSolutionsName(),
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),model.getSolutionsName(),
model.getCompanyId(), Constants.NoticeType.TWO);
+ notices.setParam1(model.getApplyId().toString());
noticesMapper.insert(notices);
Multifile f = new Multifile();
@@ -566,6 +567,7 @@
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
+ .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
@@ -624,6 +626,7 @@
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
+ .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
@@ -817,7 +820,14 @@
updBean.setFee(applyDetailList.stream().map(ApplyDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
insuranceApplyMapper.updateById(updBean);
//瀛樺偍鏃ュ織鏁版嵁
- this.saveApplyLog(insuranceApply,insuranceApplyStatus,null);
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.UPLOAD;
+ String info =applyLogType.getInfo();
+// info = info.replace("${param}", update.getCheckInfo());
+ ApplyLog log = new ApplyLog(insuranceApply,applyLogType.getName(),info,insuranceApply.getId(),applyLogType.getKey(),null, null);
+ applyLogMapper.insert(log);
+
+
+
//鍙戦�佸緟鍔炰笟鍔�
//瀛樺偍寰呭姙淇℃伅
@@ -896,7 +906,12 @@
insuranceApply.setFee(applyDetailList.stream().map(ApplyDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
insuranceApplyMapper.updateById(insuranceApply);
//瀛樺偍鏃ュ織鏁版嵁
- this.saveApplyLog(insuranceApply,insuranceApplyStatus,null);
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.UPLOAD_AGAIN;
+ String info =applyLogType.getInfo();
+// info = info.replace("${param}", update.getCheckInfo());
+ ApplyLog log = new ApplyLog(insuranceApply,applyLogType.getName(),info,insuranceApply.getId(),applyLogType.getKey(),null, null);
+ applyLogMapper.insert(log);
//瀛樺偍寰呭姙淇℃伅
@@ -1009,43 +1024,6 @@
}
- public void saveApplyLog(InsuranceApply insuranceApply,Constants.InsuranceApplyStatus insuranceApplyStatus,String content){
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- ApplyLog applyLog = new ApplyLog();
- applyLog.setCreateDate(new Date());
- applyLog.setCreator(loginUserInfo.getId());
- applyLog.setIsdeleted(Constants.ZERO);
- applyLog.setApplyId(insuranceApply.getId());
- applyLog.setTitle(insuranceApplyStatus.getName());
- applyLog.setContent(content);
- applyLog.setObjType(insuranceApplyStatus.getKey());
- applyLog.setObjId( insuranceApply.getId());
- applyLog.setStatus(insuranceApply.getStatus());
- applyLogMapper.insert(applyLog);
- }
-
-
-
-// public BigDecimal countDetailFee(Solutions solutions ,Date startDate,Date endDate){
-// //鏌ヨ淇濋櫓瀹為檯鍛ㄦ湡
-// Integer cycle = DateUtil.calculateBetween(endDate,startDate,solutions.getDataType());
-// if(cycle==-1){
-// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃ユ湡淇℃伅閿欒!");
-// }
-// return solutions.getPrice().multiply(new BigDecimal(cycle));
-// }
-
-// public static void main(String[] args) {
-// Date date1 = DateUtil.StringToDate("2023-03-01 00:00:00");
-// Date date2 = DateUtil.StringToDate("2023-04-01 00:00:00");
-// System.out.println(DateUtil.calculateBetween(date1,date2,0));
-// System.out.println(DateUtil.calculateBetween(date1,date2,1));
-// System.out.println(DateUtil.calculateBetween(date1,date2,2));
-// System.out.println(DateUtil.calculateBetween(date1,date2,3));
-//
-// }
-
-
@Override
public void deleteById(Integer id) {
insuranceApplyMapper.deleteById(id);
@@ -1099,7 +1077,6 @@
@Override
public PageData<InsuranceApply> findPage(PageWrap<InsuranceApplyQueryDTO> pageWrap) {
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
IPage<InsuranceApply> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
@@ -1107,10 +1084,10 @@
queryWrapper.selectAll(InsuranceApply.class);
queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
- queryWrapper.select(" DATEDIFF( t.END_TIME ,now() ) AS loseEfficacyDays ");
+ queryWrapper.select(" DATEDIFF( t.END_TIME ,now() ) AS loseEfficacyDays ");
queryWrapper.select(" ( select count(1) from apply_detail ad where ad.apply_id = t.id ) as insureNum");
if(!Objects.isNull(pageWrap.getModel())&&!Objects.isNull(pageWrap.getModel().getType())){
- queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney");
+ queryWrapper.select(" ifnull(( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ),0) as taxesMoney");
queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on td.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
}
queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
@@ -1122,6 +1099,8 @@
queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
}
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
//浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
if(loginUserInfo.getType().equals(Constants.ONE)){
queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
@@ -1286,13 +1265,9 @@
if(insuranceApply.getStartTime().compareTo(new Date())<0 && insuranceApply.getEndTime().compareTo(new Date()) > 0 ){
insuranceApply.setLoseEfficacyDays(DateUtil.daysBetweenDates(insuranceApply.getEndTime(),new Date()));
}
-
-
initApplyStatus(insuranceApply);
-
//鏌ヨ闄勪欢鏁版嵁
initImgData(insuranceApply);
-
//鏌ヨ鎿嶄綔璁板綍
List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
new MPJLambdaWrapper<ApplyLog>()
@@ -1301,6 +1276,7 @@
.selectAs(Company::getName,ApplyLog::getCompanyName)
.leftJoin(SystemUser.class,SystemUser::getId,ApplyLog::getCreator)
.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .in(ApplyLog::getObjType,Constants.ApplyLogType.getTypeList(Constants.ZERO))
.eq(ApplyLog::getApplyId,insuranceApply.getId())
.orderByAsc(ApplyLog::getCreateDate)
);
@@ -1314,12 +1290,14 @@
if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
//濡傛灉褰撳墠鏃堕棿澶т簬缁撴潫鏃ユ湡 鍒欎娇鐢ㄧ粨鏉熸棩鏈熷姣斿紑濮嬫棩鏈�
if(DateUtil.compareDate(new Date(),insuranceApply.getEndTime())>=Constants.ZERO){
- insuranceApply.setServiceDays(DateUtil.daysBetweenDates(insuranceApply.getEndTime(),insuranceApply.getStartTime()));
+ insuranceApply.setServiceDays(
+ DateUtil.daysBetweenDates(insuranceApply.getEndTime(),insuranceApply.getStartTime())+1
+ );
}else if(DateUtil.compareDate(insuranceApply.getStartTime(),new Date())>=Constants.ZERO){
//鏈紑濮�
insuranceApply.setServiceDays(Constants.ZERO);
}else{
- insuranceApply.setServiceDays(DateUtil.daysBetweenDates(new Date(),insuranceApply.getStartTime()));
+ insuranceApply.setServiceDays(DateUtil.daysBetweenDates(new Date(),insuranceApply.getStartTime())+1);
}
}
}
@@ -1350,17 +1328,17 @@
model.setBaoxiandanFile(f);
}
- if(model.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
- //濡傛灉褰撳墠鏃堕棿澶т簬缁撴潫鏃ユ湡 鍒欎娇鐢ㄧ粨鏉熸棩鏈熷姣斿紑濮嬫棩鏈�
- if(DateUtil.compareDate(new Date(),model.getEndTime())>=Constants.ZERO){
- model.setServiceDays(DateUtil.daysBetweenDates(model.getEndTime(),model.getStartTime()));
- }else if(DateUtil.compareDate(model.getStartTime(),new Date())>=Constants.ZERO){
- //鏈紑濮�
- model.setServiceDays(Constants.ZERO);
- }else{
- model.setServiceDays(DateUtil.daysBetweenDates(new Date(),model.getStartTime()));
- }
- }
+// if(model.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+// //濡傛灉褰撳墠鏃堕棿澶т簬缁撴潫鏃ユ湡 鍒欎娇鐢ㄧ粨鏉熸棩鏈熷姣斿紑濮嬫棩鏈�
+// if(DateUtil.compareDate(new Date(),model.getEndTime())>=Constants.ZERO){
+// model.setServiceDays(DateUtil.daysBetweenDates(model.getEndTime(),model.getStartTime()));
+// }else if(DateUtil.compareDate(model.getStartTime(),new Date())>=Constants.ZERO){
+// //鏈紑濮�
+// model.setServiceDays(Constants.ZERO);
+// }else{
+// model.setServiceDays(DateUtil.daysBetweenDates(new Date(),model.getStartTime()));
+// }
+// }
}
}
}
@@ -1471,7 +1449,6 @@
info = info.replace("${param}", insuranceApplyOptDTO.getOptIllustration());
ApplyLog log = new ApplyLog(insuranceApply,applyLogType.getName(),info,insuranceApply.getId(),applyLogType.getKey(),JSONObject.toJSONString(insuranceApply), JSONObject.toJSONString(insuranceApply));
applyLogMapper.insert(log);
-// this.saveApplyLog(insuranceApply,insuranceApplyStatus,null);
}
@@ -1500,16 +1477,13 @@
if(CollectionUtils.isNotEmpty(applyDetailList)){
for (ApplyDetail applyDetail: applyDetailList) {
//2024-1-30 10:04:24 淇敼 鏍规嵁瀹為檯澶╂暟杩涜璁＄畻 褰撳墠璐圭敤 鎬婚噾棰�/鎬诲ぉ鏁�*瀹為檯澶╂暟
- Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0) + 1 ;
+ Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
BigDecimal fee = applyDetail.getFee();
if(applyDetail.getStartTime().compareTo(new Date()) <= 0 && applyDetail.getEndTime().compareTo(new Date()) >= 0 ){
- Integer days = DateUtil.calculateBetween(applyDetail.getStartTime(),new Date(),0) + 1 ;
+ Integer days = DateUtil.calculateBetween(applyDetail.getStartTime(),new Date(),0);
applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
applyDetailMapper.updateById(applyDetail);
}
-// DateUtil.daysBetweenDates(applyDetail.getEndTime(),applyDetail.getStartTime());
-// applyDetail.setCurrentFee(Constants.countDetailFee(solutions,new Date(),applyDetail.getStartTime()));
-// applyDetailMapper.updateById(applyDetail);
sumAmount = sumAmount.add(applyDetail.getCurrentFee());
}
}
--
Gitblit v1.9.3