From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 162 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 133 insertions(+), 29 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 2a1ba34..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
@@ -10,10 +10,11 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.MultifileMapper;
+import com.doumee.dao.business.NoticesMapper;
import com.doumee.dao.business.SettleClaimsLogMapper;
import com.doumee.dao.business.SettleClaimsMapper;
import com.doumee.dao.business.dto.SCSupplementDTO;
+import com.doumee.dao.business.join.MultifileJoinMapper;
import com.doumee.dao.business.join.SettleClaimsJoinMapper;
import com.doumee.dao.business.join.SettleClaimsLogJoinMapper;
import com.doumee.dao.business.model.*;
@@ -59,7 +60,7 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
- private MultifileMapper multifileMapper;
+ private MultifileJoinMapper multifileJoinMapper;
@Autowired
private SettleClaimsJoinMapper settleClaimsJoinMapper;
@@ -67,11 +68,30 @@
@Autowired
private SettleClaimsLogJoinMapper settleClaimsLogJoinMapper;
+ @Autowired
+ private NoticesMapper noticesMapper;
/**
- * 閫�鍥炵敵璇�
- * @param param
+ * 鍒犻櫎闄勪欢
* @return
*/
+ @Override
+ public Integer delFile(Integer id,Integer fileId){
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ return multifileJoinMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+ .set(Multifile::getIsdeleted,Constants.ONE)
+ .set(Multifile::getEditDate,new Date())
+ .set(Multifile::getEditor,user.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjId,id)
+ .eq(Multifile::getId,fileId)
+ .in(Multifile::getObjType,Arrays.asList(new Integer[]{
+ 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(),
+ })));
+ }
@Override
public Integer back(SettleClaims param){
if(param.getId() == null
@@ -99,6 +119,17 @@
update.setId(model.getId());
update.setStatus(Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey());
settleClaimsMapper.updateById(update);
+
+
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
+ //鍒犻櫎鍏朵粬寰呭姙
+ 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();
@@ -139,6 +170,12 @@
update.setStatus(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey());
settleClaimsMapper.updateById(update);
+
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_CONFIRM_INFORMATION;
String info =applyLogType.getInfo();
// info = info.replace("${param}", update.getCheckInfo());
@@ -177,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}", update.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;
}
@@ -222,6 +259,14 @@
update.setScClaimAccount(Constants.formatBigdecimal(param.getScClaimAccount()));
update.setClaimAccount(update.getYlClaimAccount().add(update.getSwClaimAccount()).add(update.getScClaimAccount()).add(update.getWgClaimAccount()));
settleClaimsMapper.updateById(update);
+
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
+ //鍒犻櫎鍏朵粬寰呭姙
+ 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.ONE);
+ noticesMapper.insert(notices);
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_FINISH;
String info =applyLogType.getInfo();
@@ -341,6 +386,8 @@
}
settleClaims.setCreateDate(new Date());
settleClaims.setIsdeleted(Constants.ZERO);
+ settleClaims.setCompanyId(loginUserInfo.getCompanyId());
+ settleClaims.setStatus(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey());
settleClaims.setCreator(loginUserInfo.getId());
settleClaims.setCheckUserId(loginUserInfo.getId());
settleClaimsMapper.insert(settleClaims);
@@ -351,6 +398,7 @@
Multifile multifile = reportVideo.get(i);
if(Objects.isNull(multifile.getFileurl())
|| Objects.isNull(multifile.getType())
+ || StringUtils.isBlank(multifile.getName())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢鍐呭寮傚父");
}
@@ -360,11 +408,22 @@
multifile.setObjId(settleClaims.getId());
multifile.setObjType(Constants.ONE);
multifile.setSortnum(i+1);
- multifileMapper.insert(multifile);
+ multifileJoinMapper.insert(multifile);
}
}
//璁板綍鏃ュ織
this.saveSettleClaimsLog(settleClaims,Constants.SettleClaimsLogType.UPLOAD,null);
+
+
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,settleClaims.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,settleClaims.getId(),settleClaims.getInformantName(),
+ settleClaims.getCompanyId(), Constants.NoticeType.ZERO);
+ noticesMapper.insert(notices);
+
+
return settleClaims.getId();
}
@@ -385,7 +444,7 @@
settleClaimsLogMapper.insert(log);
List<File> fileList = new ArrayList<>();
- List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ List<Multifile> multifileList = multifileJoinMapper.selectList(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getObjId,id)
.isNotNull(Multifile::getFileurl)
.in(Multifile::getObjType, Arrays.asList(new Integer[]{
@@ -395,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);
@@ -446,8 +508,12 @@
if(settleClaims == null){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
- .lambda().eq(Multifile::getObjId,id)
+ List<Multifile> multifileList = multifileJoinMapper.selectJoinList(Multifile.class,
+ new MPJLambdaWrapper<Multifile>()
+ .selectAll(Multifile.class)
+ .selectAs(SystemUser::getRealname,Multifile::getCreatorName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
+ .eq(Multifile::getObjId,id)
.eq(Multifile::getIsdeleted,Constants.ZERO)
.orderByAsc(Multifile::getCreateDate)
);
@@ -460,7 +526,7 @@
}
}
}
- Multifile baoxiandanFile = multifileMapper.selectOne(new QueryWrapper<Multifile>()
+ Multifile baoxiandanFile = multifileJoinMapper.selectOne(new QueryWrapper<Multifile>()
.lambda().eq(Multifile::getObjId,settleClaims.getInsuranceApplyId())
.eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjType,Constants.MultiFile.BD_DONE_PDF.getKey())
@@ -496,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;
}
@@ -530,8 +622,9 @@
if(!oldSettleClaims.getSolutionId().equals(settleClaims.getSolutionId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳硶淇敼鏂规淇℃伅");
}
- if(!(oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE)
- || oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION))){
+ if(!(oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())
+ || oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.DEAL_ING.getKey())
+ || oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
}
oldSettleClaims.setEditor(loginUserInfo.getId());
@@ -568,8 +661,9 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氬憳宸ユ棤娉曡繘琛岃鎿嶄綔");
}
SettleClaims settleClaims = settleClaimsMapper.selectById(scSupplementDTO.getId());
- if(!(settleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE)
- || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION))){
+ if(!(settleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())
+ || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.DEAL_ING.getKey())
+ || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
}
settleClaims.setEditor(loginUserInfo.getId());
@@ -591,21 +685,19 @@
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(scSupplementDTO)
|| Objects.isNull(scSupplementDTO.getId())
- || Objects.isNull(scSupplementDTO.getSupplement())
|| Objects.isNull(scSupplementDTO.getObjType())
|| Objects.isNull(scSupplementDTO.getFileUrl())
|| Objects.isNull(scSupplementDTO.getFileType())
- || scSupplementDTO.getObjType().equals(Constants.ZERO)
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
SettleClaims settleClaims = settleClaimsMapper.selectById(scSupplementDTO.getId());
- if(!(settleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE)
- || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION))){
+ if(!(settleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())
+ || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.DEAL_ING.getKey())
+ || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
}
-
Multifile multifile = new Multifile();
if(loginUserInfo.getType().equals(Constants.ONE)){
multifile.setCompanyId(loginUserInfo.getCompanyId());
@@ -613,10 +705,12 @@
multifile.setCreator(loginUserInfo.getId());
multifile.setCreateDate(new Date());
multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjType(scSupplementDTO.getObjType());
multifile.setObjId(scSupplementDTO.getId());
- multifile.setName(scSupplementDTO.getFileUrl().substring(scSupplementDTO.getFileUrl().lastIndexOf("/") + 1));
+ multifile.setFileurl(scSupplementDTO.getFileUrl());
+ multifile.setName(scSupplementDTO.getFileName());
multifile.setType(scSupplementDTO.getFileType());
- multifileMapper.insert(multifile);
+ multifileJoinMapper.insert(multifile);
}
@@ -698,6 +792,7 @@
.selectAs(Company::getName,SettleClaims::getCompanyName)
.selectAs(Solutions::getName,SettleClaims::getSolutionName)
.selectAs(Member::getName,SettleClaims::getMemberName)
+ .selectAs(Member::getIdcardNo,SettleClaims::getMemberIdcardNo)
.selectAs(Worktype::getName,SettleClaims::getWorktypeName)
.selectAs(InsuranceApply::getStartTime,SettleClaims::getBaoxianStartTime)
.selectAs(DispatchUnit::getName,SettleClaims::getDuName)
@@ -720,6 +815,7 @@
pageWrap.getModel().setCompanyId(user.getCompanyId());
}
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName, pageWrap.getModel().getMemberName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberIdcardNo()),Member::getIdcardNo, pageWrap.getModel().getMemberIdcardNo());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDuName()),DispatchUnit::getName, pageWrap.getModel().getDuName());
queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId, pageWrap.getModel().getBaseSolutionId());
queryWrapper.eq(pageWrap.getModel().getBaseDuId()!=null,DispatchUnit::getBaseId, pageWrap.getModel().getBaseDuId());
@@ -785,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());
@@ -817,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