From d4920f7a0b3146a2218a210d3f93b655ff010eb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 01 二月 2024 17:14:13 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 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 3a6ae65..d9e8421 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
@@ -68,10 +68,27 @@
private SettleClaimsLogJoinMapper settleClaimsLogJoinMapper;
/**
- * 閫�鍥炵敵璇�
- * @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
@@ -179,7 +196,7 @@
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK;
String info =applyLogType.getInfo();
- info = info.replace("${param}", update.getCheckInfo());
+ 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;
@@ -341,6 +358,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 +370,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(),"闄勪欢鍐呭寮傚父");
}
@@ -534,8 +554,8 @@
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.CONFIRM_INFORMATION.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
}
oldSettleClaims.setEditor(loginUserInfo.getId());
@@ -572,8 +592,8 @@
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.CONFIRM_INFORMATION.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
}
settleClaims.setEditor(loginUserInfo.getId());
@@ -595,21 +615,18 @@
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.CONFIRM_INFORMATION.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
}
-
Multifile multifile = new Multifile();
if(loginUserInfo.getType().equals(Constants.ONE)){
multifile.setCompanyId(loginUserInfo.getCompanyId());
@@ -617,7 +634,9 @@
multifile.setCreator(loginUserInfo.getId());
multifile.setCreateDate(new Date());
multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjType(scSupplementDTO.getObjType());
multifile.setObjId(scSupplementDTO.getId());
+ multifile.setFileurl(scSupplementDTO.getFileUrl());
multifile.setName(scSupplementDTO.getFileUrl().substring(scSupplementDTO.getFileUrl().lastIndexOf("/") + 1));
multifile.setType(scSupplementDTO.getFileType());
multifileJoinMapper.insert(multifile);
@@ -702,6 +721,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)
@@ -724,6 +744,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());
--
Gitblit v1.9.3