From fc03a64522e6c6e0f47eeb82c8900e1910a0a363 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 01 二月 2024 09:11:11 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 384 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 289 insertions(+), 95 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 25d9b37..489a5ee 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
@@ -31,10 +31,13 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.*;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -66,12 +69,17 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
+ private CompanyMapper companyMapper;
+ @Autowired
private SignService signService;
@Autowired
private ApplyChagneDetailJoinMapper applyChagneDetailJoinMapper;
@Autowired
private ApplyDetailJoinMapper applyDetailJoinMapper;
+
+ @Autowired
+ private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
@Autowired
private MemberMapper memberMapper;
@@ -85,7 +93,8 @@
@Autowired
private ApplyLogMapper applyLogMapper;
-
+ @Value("${debug_model}")
+ private boolean debugModel;
@Autowired
private ApplyLogJoinMapper applyLogJoinMapper;
@@ -194,6 +203,7 @@
ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
+
return 1;
}
@@ -262,8 +272,14 @@
.selectAll(ApplyChagneDetail.class)
.selectAs(Solutions::getTimeUnit,ApplyChagneDetail::getSolutionTimeUnit)
.selectAs(Solutions::getPrice,ApplyChagneDetail::getSolutionPrice)
+ .selectAs(Worktype::getName,ApplyChagneDetail::getWorkTypeName)
+ .selectAs(DispatchUnit::getName,ApplyChagneDetail::getDuName)
.leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+ .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
+ .leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
.leftJoin(Solutions.class, Solutions::getId, ApplyChange::getSolutionsId)
+ .leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId)
+ .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getDuId)
.eq(ApplyChagneDetail::getApplyChangeId,update.getId())
.eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO) );
if(detailList ==null || detailList.size()==0){
@@ -279,40 +295,104 @@
if(oldModel == null ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
}
+ Date endDate = oldModel.getEndTime();
+ //褰撳墠鏃ユ湡澶т簬鎵瑰崟鏃ユ湡 闇�瑕佸洖婊氭暟鎹疄闄呮暟鎹�
+ Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(update.getStartTime(),2))>0;
+ //鎹㈠巶鍚庡巻鍙茶褰曠殑璐圭敤 fee
+ Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(update.getStartTime(),2),DateUtil.getMontageDate(oldModel.getStartTime(),1)) + 1;
+ BigDecimal oldFee = this.getApplyPrice(update.getApplyId(),days);
+ BigDecimal fee = oldModel.getFee();
+ BigDecimal oldCurrentFee = oldModel.getCurrentFee();
applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
.set(ApplyDetail::getEditor,update.getEditor())
- .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
- .set(ApplyDetail::getDuId,detail.getDuId())
.set(ApplyDetail::getEditDate,update.getEditDate())
+ .set(ApplyDetail::getEndTime,DateUtil.getMontageDate(update.getStartTime(),2))
+ .set(ApplyDetail::getFee,oldFee)
+ .set(flag,ApplyDetail::getCurrentFee,oldFee)
.eq(ApplyDetail::getId,oldModel.getApplyId())
);
+ //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
+ memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
+ .set(MemberInsurance::getEndTime,update.getApplyStartTime())
+ .set(MemberInsurance::getFee,oldFee)
+ .eq(MemberInsurance::getRelationId,oldModel.getId())
+ );
+
+ ApplyDetail applyDetail = new ApplyDetail();
+ applyDetail.setApplyId(oldModel.getApplyId());
+ applyDetail.setCreateDate(new Date());
+ applyDetail.setCreator(update.getEditor());
+ applyDetail.setMemberId(oldModel.getMemberId());
+ applyDetail.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(),1));
+ applyDetail.setEndTime(endDate);
+ applyDetail.setDuId(detail.getDuId());
+ applyDetail.setWorktypeId(detail.getWorktypeId());
+ applyDetail.setIdcardNo(oldModel.getIdcardNo());
+ applyDetail.setFee(fee.subtract(oldFee));
+ if(flag){
+ applyDetail.setCurrentFee(oldCurrentFee.multiply(oldFee));
+ }else{
+ applyDetail.setCurrentFee(BigDecimal.ZERO);
+ }
+ applyDetail.setSex(oldModel.getSex());
+ applyDetail.setMemberName(oldModel.getMemberName());
+ applyDetail.setFromId(detail.getId());
+ applyDetailJoinMapper.insert(applyDetail);
+
+ MemberInsurance memberInsurance = new MemberInsurance(applyDetail,update.getId());
+ memberInsuranceJoinMapper.insert(memberInsurance);
}
}
/**
* 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
* @param update
*/
- private void dealDetailsValidTime(ApplyChange update ) {
+ private void dealDetailsValidTime(ApplyChange update) {
List<ApplyChagneDetail> detailList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
new MPJLambdaWrapper<ApplyChagneDetail>()
.selectAll(ApplyChagneDetail.class)
- .selectAs(Solutions::getTimeUnit,ApplyChagneDetail::getSolutionTimeUnit)
- .selectAs(Solutions::getPrice,ApplyChagneDetail::getSolutionPrice)
- .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
- .leftJoin(Solutions.class, Solutions::getId, ApplyChange::getSolutionsId)
- .eq(ApplyChagneDetail::getApplyChangeId,update.getId())
- .eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO) );
- if(detailList ==null || detailList.size()==0){
+ .selectAs(Solutions::getTimeUnit, ApplyChagneDetail::getSolutionTimeUnit)
+ .selectAs(Solutions::getPrice, ApplyChagneDetail::getSolutionPrice)
+ .selectAs(Worktype::getName, ApplyChagneDetail::getWorkTypeName)
+ .selectAs(DispatchUnit::getName, ApplyChagneDetail::getDuName)
+ .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+ .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
+ .leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
+ .leftJoin(Solutions.class, Solutions::getId, ApplyChange::getSolutionsId)
+ .leftJoin(Worktype.class, Worktype::getId, ApplyChagneDetail::getWorktypeId)
+ .leftJoin(DispatchUnit.class, DispatchUnit::getId, ApplyChagneDetail::getDuId)
+ .eq(ApplyChagneDetail::getApplyChangeId, update.getId())
+ .eq(ApplyChagneDetail::getIsdeleted, Constants.ZERO));
+ if (detailList == null || detailList.size() == 0) {
return;
}
List<ApplyDetail> addList = new ArrayList<>();
List<Integer> reduceMembers = new ArrayList<>();
BigDecimal totalFee = new BigDecimal(0);
BigDecimal currentFee = new BigDecimal(0);
+ //鎶曚繚璁板綍 鍔犱繚鏁版嵁鍔犲叆鏂版暟鎹� 鍑忎繚鏁版嵁 淇敼鑰佹暟鎹�
+ List<MemberInsurance> memberInsuranceList = new ArrayList<>();
- for(ApplyChagneDetail detail : detailList){
- if(Constants.equalsInteger(detail.getType(),Constants.ZERO)){
+
+ //鍔犱繚涓氬姟 浣跨敤鐨勫姞淇濋噾棰�
+ ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO_add = new ApplyChangeCyclePriceDTO();
+ applyChangeCyclePriceDTO_add.setApplyId(update.getApplyId());
+ applyChangeCyclePriceDTO_add.setValidTime(DateUtil.getMontageDate(update.getStartTime(), 1));
+ //鍔犱繚 娣诲姞鐨勯噾棰�
+ CountCyclePriceVO countCyclePriceVO_add = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO_add);
+
+
+ //鍑忎繚涓氬姟 浣跨敤鐨勫噺淇濋噾棰�
+ ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO_reduce = new ApplyChangeCyclePriceDTO();
+ applyChangeCyclePriceDTO_reduce.setApplyId(update.getApplyId());
+ applyChangeCyclePriceDTO_reduce.setValidTime(DateUtil.getMontageDate(update.getStartTime(), 3));
+ //鍑忎繚 闇�瑕佸噺灏戠殑閲戦
+ CountCyclePriceVO countCyclePriceVO_reduce = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO_reduce);
+
+
+ for (ApplyChagneDetail detail : detailList) {
+ if (Constants.equalsInteger(detail.getType(), Constants.ZERO)) {
//鍔犱繚
ApplyDetail add = new ApplyDetail();
add.setApplyId(update.getApplyId());
@@ -327,58 +407,90 @@
add.setDuId(detail.getDuId());
add.setStartTime(update.getApplyStartTime());
add.setEndTime(detail.getEndTime());
- add.setFee(Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), add.getStartTime(),add.getEndTime()));
- if(DateUtil.daysBetweenDates(add.getStartTime(),new Date() )>=0){
- //濡傛灉宸蹭骇鐢熻垂鐢紝璁＄畻宸蹭骇鐢熻垂鐢�
- add.setCurrentFee(Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), add.getStartTime(),new Date()));
+ add.setFee(new BigDecimal(0));
+// add.setFee(Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), add.getStartTime(),add.getEndTime()));
+ if (DateUtil.daysBetweenDates(add.getStartTime(), new Date()) >= 0) {
+ add.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(), 1));
+ add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
+
+ add.setFee(countCyclePriceVO_add.getCyclePrice());
+ if (DateUtil.daysBetweenDates(DateUtil.getMontageDate(add.getStartTime(), 2), new Date()) >= 0) {
+ Integer days = DateUtil.daysBetweenDates(new Date(), DateUtil.getMontageDate(add.getStartTime(), 2)) + 1;
+ //濡傛灉宸蹭骇鐢熻垂鐢紝璁＄畻宸蹭骇鐢熻垂鐢�
+ add.setCurrentFee(this.getApplyPrice(update.getApplyId(), days));
+ }
+// addList.add(add);
+ applyDetailJoinMapper.insert(add);
+ totalFee.add(add.getFee());
+ currentFee.add(add.getCurrentFee());
+
+ MemberInsurance memberInsurance = new MemberInsurance(detail, update, update.getEditor(), add.getId());
+ memberInsuranceList.add(memberInsurance);
+ } else {
+ //鍑忎繚鎿嶄綔
+ //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+ ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
+ .eq(ApplyDetail::getApplyId, update.getApplyId())
+ .eq(ApplyDetail::getMemberId, detail.getMemberId())
+ .orderByDesc(ApplyDetail::getCreateDate)
+ .last("limit 1"));
+ if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > update.getApplyStartTime().getTime()) {
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
+ }
+ //閫�淇濋渶瑕侀��鍥炵殑璐圭敤
+ BigDecimal updateFee = countCyclePriceVO_reduce.getCyclePrice().multiply(new BigDecimal(-1));
+ BigDecimal updateCurrentFee = oldModel.getFee().subtract(updateFee);
+
+// BigDecimal updateCurrentFee = new BigDecimal(0);
+// if(DateUtil.daysBetweenDates(update.getApplyStartTime(),new Date() )>0){
+// //濡傛灉鐢熸晥鏃堕棿 鏄粖澶╀箣鍓嶏紝閫�鍥炲凡浜х敓璐圭敤锛岃绠楀凡浜х敓璐圭敤(鎬昏垂鐢�-宸蹭骇鐢熻垂鐢�)
+// updateCurrentFee = updateFee.subtract(oldModel.getCurrentFee());
+// }
+
+// BigDecimal updateFee = (Constants.countDetailFee(detail.getSolutionTimeUnit(), detail.getSolutionPrice(), oldModel.getStartTime(), update.getApplyStartTime()));
+// BigDecimal updateCurrentFee = new BigDecimal(0);
+ if (DateUtil.daysBetweenDates(update.getApplyStartTime(), new Date()) > 0) {
+ //濡傛灉鐢熸晥鏃堕棿 鏄粖澶╀箣鍓嶏紝閫�鍥炲凡浜х敓璐圭敤锛岃绠楀凡浜х敓璐圭敤(鎬昏垂鐢�-宸蹭骇鐢熻垂鐢�)
+ updateCurrentFee = updateFee.subtract(Constants.formatBigdecimal(oldModel.getCurrentFee()));
+ }
+ applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+ .setSql(" fee = ifnull(fee,0)+" + updateFee)
+ .setSql(" current_fee = " + updateCurrentFee)
+ .set(ApplyDetail::getEndTime, update.getApplyStartTime())
+ .set(ApplyDetail::getEditor, update.getEditor())
+ .set(ApplyDetail::getEditDate, update.getEditDate())
+ .eq(ApplyDetail::getId, oldModel.getApplyId())
+ );
+ totalFee.add(updateFee);
+ currentFee.add(updateCurrentFee);
+
+ //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
+ memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
+ .setSql(" fee = ifnull(fee,0)+" + updateFee)
+ .set(MemberInsurance::getEndTime, update.getApplyStartTime())
+ .eq(MemberInsurance::getRelationId, oldModel.getId())
+ );
+
}
- addList.add(add);
- totalFee.add(add.getFee());
- currentFee.add(add.getCurrentFee());
- }else{
- //鍑忎繚鎿嶄綔
- //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
- ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
- .eq(ApplyDetail::getApplyId, update.getApplyId())
- .eq(ApplyDetail::getMemberId, detail.getMemberId())
- .orderByDesc(ApplyDetail::getCreateDate)
- .last("limit 1"));
- if(oldModel == null || oldModel.getStartTime()==null || oldModel.getStartTime().getTime() > update.getApplyStartTime().getTime()){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
- }
- BigDecimal updateFee = (Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), oldModel.getStartTime(),update.getApplyStartTime()));
- BigDecimal updateCurrentFee = new BigDecimal(0);
- if(DateUtil.daysBetweenDates(update.getApplyStartTime(),new Date() )>0){
- //濡傛灉鐢熸晥鏃堕棿 鏄粖澶╀箣鍓嶏紝閫�鍥炲凡浜х敓璐圭敤锛岃绠楀凡浜х敓璐圭敤(鎬昏垂鐢�-宸蹭骇鐢熻垂鐢�)
- updateCurrentFee = updateFee.subtract(oldModel.getCurrentFee());
- }
- applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
- .setSql(" fee = ifnull(fee,0)+"+updateFee)
- .setSql(" current_fee = "+updateFee)
- .set(ApplyDetail::getEditor,update.getEditor())
- .set(ApplyDetail::getEditDate,update.getEditDate())
- .eq(ApplyDetail::getId,oldModel.getApplyId())
+ }
+
+ if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
+// applyDetailJoinMapper.insertBatchSomeColumn(addList);
+ memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
+ }
+ if (totalFee.compareTo(new BigDecimal(0)) != 0) {
+ //濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
+ insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
+ .setSql(" fee = ifnull(fee,0)+" + totalFee)
+ .setSql(" current_fee = ifnull(current_fee,0)+" + currentFee)
+ .set(InsuranceApply::getEditor, update.getEditor())
+ .set(InsuranceApply::getEditDate, update.getEditDate())
+ .eq(InsuranceApply::getId, update.getApplyId())
);
- totalFee.add(updateFee);
- currentFee.add(updateCurrentFee);
}
- }
- if(addList!=null && addList.size()>0){
- applyDetailJoinMapper.insertBatchSomeColumn(addList);
- }
- if(totalFee.compareTo(new BigDecimal(0)) != 0){
- //濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
- insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
- .setSql(" fee = ifnull(fee,0)+"+totalFee)
- .setSql(" current_fee = ifnull(current_fee,0)+"+currentFee)
- .set(InsuranceApply::getEditor,update.getEditor())
- .set(InsuranceApply::getEditDate,update.getEditDate())
- .eq(InsuranceApply::getId,update.getApplyId())
- );
}
-
}
/**
@@ -561,11 +673,13 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
}
-
applyChange.setEditDate(new Date());
applyChange.setEditor(loginUserInfo.getId());
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);
applyChange.setFee(fee);
applyChangeMapper.updateById(applyChange);
@@ -601,13 +715,20 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
}
+ ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO = new ApplyChangeCyclePriceDTO();
+ applyChangeCyclePriceDTO.setApplyId(insuranceApply.getId());
//鍔犱繚鏁版嵁
List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
if (CollectionUtils.isNotEmpty(addDetailList)) {
if(companySolution.getCanAdd().equals(Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
}
- this.addChangeDetail(applyChange,addDetailList,duWorktypeList,duSolutionList,insuranceApply,solutions,loginUserInfo);
+ //鍔犱繚鏄庣粏鏁版嵁 璁＄畻閲戦 鏍规嵁鎵瑰崟鏃堕棿 璁＄畻
+ applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(insuranceApply.getStartTime(),1));
+ CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
+ BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
+
+ this.addChangeDetail(applyChange,addDetailList,duWorktypeList,duSolutionList,insuranceApply,solutions,loginUserInfo,detailFee);
fee = addDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add);
}
@@ -618,7 +739,11 @@
if(companySolution.getCanReduce().equals(Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽噺淇�");
}
- this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo);
+ //鍑忎繚鏄庣粏鏁版嵁 璁＄畻閲戦 鏍规嵁鎵瑰崟鏃堕棿 鍓嶄竴澶� 璁＄畻
+ applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(insuranceApply.getStartTime(),3));
+ CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
+ BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
+ this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo,detailFee);
fee = fee.add(delDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
}
@@ -659,7 +784,7 @@
* @param delDetailList
* @param loginUserInfo
*/
- public void delChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> delDetailList,InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo){
+ public void delChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> delDetailList,InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal detailFee){
for (ApplyChagneDetail applyChagneDetail : delDetailList) {
if (Objects.isNull(applyChagneDetail.getMemberId())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
@@ -695,17 +820,10 @@
applyChagneDetail.setApplyChangeId(applyChange.getId());
applyChagneDetail.setType(Constants.ONE);
- System.out.println(DateUtil.dateToString(applyDetail.getEndTime(),"yyyy-MM-dd"));
- System.out.println(DateUtil.dateToString(applyDetail.getStartTime(),"yyyy-MM-dd"));
- System.out.println(DateUtil.dateToString(applyChange.getValidTime(),"yyyy-MM-dd"));
+ applyChagneDetail.setStartTime(DateUtil.getMontageDate(applyDetail.getStartTime(),1));
+ applyChagneDetail.setEndTime(DateUtil.getMontageDate(applyChange.getStartTime(),3));
- BigDecimal sumFee = Constants.countDetailFee(solutions, applyDetail.getEndTime(),applyDetail.getStartTime());
- BigDecimal useFee = Constants.countDetailFee(solutions, applyChange.getValidTime(),applyDetail.getStartTime());
-
- applyChagneDetail.setFee(
- Constants.countDetailFee(solutions, applyDetail.getEndTime(),applyDetail.getStartTime())
- .subtract(Constants.countDetailFee(solutions,applyChange.getValidTime(), applyDetail.getStartTime())).multiply(new BigDecimal(-1))
- );
+ applyChagneDetail.setFee( detailFee.multiply(new BigDecimal(-1)));
applyChagneDetailJoinMapper.insert(applyChagneDetail);
}
}
@@ -720,7 +838,7 @@
* @param duSolutionList
* @param loginUserInfo
*/
- public void addChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> addDetailList,List<DuWorktype> duWorktypeList,List<DuSolution> duSolutionList,InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo){
+ public void addChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> addDetailList,List<DuWorktype> duWorktypeList,List<DuSolution> duSolutionList,InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal detailFee){
for (ApplyChagneDetail applyChagneDetail : addDetailList) {
if ( Objects.isNull(applyChagneDetail.getDuId())
|| Objects.isNull(applyChagneDetail.getWorktypeId())
@@ -728,7 +846,6 @@
) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
}
-
Member member = new Member();
if(Objects.isNull(applyChagneDetail.getMemberId())){
@@ -801,10 +918,10 @@
applyChagneDetail.setCreator(loginUserInfo.getId());
applyChagneDetail.setIsdeleted(Constants.ZERO);
applyChagneDetail.setApplyChangeId(applyChange.getId());
+ applyChagneDetail.setStartTime(DateUtil.getMontageDate(applyChange.getStartTime(),1));
+ applyChagneDetail.setEndTime(DateUtil.getMontageDate(insuranceApply.getEndTime(),2));
applyChagneDetail.setType(Constants.ZERO);
- applyChagneDetail.setFee(
- Constants.countDetailFee(solutions,insuranceApply.getEndTime(),applyChange.getValidTime())
- );
+ applyChagneDetail.setFee(detailFee);
applyChagneDetailJoinMapper.insert(applyChagneDetail);
}
}
@@ -1099,10 +1216,12 @@
queryWrapper.selectAll(ApplyChange.class)
.selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
.selectAs(Company::getName,ApplyChange::getCompanyName)
+ .selectAs(InsuranceApply::getStartTime,ApplyChange::getStartTime)
+ .selectAs(InsuranceApply::getEndTime,ApplyChange::getEndTime)
+ .selectAs(Solutions::getName,ApplyChange::getSolutionsName)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0 )",ApplyChange::getAddNum)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1 )",ApplyChange::getDelNum)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2 )",ApplyChange::getChangeNum)
- .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID )",ApplyChange::getChangeMoney)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
@@ -1114,6 +1233,7 @@
new MPJLambdaWrapper<ApplyLog>()
.selectAll(ApplyLog.class)
.selectAs(SystemUser::getRealname,ApplyLog::getCreatorName)
+ .selectAs(SystemUser::getType,ApplyLog::getCreatorType)
.selectAs(Company::getName,ApplyLog::getCompanyName)
.leftJoin(SystemUser.class,SystemUser::getId,ApplyLog::getCreator)
.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
@@ -1121,6 +1241,33 @@
.orderByAsc(ApplyLog::getCreateDate)
);
applyChange.setApplyLogList(applyLogList);
+
+ List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,applyChange.getId())
+ .in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey()
+ ,Constants.MultiFile.CA_PD_PDF.getKey()
+ ,Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey()}))
+ .eq(Multifile::getIsdeleted,Constants.ZERO));
+ if(multifiles!=null){
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+ for(Multifile f : multifiles){
+ if(StringUtils.isBlank(f.getFileurl())){
+ continue;
+ }
+ f.setFileurlFull(path+f.getFileurl());
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey())){
+ //绛剧讲鍚庣敵璇峰崟
+ applyChange.setApplyFile(f);
+ }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey())){
+ //绛剧讲鍚庣敵璇峰崟
+ applyChange.setApplyUnitFile(f);
+ }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.CA_PD_PDF.getKey())){
+ //绛剧讲鍚庣殑鎶曚繚鍗�
+ applyChange.setPidanFile(f);
+ }
+ }
+ }
return applyChange;
}
@@ -1132,7 +1279,7 @@
@Override
public ApplyChange exportChangeUnitExcel(ApplyChange param){
ApplyChange model = findJoinDetail(param);
- if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getType())){
+ if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
@@ -1164,7 +1311,7 @@
}
private String getOnlineSignLink(ApplyChange model) {
- if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getType())){
+ if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(!Constants.equalsInteger(Constants.ZERO,model.getStatus())){
@@ -1172,14 +1319,21 @@
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Company company = user.getCompany();
- if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.ONE)){
+ if(debugModel){
+company = companyMapper.selectById(model.getCompanyId());
+ }
+ if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠＄悊鍛樼‘璁");
}
-
- String fileUrl = ExcelExporter.build(ApplyChange.class).exportChangeUnitExcelToPdf(model,"缂撳瓨鐢宠琛�");
+ String fileUrl = null;
+ if(Constants.equalsObject(model.getType(), Constants.ONE)){
+ fileUrl = ExcelExporter.build(ApplyChange.class).exportChangeUnitExcelToPdf(model,"鎹㈠巶鐢宠琛�");
+ }else{
+ fileUrl = ExcelExporter.build(ApplyChange.class).exportJiajianBaoExcelToPdf(model,"鍔犲噺淇濈敵璇疯〃");
+ }
String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
- String applyNo = signService.applySignLocalFile(company.getName(),fileUrl,company.getName(),company.getCode(),company.getEmail(),null,company.getSignId(),notifyUrl);
+ String applyNo = signService.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鎶曚繚浼佷笟绛剧珷",company.getSignId(),notifyUrl);
if(StringUtils.isBlank(applyNo) ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
@@ -1193,6 +1347,7 @@
update.setEditDate(new Date());
update.setSignApplyNo(applyNo);
applyChangeMapper.updateById(update);
+
return link;
}
@@ -1206,7 +1361,7 @@
public ApplyChange exportJiajianBaoExcel(ApplyChange param){
ApplyChange model = findJoinDetail(param);
- if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getType())){
+ if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
@@ -1232,12 +1387,13 @@
.selectAll(ApplyChange.class)
.selectAs(Solutions::getName,ApplyChange::getSolutionsName)
.selectAs(Company::getName,ApplyChange::getCompanyName)
+ .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
.selectAs(InsuranceApply::getStartTime,ApplyChange::getStartTime)
.selectAs(InsuranceApply::getStartTime,ApplyChange::getEndTime)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
- .leftJoin(Company.class,Company::getId,ApplyChange::getCompanyId)
+ .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
.eq(ApplyChange::getId,param.getId())
.last("limit 1");
@@ -1249,7 +1405,7 @@
.selectAll(ApplyChagneDetail.class)
.selectAs(Member::getName,ApplyChagneDetail::getMemberName)
.selectAs(Member::getSex,ApplyChagneDetail::getSex)
- .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
+ .selectAs(Member::getIdcardNo,ApplyChagneDetail::getMemberIdcardNo)
.selectAs(Worktype::getName,ApplyChagneDetail::getWorkTypeName)
.selectAs(DispatchUnit::getName,ApplyChagneDetail::getDuName)
.leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId)
@@ -1271,7 +1427,7 @@
.select("t3.name as oldWorktypeName")
.select("t4.name as oldDuName")
.selectAs(Member::getSex,ApplyChagneDetail::getSex)
- .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
+ .selectAs(Member::getIdcardNo,ApplyChagneDetail::getMemberIdcardNo)
.leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getDuId)
.leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getOldWorktypeId)
@@ -1285,6 +1441,11 @@
}
+ /**
+ * 鍔犲噺淇濈敵璇锋椂 鏌ヨ鍔犲噺閲戦
+ * @param applyChangeCyclePriceDTO
+ * @return
+ */
@Override
public CountCyclePriceVO getChangeCountCyclePriceVO(ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO){
if(Objects.isNull(applyChangeCyclePriceDTO)
@@ -1292,7 +1453,6 @@
|| Objects.isNull(applyChangeCyclePriceDTO.getValidTime())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChangeCyclePriceDTO.getApplyId());
if(Objects.isNull(insuranceApply)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟");
@@ -1301,13 +1461,47 @@
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
}
- CountCyclePriceVO countCyclePriceVO = new CountCyclePriceVO();
- countCyclePriceVO.setCyclePrice(Constants.countDetailFee(solutions,insuranceApply.getEndTime(),applyChangeCyclePriceDTO.getValidTime()));
- return countCyclePriceVO;
+ //鏍规嵁鎵瑰崟鏃ユ湡 鍜� 缁撴潫鏃ユ湡 璁＄畻閲戦
+ //楠岃瘉鎵瑰崟鏃ユ湡鏄惁鍦ㄥ綋鍓嶆棩鏈熷悗 涓� 鍦ㄤ繚鍗曠粨鏉熸棩鏈熷墠 鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
+ if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChangeCyclePriceDTO.getValidTime()) >= Constants.ZERO
+ && DateUtil.compareDate( applyChangeCyclePriceDTO.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
+ }
+ //鎬诲ぉ鏁�
+ Integer sumDays = DateUtil.daysBetweenDates(insuranceApply.getEndTime(),insuranceApply.getStartTime()) + 1;
+ //鍔犲噺淇� 鍒扮粨鏉熺殑澶╂暟
+ Integer optDays = DateUtil.daysBetweenDates(insuranceApply.getEndTime(),applyChangeCyclePriceDTO.getValidTime()) + 1;
+ CountCyclePriceVO countCyclePriceVO = Constants.countPriceVO(insuranceApply.getStartTime(),solutions);
+ //鎬婚噾棰�
+ BigDecimal sumPrice = countCyclePriceVO.getCyclePrice();
+ CountCyclePriceVO returnCountCyclePriceVO = new CountCyclePriceVO();
+ //鍔犲噺淇濋噾棰�
+ returnCountCyclePriceVO.setCyclePrice(sumPrice.divide(new BigDecimal(sumDays),2, RoundingMode.HALF_UP).multiply(new BigDecimal(optDays)));
+ return returnCountCyclePriceVO;
}
-
-
+ /**
+ * 璁＄畻淇濆崟涓� X澶� 澶氬皯璐圭敤
+ * @param applyId
+ * @param optDays
+ * @return
+ */
+ public BigDecimal getApplyPrice(Integer applyId,Integer optDays){
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyId);
+ 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(),"鏈煡璇㈡柟妗堜俊鎭�");
+ }
+ //鎬诲ぉ鏁�
+ Integer sumDays = DateUtil.daysBetweenDates(insuranceApply.getEndTime(),insuranceApply.getStartTime()) + 1;
+ CountCyclePriceVO countCyclePriceVO = Constants.countPriceVO(insuranceApply.getStartTime(),solutions);
+ //鎬婚噾棰�
+ BigDecimal sumPrice = countCyclePriceVO.getCyclePrice();;
+ return sumPrice.divide(new BigDecimal(sumDays),2, RoundingMode.HALF_UP).multiply(new BigDecimal(optDays));
+ }
}
--
Gitblit v1.9.3