From adb4be885811ee602073c2e723d9d09df0e5b4e6 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 02 四月 2024 13:51:15 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 311 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 258 insertions(+), 53 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 153b63e..d8f96fc 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
@@ -103,6 +103,8 @@
private NoticesMapper noticesMapper;
@Autowired
private UnionApplyJoinMapper unionApplyJoinMapper;
+ @Autowired
+ private UnionChangeJoinMapper unionChangeJoinMapper;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -517,6 +519,13 @@
.eq(Notices::getObjId,model.getId()));
Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),model.getSolutionsName(),model.getCompanyId(),Constants.NoticeType.TWO);
noticesMapper.insert(notices);
+ Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+ if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+ Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),solutions.getShopId(),Constants.NoticeType.TWO);
+ noticesMapper.insert(shopNotices);
+ }
+
+
Multifile f = new Multifile();
f.setIsdeleted(Constants.ZERO);
@@ -646,10 +655,24 @@
multifileMapper.insert(f);
+
+ //鏁版嵁鏃ュ織
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_MEMBER_LIST;
ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
+
+ Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+ //寰呭姙閫氱煡
+ if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
+ Notices notices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),
+ solutions.getShopId(), Constants.NoticeType.SEVEN);
+ notices.setParam1(model.getId().toString());
+ noticesMapper.insert(notices);
+ }
+
+
return f;
}
@@ -679,6 +702,15 @@
companyId, Constants.NoticeType.TWO);
notices.setParam1(model.getApplyId().toString());
noticesMapper.insert(notices);
+
+ Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
+ //鍟嗘埛寰呭姙
+ if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+ Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+ model.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.TWO);
+ notices.setParam1(model.getApplyId().toString());
+ noticesMapper.insert(shopNotices);
+ }
Multifile f = new Multifile();
f.setIsdeleted(Constants.ZERO);
@@ -730,6 +762,19 @@
ApplyLog log = new ApplyLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
+
+ Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
+ //寰呭姙閫氱煡
+ if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+ if(model.getType().equals(Constants.ONE)){
+ noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+ }
+ Notices notices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),
+ solutions.getShopId(), Constants.NoticeType.SEVEN);
+ notices.setParam1(model.getApplyId().toString());
+ noticesMapper.insert(notices);
+ }
return f;
}
@@ -751,32 +796,61 @@
update.setId(model.getId());
unionApplyJoinMapper.updateById(update);
- //瀛樺偍寰呭姙淇℃伅
-// Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
-// //鍒犻櫎鍏朵粬寰呭姙
-// noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
-// .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
-// .eq(Notices::getObjId,model.getId()));
-// Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),model.getSolutionsName(),model.getCompanyId(),Constants.NoticeType.TWO);
-// noticesMapper.insert(notices);
-
Multifile f = new Multifile();
f.setIsdeleted(Constants.ZERO);
f.setCreator(model.getCreator());
f.setObjId(update.getId());
f.setCreateDate(update.getEditDate());
- f.setObjType(Constants.MultiFile.HBD_BD_APPLY_PDF.getKey());
+ f.setObjType(Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey());
f.setType(Constants.TWO);
f.setFileurl(fileurl);
f.setFileurlFull(fullUrl);
f.setInfo("鍟嗘埛绛剧讲鎶曚繚鍗�");
f.setName("鍟嗘埛绛剧讲鎶曚繚鍗�.pdf");
multifileMapper.insert(f);
-// Constants.ApplyLogType applyLogType = Constants.ApplyLogType.SIGNATURE;
-// ApplyLog log = new ApplyLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
-// applyLogMapper.insert(log);
-//
-// startSendEmail(f, model.getCompanyName(),model.getSolutionsName(),model.getSolutionEmail());
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_SIGNATURE_TBD;
+ ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
+ ,model.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(model));
+ applyLogMapper.insert(log);
+
+ return f;
+ }
+
+
+ /**
+ * 鍟嗘埛鍚堝苟鍗�(鍔犲噺淇�/鎹㈠巶) 鍟嗘埛绛剧讲鎶曚繚鐢宠鍗�
+ * @param model
+ * @param fileurl
+ * @param fullUrl
+ * @return
+ */
+ public Multifile uploadUnionChangeSignedFileDo(UnionChange model,String fileurl,String fullUrl) {
+ UnionChange update = new UnionChange();
+ update.setEditDate(new Date());
+ update.setEditor(model.getCreator());
+ update.setStatus(Constants.UnionChangeStatus.UPLOAD_INSURANCE_POLICY.getKey());
+ update.setId(model.getId());
+ unionChangeJoinMapper.updateById(update);
+
+ Multifile f = new Multifile();
+ f.setIsdeleted(Constants.ZERO);
+ f.setCreator(model.getCreator());
+ f.setObjId(update.getId());
+ f.setCreateDate(update.getEditDate());
+ f.setObjType(Constants.MultiFile.WTB_CA_TBD_PDF.getKey());
+ f.setType(Constants.TWO);
+ f.setFileurl(fileurl);
+ f.setFileurlFull(fullUrl);
+ f.setInfo("濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗�");
+ f.setName("濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗�.pdf");
+ multifileMapper.insert(f);
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_SIGNATURE_TBD;
+ ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
+ ,model.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(model));
+ applyLogMapper.insert(log);
+
return f;
}
@@ -927,6 +1001,7 @@
.selectAll(ApplyChange.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+ .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -952,11 +1027,13 @@
}
}
+ //濮旀墭淇� 鍔犲噺淇�/鎹㈠巶 绛剧讲浜哄憳鍚嶅崟
chagneList = applyChangeMapper.selectJoinList(ApplyChange.class,
new MPJLambdaWrapper<ApplyChange>()
.selectAll(ApplyChange.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+ .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -1005,11 +1082,32 @@
continue;
}
uploadUnionApplySignedFileDo(model,fileUrl,path+fileUrl);
-// return;
}
}
-
+ /**
+ *鍚堝苟鍔犲噺淇濇崲鍘� 绛剧讲涓氬姟
+ */
+ List<UnionChange> unionChangeList = unionChangeJoinMapper.selectJoinList(UnionChange.class,
+ new MPJLambdaWrapper<UnionChange>()
+ .selectAll(UnionChange.class)
+ .eq(UnionChange::getStatus,Constants.UnionChangeStatus.MERGE.getKey())
+ .isNotNull(UnionChange::getSignApplyNo));
+ if(unionChangeList !=null && unionChangeList.size()>0 ){
+ for(UnionChange model : unionChangeList){
+ String status = signService.linkFileStatus(model.getSignApplyNo());
+ if(!StringUtils.equals(status,"3")){
+ continue;
+ }
+ String link = signService.linkFile(model.getSignApplyNo());
+ String fileUrl = uploadSignFile(link);
+ if(StringUtils.isBlank(fileUrl)){
+ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+ continue;
+ }
+ uploadUnionChangeSignedFileDo(model,fileUrl,path+fileUrl);
+ }
+ }
@@ -1127,6 +1225,7 @@
.selectAll(ApplyChange.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+ .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -1150,6 +1249,7 @@
.selectAll(ApplyChange.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+ .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
@@ -1180,6 +1280,27 @@
}
uploadUnionApplySignedFileDo(unionApply,fileUrl,path+fileUrl);
}
+
+
+ /**
+ *鍚堝苟鍔犲噺淇濇崲鍘� 绛剧讲涓氬姟
+ */
+ UnionChange unionChange = unionChangeJoinMapper.selectOne(
+ new MPJLambdaWrapper<UnionChange>()
+ .selectAll(UnionChange.class)
+ .eq(UnionChange::getSignApplyNo,data.getApplyNo())
+ .last(" limit 1 "));
+ if(unionChange != null &&Constants.equalsInteger(unionChange.getStatus(),Constants.UnionChangeStatus.MERGE.getKey())){
+ String link = signService.linkFile(model.getSignApplyNo());
+ String fileUrl = uploadSignFile(link);
+ if(StringUtils.isBlank(fileUrl)){
+ //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+ return;
+ }
+ uploadUnionChangeSignedFileDo(unionChange,fileUrl,path+fileUrl);
+ }
+
+
}else if(Constants.equalsInteger(data.getSignStatus(), Constants.TWO )){
//濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆＄绔犻噸鏂扮敓鎴愭柊鍚堝悓
insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
@@ -1200,6 +1321,9 @@
applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
.set(ApplyChange::getSignMemberListNo,null)
.eq(ApplyChange::getSignMemberListNo,data.getApplyNo()));
+ unionChangeJoinMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
+ .set(UnionChange::getSignApplyNo,null)
+ .eq(UnionChange::getSignApplyNo,data.getApplyNo()));
}
}
@@ -1337,10 +1461,20 @@
//瀛樺偍寰呭姙淇℃伅
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
- //鍒犻櫎鍏朵粬寰呭姙
- noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
- .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
- .eq(Notices::getObjId,model.getId()));
+ if(Constants.equalsObject(solutions.getType(),Constants.ZERO)) {
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjType, noticeObjectType.getKey())
+ .ne(Notices::getType, Constants.NoticeType.SIX.getStatus())
+ .eq(Notices::getObjId, model.getId()));
+ }else{
+ //鍒犻櫎鍏ㄩ儴寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjType, noticeObjectType.getKey())
+ .eq(Notices::getObjId, model.getId()));
+ }
+
+
String info =applyLogType.getInfo();
if(StringUtils.isNotBlank(update.getCheckInfo())){
info = info.replace("${param}", update.getCheckInfo());
@@ -1421,17 +1555,25 @@
// info = info.replace("${param}", update.getCheckInfo());
ApplyLog log = new ApplyLog(insuranceApply,applyLogType.getName(),info,insuranceApply.getId(),applyLogType.getKey(),null, null);
applyLogMapper.insert(log);
-
-
- //鍙戦�佸緟鍔炰笟鍔�
- //瀛樺偍寰呭姙淇℃伅
- Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
- //鍒犻櫎鍏朵粬寰呭姙
- noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
- .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
- .eq(Notices::getObjId,insuranceApply.getId()));
- Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
- noticesMapper.insert(notices);
+
+ //鐩翠繚涓氬姟鍙戦�佸緟鍔�
+ if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
+ .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
+ .eq(Notices::getObjId,insuranceApply.getId()));
+ //瀛樺偍骞冲彴寰呭姙
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
+ noticesMapper.insert(notices);
+ //鍟嗘埛寰呭姙
+ if(Objects.nonNull(solutions.getShopId())){
+ Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+ insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.ZERO);
+ noticesMapper.insert(shopNotices);
+ }
+ }
return insuranceApply.getId();
}
@@ -1856,9 +1998,13 @@
queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(model.getUnionApplyId()!=null,InsuranceApply::getUnionApplyId, model.getUnionApplyId());
//浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
if(loginUserInfo.getType().equals(Constants.ONE)){
queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+ }else if(loginUserInfo.getType().equals(Constants.TWO)){
+ //濡傛灉鏄晢瀹舵煡鐪�
+ queryWrapper.eq(Solutions::getShopId, loginUserInfo.getCompanyId());
}else{
if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
@@ -1909,7 +2055,62 @@
queryWrapper.ge(InsuranceApply::getEndTime,DateUtil.DateToStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
}
List<InsuranceApply> list = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class, queryWrapper);
+ if(Constants.equalsObject(model.getGetFiles(),Constants.ONE)){
+ //濡傛灉鏄悎骞跺崟,闇�瑕佹煡璇㈤檮浠朵俊鎭�
+ initFileForList(list);
+ }
return list;
+ }
+
+ private void initFileForList(List<InsuranceApply> list) {
+ List<Integer> objList = new ArrayList<>();
+ if(list!=null && list.size()>0){
+ for(InsuranceApply param : list){
+ objList.add(param.getId());
+ }
+ }else{
+ return;
+ }
+ List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .in(Multifile::getObjId,objList)
+ .in(Multifile::getObjType,Arrays.asList(new Integer[]{Constants.MultiFile.BD_APPLY_PDF.getKey()
+ ,Constants.MultiFile.BD_SIGNED_PDF.getKey()
+ ,Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey()
+ ,Constants.MultiFile.MEMBER_LIST_LATTER.getKey()
+ ,Constants.MultiFile.BD_DONE_PDF.getKey()}))
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .orderByAsc(Multifile::getId));
+ if(multifiles!=null && multifiles.size()>0){
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+ for(InsuranceApply model : list){
+ for(Multifile f : multifiles) {
+ if (StringUtils.isBlank(f.getFileurl())) {
+ continue;
+ }
+ f.setFileurlFull(path+f.getFileurl());
+ if(Constants.equalsInteger(f.getObjId(), model.getId()) ){
+ if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_APPLY_PDF.getKey())) {
+ //绛剧讲鍓嶇殑鎶曚繚鍗�
+ 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);
+ } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.MEMBER_LIST_LATTER.getKey())) {
+ //鐢宠鍗�
+ model.setShenqingdanFile(f);
+ } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey())) {
+ //绛剧讲鍚庣‘璁や功
+ model.setFanganFile(f);
+ }
+ }
+ }
+ }
+ }
+
}
@@ -1932,10 +2133,10 @@
.selectAs(Solutions::getTimeUnit,InsuranceApply::getTimeUnit)
.selectAs(Solutions::getType,InsuranceApply::getSolutionType)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
- .selectAs(Solutions::getName,InsuranceApply::getShopName)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.select(" ( select max(ac.APPLY_START_TIME) from apply_change ac where ac.apply_id = t.id and ac.status = 2 ) as lastChangeDate")
.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum")
+ .select(" t3.name as shopName")
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
.leftJoin(Company.class,Company::getId,Solutions::getShopId)
@@ -2135,8 +2336,12 @@
Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
noticesMapper.insert(notices);
-
-
+ //鍟嗘埛寰呭姙
+ if(Objects.nonNull(solutions.getShopId())){
+ Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+ insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.THREE);
+ noticesMapper.insert(shopNotices);
+ }
}else if(insuranceApplyOptDTO.getOptType().equals(Constants.TWO)){
insuranceApplyStatus = Constants.InsuranceApplyStatus.CLOSE;
if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.CLOSE.getKey())){
@@ -2178,11 +2383,11 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
}
MPJLambdaWrapper<ApplyDetail> lambdaWrapper = new MPJLambdaWrapper<ApplyDetail>();
- lambdaWrapper.selectAll(Member.class)
+ lambdaWrapper.select(ApplyDetail::getId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
.and(i->i.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()).or().eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey()))
.eq(InsuranceApply::getCompanyId,loginUserInfo.getCompanyId())
- .apply(" now() betwwen t.START_TIME and t.END_TIME ");
+ .apply(" now() between t.START_TIME and t.END_TIME ");
Integer count = applyDetailJoinMapper.selectJoinCount(lambdaWrapper);
return count;
@@ -2195,11 +2400,12 @@
* 鏇存柊淇濆崟瀹為檯閲戦
*/
@Override
- @Transactional(rollbackFor = {Exception.class})
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void updateApplyCurrentFee(Integer id){
- List<InsuranceApply> insuranceApplyList = insuranceApplyMapper.selectList(new QueryWrapper<InsuranceApply>().lambda()
+ List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,new MPJLambdaWrapper<InsuranceApply>()
+ .selectAll(InsuranceApply.class)
.eq(InsuranceApply::getIsdeleted,Constants.ZERO)
- .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+ .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())
.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")
@@ -2207,20 +2413,23 @@
if(CollectionUtils.isNotEmpty(insuranceApplyList)){
for (InsuranceApply insuranceApply:insuranceApplyList) {
- Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
- if(Objects.isNull(solutions)){
- continue;
- }
+// Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+// if(Objects.isNull(solutions)){
+// continue;
+// }
BigDecimal sumAmount = BigDecimal.ZERO;
- List<ApplyDetail> applyDetailList = applyDetailMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId()));
+ List<ApplyDetail> applyDetailList = applyDetailMapper
+ .selectList(new QueryWrapper<ApplyDetail>().lambda()
+ .eq(ApplyDetail::getApplyId,insuranceApply.getId()));
if(CollectionUtils.isNotEmpty(applyDetailList)){
for (ApplyDetail applyDetail: applyDetailList) {
//2024-1-30 10:04:24 淇敼 鏍规嵁瀹為檯澶╂暟杩涜璁＄畻 褰撳墠璐圭敤 鎬婚噾棰�/鎬诲ぉ鏁�*瀹為檯澶╂暟
- Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
+// 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);
- applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
+ applyDetail.setCurrentFee(new BigDecimal(days).multiply(applyDetail.getPrice()));
+ //applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
applyDetailMapper.updateById(applyDetail);
}else if(applyDetail.getStartTime().compareTo(new Date()) <= 0&&applyDetail.getEndTime().compareTo(new Date()) <= 0){
applyDetail.setCurrentFee(fee);
@@ -2233,10 +2442,6 @@
insuranceApplyMapper.updateById(insuranceApply);
}
}
-// if(1==1){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
-// }
-
}
@@ -2371,7 +2576,7 @@
.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
.isNull(ApplyDetail::getFromId)
- .eq(ApplyDetail::getId,model.getId())
+ .eq(ApplyDetail::getApplyId,model.getId())
);
model.setApplyDetailList(applyDetailList);
return model;
@@ -2482,7 +2687,7 @@
Constants.ApplyLogType applyLogType = null;
String info = "";
//濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
- if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
+ if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
Company company = user.getCompany();
--
Gitblit v1.9.3