From 75ab4754b8fb7a79b8da134c6aaa6e7b05b5b325 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 10:10:08 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 378 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 292 insertions(+), 86 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 eb38594..d9c548e 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
@@ -12,12 +12,15 @@
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.aliyun.ALiYunUtil;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dto.CountCyclePriceDTO;
import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
import com.doumee.dao.business.dto.InsuranceApplyQueryDTO;
import com.doumee.dao.business.join.ApplyDetailJoinMapper;
import com.doumee.dao.business.join.ApplyLogJoinMapper;
+import com.doumee.dao.business.join.DuSolutionJoinMapper;
import com.doumee.dao.business.join.InsuranceApplyJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.CountCyclePriceVO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.InsuranceApplyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -32,6 +35,7 @@
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;
@@ -46,6 +50,8 @@
*/
@Service
public class InsuranceApplyServiceImpl implements InsuranceApplyService {
+ @Value("${debug_model}")
+ private boolean debugModel;
@Autowired
private InsuranceApplyMapper insuranceApplyMapper;
@@ -56,6 +62,8 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private InsuranceApplyJoinMapper insuranceApplyJoinMapper;
+ @Autowired
+ private CompanyMapper companyMapper;
@Autowired
private ApplyDetailMapper applyDetailMapper;
@@ -80,6 +88,8 @@
@Autowired
private DuSolutionMapper duSolutionMapper;
@Autowired
+ private DuSolutionJoinMapper duSolutionJoinMapper;
+ @Autowired
private DuWorktypeMapper duWorktypeMapper;
@Override
@@ -100,7 +110,7 @@
InsuranceApply update = new InsuranceApply();
update.setEditDate(new Date());
update.setEditor(user.getId());
- update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
+ update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo(insuranceApply.getCheckInfo());
update.setCheckUserId(user.getId());
@@ -135,11 +145,11 @@
if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.SIGNATURE.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
- if(model.getApplyEndTime()== null || insuranceApply.getStartTime().getTime()>insuranceApply.getApplyEndTime().getTime() ){
+ if(model.getApplyEndTime()== null || model.getStartTime().getTime()>model.getApplyEndTime().getTime() ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风敓鏁堝懆鏈熸椂闂翠笉绗﹀悎瑕佹眰锛岃纭鍚庝慨鏀归噸璇晘");
}
//璁＄畻瀹為檯鎴鏃堕棿
- Date actEndTime = new Date(insuranceApply.getApplyEndTime().getTime() + (insuranceApply.getStartTime().getTime() - model.getApplyStartTime().getTime()));
+ Date actEndTime = new Date(model.getApplyEndTime().getTime() + (insuranceApply.getStartTime().getTime() - model.getApplyStartTime().getTime()));
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
InsuranceApply update = new InsuranceApply();
update.setEditDate(new Date());
@@ -156,7 +166,7 @@
insuranceApply.getBaoxiandanFile().setIsdeleted(Constants.ZERO);
insuranceApply.getBaoxiandanFile().setCreator(user.getId());
- insuranceApply.getToubaodanFile().setObjId(update.getId());
+ insuranceApply.getBaoxiandanFile().setObjId(update.getId());
insuranceApply.getBaoxiandanFile().setCreateDate(update.getEditDate());
insuranceApply.getBaoxiandanFile().setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
insuranceApply.getBaoxiandanFile().setType(Constants.TWO);
@@ -219,7 +229,7 @@
param.getBaoxiandanFile().setObjType(Constants.MultiFile.BD_DONE_PDF.getKey());
param.getBaoxiandanFile().setType(Constants.TWO);
multifileMapper.insert(param.getBaoxiandanFile());
-
+ update.setStatus(model.getStatus());
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.PALTFORM_EDIT_BD;
String info = applyLogType.getInfo();
info = info.replace("${param}",param.getCheckInfo());
@@ -289,7 +299,14 @@
if(id == null ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- InsuranceApply model = insuranceApplyMapper.selectById(id);
+ MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>()
+ .selectAll(InsuranceApply.class)
+ .selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword)
+ .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+ .eq(InsuranceApply::getId,id)
+ .last("limit 1");
+
+ InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,wrapper);
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
@@ -298,11 +315,14 @@
Constants.ApplyLogType applyLogType = null;
String info = "";
//濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
- if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_WAIT_SIGNATURE.getKey())){
+ if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
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(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠＄悊鍛樼‘璁");
}
@@ -316,11 +336,11 @@
String url = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode()+f.getFileurl();
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.applySign(company.getName(),url,company.getName(),company.getCode(),company.getEmail(),null,company.getSignId(),notifyUrl);
+ String applyNo = signService.applySign(company.getName(),url,company.getName(),company.getCode(),company.getEmail(),model.getSignKeyword(),company.getSignId(),notifyUrl);
if(StringUtils.isBlank(applyNo) ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
- String link = signService.signLink(applyNo,company.getEmail(),company.getCode());
+ String link = signService.signLink(applyNo,company.getName(),company.getCode());
if(StringUtils.isBlank(link) ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
@@ -358,7 +378,7 @@
InsuranceApply update = new InsuranceApply();
update.setEditDate(new Date());
update.setEditor(model.getCreator());
- update.setStatus(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
+ update.setStatus(Constants.InsuranceApplyStatus.SIGNATURE.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo("浼佷笟瀹屾垚绛剧讲");
update.setCheckUserId(model.getCreator());
@@ -449,7 +469,7 @@
if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
//濡傛灉宸蹭繚鍏�,鍙笅杞界绾﹂檮浠�
InsuranceApply model = insuranceApplyMapper.selectOne(new QueryWrapper<InsuranceApply>().lambda().eq(InsuranceApply::getSignApplyNo,data.getApplyNo()).last("limit 1" ));
- if(model != null && Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_WAIT_SIGNATURE.getKey())){
+ if(model != null && Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
//瀹屾垚绛剧讲宸插畬鎴愭搷浣�
String link = signService.linkFile(data.getApplyNo());
String fileUrl = uploadSignFile(link);
@@ -522,7 +542,7 @@
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WAIT_SIGNATURE;
String info =applyLogType.getInfo();
- info = info.replace("${param}", update.getCheckInfo());
+// info = info.replace("${param}", update.getCheckInfo());
ApplyLog log = new ApplyLog(update,applyLogType.getName(),StringUtils.isNotBlank(update.getCheckInfo())?info:"",update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
return 1;
@@ -530,14 +550,14 @@
}
/**
- * 瀹℃牳閫氳繃
+ * 瀹℃牳閫氳繃鎴栬�呬笉閫氳繃
* @param insuranceApply
* @return
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer check(InsuranceApply insuranceApply) {
- if(insuranceApply.getId() == null ||StringUtils.isBlank(insuranceApply.getCheckInfo())){
+ if(insuranceApply.getId() == null || StringUtils.isBlank(insuranceApply.getCheckInfo())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());
@@ -548,19 +568,28 @@
if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
+
+ Constants.ApplyLogType applyLogType = null;
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
InsuranceApply update = new InsuranceApply();
update.setEditDate(new Date());
update.setEditor(user.getId());
- update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo(insuranceApply.getCheckInfo());
update.setCheckUserId(user.getId());
update.setId(model.getId());
+ if(insuranceApply.getDealBackApply() ==1){
+ //濡傛灉鏄笉閫氳繃
+ applyLogType = Constants.ApplyLogType.PLATFORM_RETURN ;
+ update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
+ }else{
+ applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
+ update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
+ }
insuranceApplyMapper.updateById(update);
-
- Constants.ApplyLogType applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
- ApplyLog log = new ApplyLog(update,applyLogType.getName(),null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+ String info =applyLogType.getInfo();
+ info = info.replace("${param}", update.getCheckInfo());
+ ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
return 1;
@@ -582,16 +611,11 @@
if(!loginUserInfo.getType().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
}
- Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
- if(Objects.isNull(solutions)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
- }
-
List<ApplyDetail> applyDetailList = insuranceApply.getApplyDetailList();
//鍒ゆ柇鏄惁瀛樺湪閲嶅淇℃伅
- List<Integer> memberIdList = applyDetailList.stream().map(i->i.getMemberId()).collect(Collectors.toList());
- Set<Integer> set = new HashSet<>(memberIdList);
- if(memberIdList.size() != set.size()){
+ List<String> idCardList = applyDetailList.stream().map(i->i.getIdcardNo()).collect(Collectors.toList());
+ Set<String> set = new HashSet<>(idCardList);
+ if(idCardList.size() != set.size()){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鍛樺伐淇℃伅瀛樺湪閲嶅淇℃伅");
}
Constants.InsuranceApplyStatus insuranceApplyStatus = Constants.InsuranceApplyStatus.UPLOAD;
@@ -600,14 +624,97 @@
insuranceApply.setIsdeleted(Constants.ZERO);
insuranceApply.setCompanyId(loginUserInfo.getCompanyId());
insuranceApply.setCheckInfo(insuranceApplyStatus.getName());
+ insuranceApply.setStartTime(insuranceApply.getApplyStartTime());
+ insuranceApply.setEndTime(insuranceApply.getApplyEndTime());
insuranceApply.setCheckDate(new Date());
+ insuranceApply.setCurrentFee(BigDecimal.ZERO);
insuranceApply.setCheckUserId(loginUserInfo.getId());
insuranceApply.setStatus(insuranceApplyStatus.getKey());
insuranceApplyMapper.insert(insuranceApply);
+ //澶勭悊涓嬬骇鏁版嵁
+ this.dealApplyDetailData(insuranceApply,applyDetailList,loginUserInfo);
+ InsuranceApply updBean = new InsuranceApply();
+ updBean.setId(insuranceApply.getId());
+ updBean.setFee(applyDetailList.stream().map(ApplyDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
+ insuranceApplyMapper.updateById(updBean);
+ //瀛樺偍鏃ュ織鏁版嵁
+ this.saveApplyLog(insuranceApply,insuranceApplyStatus,null);
+ return insuranceApply.getId();
+ }
+
+
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public Integer updateData(InsuranceApply insuranceApply) {
+ if (Objects.isNull(insuranceApply)
+ || Objects.isNull(insuranceApply.getId())
+ || Objects.isNull(insuranceApply.getSolutionId())
+ || Objects.isNull(insuranceApply.getApplyStartTime())
+ || Objects.isNull(insuranceApply.getApplyEndTime())
+ || !CollectionUtils.isNotEmpty(insuranceApply.getApplyDetailList())
+ ) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!loginUserInfo.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ InsuranceApply dbInsuranceApply = insuranceApplyMapper.selectById(insuranceApply.getId());
+ if(Objects.isNull(dbInsuranceApply)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇敼瀵硅薄淇℃伅");
+ }
+ if(!(dbInsuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey())
+ || dbInsuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey()))
+ ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐘舵�侀敊璇紝褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
+ }
+ List<ApplyDetail> applyDetailList = insuranceApply.getApplyDetailList();
+ //鍒ゆ柇鏄惁瀛樺湪閲嶅淇℃伅
+ List<String> idCardList = applyDetailList.stream().map(i->i.getIdcardNo()).collect(Collectors.toList());
+ Set<String> set = new HashSet<>(idCardList);
+ if(idCardList.size() != set.size()){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鍛樺伐淇℃伅瀛樺湪閲嶅淇℃伅");
+ }
+ Constants.InsuranceApplyStatus insuranceApplyStatus = Constants.InsuranceApplyStatus.UPLOAD;
+ insuranceApply.setEditDate(new Date());
+ insuranceApply.setEditor(loginUserInfo.getId());
+ insuranceApply.setIsdeleted(Constants.ZERO);
+ insuranceApply.setCompanyId(loginUserInfo.getCompanyId());
+ insuranceApply.setCheckInfo(insuranceApplyStatus.getName());
+ insuranceApply.setStartTime(insuranceApply.getApplyStartTime());
+ insuranceApply.setEndTime(insuranceApply.getApplyEndTime());
+ insuranceApply.setCheckDate(new Date());
+ insuranceApply.setCurrentFee(BigDecimal.ZERO);
+ insuranceApply.setCheckUserId(loginUserInfo.getId());
+ insuranceApply.setStatus(insuranceApplyStatus.getKey());
+ applyDetailMapper.delete(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId()));
+ //澶勭悊涓嬬骇鏁版嵁
+ this.dealApplyDetailData(insuranceApply,applyDetailList,loginUserInfo);
+ insuranceApply.setFee(applyDetailList.stream().map(ApplyDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
+ insuranceApplyMapper.updateById(insuranceApply);
+ //瀛樺偍鏃ュ織鏁版嵁
+ this.saveApplyLog(insuranceApply,insuranceApplyStatus,null);
+ return insuranceApply.getId();
+ }
+
+
+
+ public void dealApplyDetailData(InsuranceApply insuranceApply,List<ApplyDetail> applyDetailList,LoginUserInfo loginUserInfo){
+ Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+ }
//鏌ヨ淇濋櫓鏂规涓嬬殑鎵�鏈夋淳閬ｅ崟浣�
- List<DuSolution> duSolutionList = duSolutionMapper.selectList(new QueryWrapper<DuSolution>().lambda()
- .eq(DuSolution::getIsdeleted,Constants.ZERO)
- .eq(DuSolution::getStatus,Constants.ONE)
+ List<DuSolution> duSolutionList = duSolutionJoinMapper.selectJoinList(DuSolution.class,new MPJLambdaWrapper<DuSolution>()
+ .selectAll(DuSolution.class)
+ .innerJoin(DispatchUnit.class,DispatchUnit::getId,DuSolution::getDispatchUnitId)
+ .eq(DispatchUnit::getCompanyId,insuranceApply.getCompanyId())
+ .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
+ .eq(DispatchUnit::getUnitStatus,Constants.ONE)
+ .eq(DuSolution::getIsdeleted,Constants.ZERO)
+ .eq(DuSolution::getStatus,Constants.ONE)
.eq(DuSolution::getSolutionId,insuranceApply.getSolutionId()));
if(!CollectionUtils.isNotEmpty(duSolutionList)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
@@ -621,11 +728,13 @@
if(!CollectionUtils.isNotEmpty(duWorktypeList)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
}
+
if(CollectionUtils.isNotEmpty(applyDetailList)){
for (int i = 0; i < applyDetailList.size(); i++) {
ApplyDetail applyDetail = applyDetailList.get(i);
if(Objects.isNull(applyDetail)
- ||Objects.isNull(applyDetail.getMemberId())
+ ||StringUtils.isBlank(applyDetail.getIdcardNo())
+ ||StringUtils.isBlank(applyDetail.getMemberName())
||Objects.isNull(applyDetail.getDuId())
||Objects.isNull(applyDetail.getWorktypeId())
){
@@ -634,15 +743,49 @@
applyDetail.setCreateDate(new Date());
applyDetail.setCreator(loginUserInfo.getId());
applyDetail.setIsdeleted(Constants.ZERO);
+ applyDetail.setStartTime(insuranceApply.getApplyStartTime());
+ applyDetail.setEndTime(insuranceApply.getApplyEndTime());
applyDetail.setSortnum(i);
applyDetail.setApplyId(insuranceApply.getId());
+ Member member = new Member();
if(Objects.isNull(applyDetail.getMemberId())){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ヤ俊鎭瓨鍦ㄥ紓甯告暟鎹紒");
+ //鏌ヨ鏄惁瀛樺湪璇ョ敤鎴�
+ member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ .eq(Member::getCompanyId,insuranceApply.getCompanyId())
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getIdcardNo,applyDetail.getIdcardNo())
+ .last(" limit 1")
+ );
+ if(Objects.isNull(member)){
+ member = new Member();
+ member.setCreateDate(new Date());
+ member.setCreator(loginUserInfo.getId());
+ member.setIsdeleted(Constants.ZERO);
+ member.setName(applyDetail.getMemberName());
+ member.setCompanyId(insuranceApply.getCompanyId());
+ member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
+ member.setIdcardNo(applyDetail.getIdcardNo());
+ member.setApplyId(insuranceApply.getId());
+ member.setDuId(applyDetail.getDuId());
+ member.setWorktypeId(applyDetail.getWorktypeId());
+ memberMapper.insert(member);
+ }else{
+ member.setApplyId(insuranceApply.getId());
+ member.setDuId(applyDetail.getDuId());
+ member.setWorktypeId(applyDetail.getWorktypeId());
+ memberMapper.updateById(member);
+ }
+ }else{
+ member = memberMapper.selectById(applyDetail.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ヤ俊鎭瓨鍦ㄥ紓甯告暟鎹紒");
+ }
+ member.setApplyId(insuranceApply.getId());
+ member.setDuId(applyDetail.getDuId());
+ member.setWorktypeId(applyDetail.getWorktypeId());
+ memberMapper.updateById(member);
}
- Member member = memberMapper.selectById(applyDetail.getMemberId());
- if(Objects.isNull(member)){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ヤ俊鎭瓨鍦ㄥ紓甯告暟鎹紒");
- }
+ applyDetail.setMemberId(member.getId());
applyDetail.setIdcardNo(member.getIdcardNo());
applyDetail.setSex(member.getSex());
applyDetail.setFee(Constants.countDetailFee(solutions,insuranceApply.getApplyEndTime(),insuranceApply.getApplyStartTime()));
@@ -650,18 +793,15 @@
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()+"銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
}
- if(duWorktypeList.stream().filter(d->d.getDuSolutionId().equals(applyDetail.getDuId())&&d.getWorkTypeId().equals(applyDetail.getWorktypeId()))
+ 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()+"銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
}
}
applyDetailJoinMapper.insertBatchSomeColumn(applyDetailList);
}
-
- //瀛樺偍鏃ュ織鏁版嵁
- this.saveApplyLog(insuranceApply,insuranceApplyStatus,null);
- return insuranceApply.getId();
}
+
public void saveApplyLog(InsuranceApply insuranceApply,Constants.InsuranceApplyStatus insuranceApplyStatus,String content){
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -770,6 +910,7 @@
queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId,pageWrap.getModel().getBaseSolutionId());
queryWrapper.in(statusList.size()>0,InsuranceApply::getStatus,statusList);
if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.THREE) ){
queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
@@ -809,28 +950,39 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.eq(InsuranceApply::getStatus, pageWrap.getModel().getStatus());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
}
+ }else{
+ queryWrapper.orderByDesc(InsuranceApply::getCreateDate);
}
+
PageData<InsuranceApply> pageData = PageData.from(insuranceApplyJoinMapper.selectJoinPage(page,InsuranceApply.class, queryWrapper));
if(pageData.getRecords()!=null){
for (InsuranceApply apply : pageData.getRecords()){
- apply.setStatusCollect(Constants.InsuranceApplyStatus.getCollectStatus(apply.getStatus()));
- if(Constants.equalsInteger(apply.getStatusCollect(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
- //濡傛灉宸插畬鎴�
- if(apply.getEndTime()==null || System.currentTimeMillis()>apply.getEndTime().getTime()){
- apply.setStatusCollect(Constants.THREE);//宸茶繃鏈�
- }
- }
- }
+ initApplyStatus(apply) ;
+ }
}
return pageData;
}
+ public void initApplyStatus(InsuranceApply apply){
+ apply.setStatusCollect(Constants.InsuranceApplyStatus.getCollectStatus(apply.getStatus()));
+ if(Constants.equalsInteger(apply.getStatusCollect(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+ //濡傛灉宸插畬鎴�
+ if(apply.getEndTime()==null || System.currentTimeMillis()>apply.getEndTime().getTime()){
+ apply.setStatusCollect(Constants.THREE);//宸茶繃鏈�
+ }
+ }
+ setServiceDays(apply);
+ apply.setStatusInfo(Constants.ApplyCollectStatus.getName(apply.getStatusCollect()));
+
+ }
@Override
public List<InsuranceApply> findListByDTO(InsuranceApplyQueryDTO model) {
@@ -900,7 +1052,8 @@
MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>()
.selectAll(InsuranceApply.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
- .selectAs(Company::getName,ApplyLog::getCompanyName)
+ .selectAs(Company::getName,InsuranceApply::getCompanyName)
+ .select(" ( select count(1) from apply_detail ad where ad.apply_id = t.id ) as insureNum")
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
.eq(InsuranceApply::getId,id)
@@ -910,10 +1063,35 @@
if(Objects.isNull(insuranceApply)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- insuranceApply.setInsureNum(applyDetailMapper.selectCount(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId())
- .eq(ApplyDetail::getIsdeleted,Constants.ZERO)));
+ 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>()
+ .selectAll(ApplyLog.class)
+ .selectAs(SystemUser::getRealname,ApplyLog::getCreatorName)
+ .selectAs(Company::getName,ApplyLog::getCompanyName)
+ .leftJoin(SystemUser.class,SystemUser::getId,ApplyLog::getCreator)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .eq(ApplyLog::getApplyId,insuranceApply.getId())
+ .orderByAsc(ApplyLog::getCreateDate)
+ );
+ insuranceApply.setApplyLogList(applyLogList);
+ return insuranceApply;
+ }
+
+ private void setServiceDays(InsuranceApply insuranceApply) {
//璁剧疆鍦ㄤ繚鏃堕暱锛堝ぉ鏁帮級
+ insuranceApply.setServiceDays(Constants.ZERO);
if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
//濡傛灉褰撳墠鏃堕棿澶т簬缁撴潫鏃ユ湡 鍒欎娇鐢ㄧ粨鏉熸棩鏈熷姣斿紑濮嬫棩鏈�
if(DateUtil.compareDate(new Date(),insuranceApply.getEndTime())>=Constants.ZERO){
@@ -925,24 +1103,8 @@
insuranceApply.setServiceDays(DateUtil.daysBetweenDates(new Date(),insuranceApply.getStartTime()));
}
}
-
- //鏌ヨ闄勪欢鏁版嵁
- initImgData(insuranceApply);
-
- //鏌ヨ鎿嶄綔璁板綍
- List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
- new MPJLambdaWrapper<ApplyLog>()
- .selectAll(ApplyLog.class)
- .selectAs(Member::getName,ApplyLog::getCreatorName)
- .selectAs(Company::getName,ApplyLog::getCompanyName)
- .leftJoin(Member.class,Member::getId,ApplyLog::getCreator)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .eq(ApplyLog::getApplyId,insuranceApply.getId())
- .orderByAsc(ApplyLog::getCreateDate)
- );
- insuranceApply.setApplyLogList(applyLogList);
- return insuranceApply;
}
+
private void initImgData(InsuranceApply model) {
List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getObjId,model.getId())
@@ -960,13 +1122,25 @@
f.setFileurlFull(path+f.getFileurl());
if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.BD_APPLY_PDF.getKey())){
//绛剧讲鍓嶇殑鎶曚繚鍗�
- model.setBaoxiandanFile(f);
+ model.setToubaodanFile(f);
}else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.BD_SIGNED_PDF.getKey())){
//绛剧讲鍚庣殑鎶曚繚鍗�
model.setToubaodanSignedFile(f);
}else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.BD_DONE_PDF.getKey())){
//鏈�绲備繚闄╁崟
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()));
+ }
}
}
}
@@ -993,7 +1167,7 @@
.selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
- .eq(InsuranceApply::getId,model.getId());
+ .eq(ApplyDetail::getApplyId,model.getId());
//鏌ヨ鏄庣粏
List<ApplyDetail> detailList =applyDetailJoinMapper.selectJoinList(ApplyDetail.class,wrapper1);
if(detailList!=null){
@@ -1070,12 +1244,13 @@
*/
@Override
@Transactional(rollbackFor = {Exception.class})
- public void updateApplyCurrentFee(){
+ public void updateApplyCurrentFee(Integer id){
List<InsuranceApply> insuranceApplyList = insuranceApplyMapper.selectList(new QueryWrapper<InsuranceApply>().lambda()
.eq(InsuranceApply::getIsdeleted,Constants.ZERO)
.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
- .ge(InsuranceApply::getStartTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 00:00:00")
- .le(InsuranceApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 23:59:59")
+ .eq(!Objects.isNull(id),InsuranceApply::getId,id)
+ .le(InsuranceApply::getStartTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 00:00:00")
+ .ge(InsuranceApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 23:59:59")
);
if(CollectionUtils.isNotEmpty(insuranceApplyList)){
@@ -1088,8 +1263,17 @@
List<ApplyDetail> applyDetailList = applyDetailMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId()));
if(CollectionUtils.isNotEmpty(applyDetailList)){
for (ApplyDetail applyDetail: applyDetailList) {
- applyDetail.setCurrentFee(Constants.countDetailFee(solutions,new Date(),applyDetail.getStartTime()));
- applyDetailMapper.updateById(applyDetail);
+ //2024-1-30 10:04:24 淇敼 鏍规嵁瀹為檯澶╂暟杩涜璁＄畻 褰撳墠璐圭敤 鎬婚噾棰�/鎬诲ぉ鏁�*瀹為檯澶╂暟
+ Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0) + 1 ;
+ 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 ;
+ 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());
}
}
@@ -1098,15 +1282,37 @@
}
}
-
-
-
-
-
}
+ @Override
+ public CountCyclePriceVO getCountCyclePriceVO(CountCyclePriceDTO countCyclePriceDTO){
+ if(Objects.isNull(countCyclePriceDTO)
+ || Objects.isNull(countCyclePriceDTO.getSolutionsId())
+ || Objects.isNull(countCyclePriceDTO.getStartDate())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Solutions solutions = solutionsMapper.selectById(countCyclePriceDTO.getSolutionsId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+ }
+ CountCyclePriceVO countCyclePriceVO = new CountCyclePriceVO();
+ if(solutions.getInsureCycleUnit().equals(Constants.ZERO)){
+ countCyclePriceVO.setEndDate(DateUtil.afterDateByType(countCyclePriceDTO.getStartDate(),0,solutions.getInsureCycle()));
+ }else if(solutions.getInsureCycleUnit().equals(Constants.TWO)){
+ Integer monthDays = DateUtil.monthDays(countCyclePriceDTO.getStartDate());
+ Date afterDate = DateUtil.afterDateByType(countCyclePriceDTO.getStartDate(),0,monthDays);
+ countCyclePriceVO.setEndDate(DateUtil.afterDateByType(afterDate,0,-1));
+ }else if(solutions.getInsureCycleUnit().equals(Constants.THREE)){
+ Date afterDate = DateUtil.afterDateByType(countCyclePriceDTO.getStartDate(),2,solutions.getInsureCycle());
+ countCyclePriceVO.setEndDate(DateUtil.afterDateByType(afterDate,0,-1));
+ }
+ countCyclePriceVO.setCyclePrice(Constants.countDetailFee(solutions,countCyclePriceVO.getEndDate(),countCyclePriceDTO.getStartDate()));
+ return countCyclePriceVO;
+ }
+
}
--
Gitblit v1.9.3