From e3615abf0e9b87f574ddce53f94529d40762cecc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 六月 2024 17:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index 5a501ce..f79a210 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -126,6 +126,11 @@
//鍒犻櫎鍏朵粬寰呭姙
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.getInformantName(),
+ model.getCompanyId(), Constants.NoticeType.FOUR);
+ noticesMapper.insert(notices);
+
+
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_RETURN;
String info =applyLogType.getInfo();
info = info.replace("${param}", update.getCheckInfo());
@@ -209,11 +214,11 @@
update.setId(model.getId());
settleClaimsMapper.updateById(update);
- Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK;
- String info =applyLogType.getInfo();
- info = info.replace("${param}", param.getCheckInfo());
- SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
- settleClaimsLogMapper.insert(log);
+// Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK;
+// String info =applyLogType.getInfo();
+// info = info.replace("${param}", param.getCheckInfo());
+// SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+// settleClaimsLogMapper.insert(log);
return 1;
}
@@ -449,16 +454,19 @@
Constants.MultiFile.LP_SCZL_FILE.getKey(),
Constants.MultiFile.LP_JACL_FILE.getKey(),
}))
+ .orderByAsc(Multifile::getCreateDate)
);
if(multifileList== null || multifileList.size() == 0){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.SETTLE_FILE).getCode();
+ Integer sn = 1;
for(Multifile l : multifileList){
- File f = Constants.getFileByNetFile(path + l.getFileurl(),StringUtils.defaultString(l.getName(),"鏈懡鍚�"));
+ File f = Constants.getFileByNetFile(path + l.getFileurl(),StringUtils.defaultString(sn + "_" +l.getName(),"鏈懡鍚�"));
if(f !=null && f.isFile()){
fileList.add(f);
}
+ sn = sn +1;
}
if(fileList == null || fileList.size() == 0){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -554,8 +562,34 @@
.eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
.orderByAsc(SettleClaimsLog::getCreateDate)
);
-
settleClaims.setSettleClaimsLogList(settleClaimsLogList);
+ SettleClaimsLog lastConfirm = settleClaimsLogMapper.selectOne(new QueryWrapper<SettleClaimsLog>().lambda()
+ .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
+ .eq(SettleClaimsLog::getObjType,Constants.SettleClaimsLogType.PLATFORM_CONFIRM_INFORMATION.getKey())
+ .orderByDesc(SettleClaimsLog::getCreateDate)
+ .last(" limit 1")
+ );
+
+ Multifile multifile = multifileJoinMapper.selectOne(new QueryWrapper<Multifile>()
+ .lambda()
+ .eq(Multifile::getObjId,settleClaims.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .in(Multifile::getObjType,
+ Constants.MultiFile.LP_SGXC_FILE.getKey(),
+ Constants.MultiFile.LP_YGGX_FILE.getKey(),
+ Constants.MultiFile.LP_MZCL_FILE.getKey(),
+ Constants.MultiFile.LP_ZYCL_FILE.getKey(),
+ Constants.MultiFile.LP_SCZL_FILE.getKey(),
+ Constants.MultiFile.LP_JACL_FILE.getKey())
+ .orderByDesc(Multifile::getCreateDate)
+ .last(" limit 1")
+ );
+
+ if(!Objects.isNull(lastConfirm)&&!Objects.isNull(multifile)){
+ settleClaims.setFinishDate(lastConfirm.getCreateDate().compareTo(multifile.getCreateDate())>=0?lastConfirm.getCreateDate():multifile.getCreateDate());
+ }else if(!Objects.isNull(lastConfirm)&&Objects.isNull(multifile)){
+ settleClaims.setFinishDate(lastConfirm.getCreateDate());
+ }
return settleClaims;
}
@@ -674,7 +708,7 @@
multifile.setObjType(scSupplementDTO.getObjType());
multifile.setObjId(scSupplementDTO.getId());
multifile.setFileurl(scSupplementDTO.getFileUrl());
- multifile.setName(scSupplementDTO.getFileUrl().substring(scSupplementDTO.getFileUrl().lastIndexOf("/") + 1));
+ multifile.setName(scSupplementDTO.getFileName());
multifile.setType(scSupplementDTO.getFileType());
multifileJoinMapper.insert(multifile);
}
@@ -847,7 +881,15 @@
queryWrapper.eq(SettleClaims::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.eq(SettleClaims::getStatus, pageWrap.getModel().getStatus());
+ if(pageWrap.getModel().getStatus().equals(Constants.ZERO)){
+ queryWrapper.in(SettleClaims::getStatus, Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey()
+ ,Constants.SettleClaimsStatus.DEAL_ING.getKey()
+ ,Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey());
+ }else{
+ queryWrapper.eq(SettleClaims::getStatus, pageWrap.getModel().getStatus());
+ }
+
+
}
if (pageWrap.getModel().getType() != null) {
queryWrapper.eq(SettleClaims::getType, pageWrap.getModel().getType());
@@ -879,7 +921,7 @@
if (pageWrap.getModel().getInsuranceApplyId() != null) {
queryWrapper.eq(SettleClaims::getInsuranceApplyId, pageWrap.getModel().getInsuranceApplyId());
}
- queryWrapper.orderByAsc(SettleClaims::getCreateDate);
+ queryWrapper.orderByDesc(SettleClaims::getCreateDate);
/*for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
--
Gitblit v1.9.3