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 | 384 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 267 insertions(+), 117 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 914e29c..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,13 +10,15 @@
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.*;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SettleClaimsLogService;
import com.doumee.service.business.SettleClaimsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -58,7 +60,7 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
- private MultifileMapper multifileMapper;
+ private MultifileJoinMapper multifileJoinMapper;
@Autowired
private SettleClaimsJoinMapper settleClaimsJoinMapper;
@@ -66,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
@@ -83,8 +104,8 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey()))){
+ if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
@@ -98,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();
@@ -114,8 +146,7 @@
*/
@Override
public Integer confirm(SettleClaims param){
- if(param.getId() == null
- ||StringUtils.isBlank( param.getCheckInfo()) ){
+ if(param.getId() == null ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -123,8 +154,8 @@
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
-
- if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.DEAL_ING.getKey()))){
+ if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
@@ -139,16 +170,22 @@
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());
+// 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);
return 1;
}
/**
- * 鐞嗚禂缁撴鎻愪氦
+ * 鐞嗚禂澶囨敞鏍囩
* @param param
* @return
*/
@@ -158,14 +195,12 @@
||StringUtils.isBlank( param.getCheckInfo()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
SettleClaims model = settleClaimsMapper.selectById(param.getId());
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- /*
- if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.DEAL_ING.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
+ /* if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
*/
@@ -174,16 +209,16 @@
update.setEditDate(new Date());
update.setEditor(user.getId());
update.setCheckDate(update.getEditDate());
- update.setCheckInfo(param.getCheckInfo());
+ update.setCheckInfo("娣诲姞澶囨敞鏍囩");
update.setCheckUserId(user.getId());
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;
}
@@ -204,8 +239,8 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
//鍙楃悊涓拰宸茬‘璁よ祫鏂欏彲浠ヨ繘琛岀悊璧斿鐞�
- if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.DEAL_ING.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
+ if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
@@ -224,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();
@@ -244,17 +287,15 @@
||StringUtils.isBlank( param.getCheckInfo()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
SettleClaims model = settleClaimsMapper.selectById(param.getId());
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
//鍙楃悊涓拰宸茬‘璁よ祫鏂欏彲浠ヨ繘琛岀悊璧斿鐞�
- if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.DEAL_ING.getKey())
- ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){
+ if( Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
-
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SettleClaims update = new SettleClaims();
update.setEditDate(new Date());
@@ -281,7 +322,7 @@
@Override
public Integer addCode(SettleClaims param){
if(param.getId() == null
- ||StringUtils.isBlank( param.getCode()) ){
+ ||StringUtils.isBlank( param.getReportNum()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -289,10 +330,10 @@
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())){
+ if((Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
-
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SettleClaims update = new SettleClaims();
update.setEditDate(new Date());
@@ -302,11 +343,13 @@
update.setCheckUserId(user.getId());
update.setId(model.getId());
update.setStatus(Constants.SettleClaimsStatus.DEAL_ING.getKey());
- update.setCode(param.getCode());
+ update.setReportNum(param.getReportNum());
settleClaimsMapper.updateById(update);
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_ADDCODE;
- SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+ String info =applyLogType.getInfo();
+ info = info.replace("${param}", update.getReportNum());
+ SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
settleClaimsLogMapper.insert(log);
return 1;
@@ -343,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);
@@ -353,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(),"闄勪欢鍐呭寮傚父");
}
@@ -362,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();
}
@@ -387,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[]{
@@ -397,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);
@@ -417,47 +477,65 @@
response.setContentType("application/octet-stream");
response.setHeader("eva-opera-type", "download");
response.setHeader("eva-download-filename", encodeFileName);
- packFilesToZip(fileList,response.getOutputStream());
+ Constants.packFilesToZip(fileList,response.getOutputStream());
} catch (IOException e) {
throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
}
}
-
- public static void packFilesToZip(List<File> files, ServletOutputStream os) throws IOException {
- try (ZipArchiveOutputStream zipOutputStream = new ZipArchiveOutputStream(os)) {
- for (File file : files) {
- ZipArchiveEntry entry = new ZipArchiveEntry(file.getName());
- zipOutputStream.putArchiveEntry(entry);
- try (FileInputStream fileInputStream = new FileInputStream(file)) {
- byte[] buffer = new byte[1024];
- int length;
- while ((length = fileInputStream.read(buffer)) > 0) {
- zipOutputStream.write(buffer, 0, length);
- }
- }
- zipOutputStream.closeArchiveEntry();
- }
- }
- }
-
@Override
public SettleClaims getSettleClaimsDetail(Integer id){
- SettleClaims settleClaims = settleClaimsJoinMapper.selectJoinOne(SettleClaims.class,new MPJLambdaWrapper<SettleClaims>()
- .selectAll(SettleClaims.class)
+
+ MPJLambdaWrapper<SettleClaims> queryWrapper = new MPJLambdaWrapper<SettleClaims>();
+ queryWrapper.selectAll(SettleClaims.class)
+ .selectAs(Company::getName,SettleClaims::getCompanyName)
+ .selectAs(Solutions::getName,SettleClaims::getSolutionName)
+ .selectAs(Member::getName,SettleClaims::getMemberName)
+ .selectAs(Member::getIdcardNo,SettleClaims::getMemberIdcardNo)
+ .selectAs(InsuranceApply::getCode,SettleClaims::getApplyCode)
+ .selectAs(Worktype::getName,SettleClaims::getWorktypeName)
+ .selectAs(InsuranceApply::getStartTime,SettleClaims::getBaoxianStartTime)
+ .selectAs(InsuranceApply::getEndTime,SettleClaims::getBaoxianEndTime)
+ .selectAs(DispatchUnit::getName,SettleClaims::getDuName)
+ .leftJoin(Company.class,Company::getId,SettleClaims::getCompanyId)
.leftJoin(Member.class,Member::getId,SettleClaims::getMemberId)
- .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,SettleClaims::getDuId)
.leftJoin(Worktype.class,Worktype::getId,SettleClaims::getWorktypeId)
- .eq(SettleClaims::getId,id)
- .last(" limit 1 ")
- );
-
- List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
- .lambda().eq(Multifile::getObjId,id)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,SettleClaims::getSolutionId)
+ .eq(SettleClaims::getId,id);
+ SettleClaims settleClaims = settleClaimsJoinMapper.selectJoinOne(SettleClaims.class,queryWrapper);
+ if(settleClaims == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ 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)
);
+ String rPath = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode();
+ String path = rPath+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.SETTLE_FILE).getCode();
+ if(multifileList!=null){
+ for(Multifile f : multifileList){
+ if(f!=null&& StringUtils.isNotBlank(f.getFileurl())){
+ f.setFileurlFull(path+f.getFileurl());
+ }
+ }
+ }
+ 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())
+ .last("limit 1"));
+ if(baoxiandanFile!=null&& StringUtils.isNotBlank(baoxiandanFile.getFileurl())){
+ path = rPath+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+ baoxiandanFile.setFileurlFull(path+baoxiandanFile.getFileurl());
+ }
+ settleClaims.setBaoxiandanFile(baoxiandanFile);//淇濋櫓鍗�
if(CollectionUtils.isNotEmpty(multifileList)){
settleClaims.setReportFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SGXC_FILE.getKey())).collect(Collectors.toList()));
@@ -470,22 +548,48 @@
settleClaims.setDisabilityFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SCZL_FILE.getKey())).collect(Collectors.toList()));
settleClaims.setCompensationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_JACL_FILE.getKey())).collect(Collectors.toList()));
-
}
//鏌ヨ鎿嶄綔璁板綍
List<SettleClaimsLog> settleClaimsLogList = settleClaimsLogJoinMapper.selectJoinList(SettleClaimsLog.class,
new MPJLambdaWrapper<SettleClaimsLog>()
.selectAll(SettleClaimsLog.class)
- .selectAs(Member::getName,SettleClaimsLog::getCreatorName)
+ .selectAs(SystemUser::getRealname,SettleClaimsLog::getCreatorName)
+ .selectAs(SystemUser::getType,SettleClaimsLog::getCreatorType)
.selectAs(Company::getName,SettleClaimsLog::getCompanyName)
- .leftJoin(Member.class,Member::getId,SettleClaimsLog::getCreator)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(SystemUser.class,SystemUser::getId,SettleClaimsLog::getCreator)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
.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;
}
@@ -518,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());
@@ -556,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());
@@ -579,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());
@@ -601,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);
}
@@ -660,6 +766,7 @@
@Override
public SettleClaims findById(Integer id) {
+
return settleClaimsMapper.selectById(id);
}
@@ -678,109 +785,152 @@
@Override
public PageData<SettleClaims> findPage(PageWrap<SettleClaims> pageWrap) {
IPage<SettleClaims> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<SettleClaims> queryWrapper = new QueryWrapper<>();
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Utils.MP.blankToNull(pageWrap.getModel());
+ MPJLambdaWrapper<SettleClaims> queryWrapper = new MPJLambdaWrapper<SettleClaims>();
+ queryWrapper.selectAll(SettleClaims.class)
+ .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)
+ .leftJoin(Company.class,Company::getId,SettleClaims::getCompanyId)
+ .leftJoin(Member.class,Member::getId,SettleClaims::getMemberId)
+ .leftJoin(DispatchUnit.class,DispatchUnit::getId,SettleClaims::getDuId)
+ .leftJoin(Worktype.class,Worktype::getId,SettleClaims::getWorktypeId)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,SettleClaims::getSolutionId);
+ queryWrapper.eq(DispatchUnit::getIsdeleted,Constants.ZERO);
+ if(Constants.equalsInteger(user.getType(),Constants.ZERO)){
+ //鍙兘鐪嬫潈闄愯寖鍥村唴
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ queryWrapper. eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ queryWrapper. in(Company::getId, user.getCompanyIdList());
+ }
+ } else {
+ //浼佷笟鐢ㄦ埛鍙湅鑷繁鐨勬暟鎹�
+ 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());
+
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(SettleClaims::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(SettleClaims::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(SettleClaims::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(SettleClaims::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(SettleClaims::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(SettleClaims::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(SettleClaims::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(SettleClaims::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(SettleClaims::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(SettleClaims::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(SettleClaims::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(SettleClaims::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(SettleClaims::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(SettleClaims::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(SettleClaims::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(SettleClaims::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(SettleClaims::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(SettleClaims::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(SettleClaims::getSortnum, pageWrap.getModel().getSortnum());
}
if (pageWrap.getModel().getSolutionId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getSolutionId, pageWrap.getModel().getSolutionId());
+ queryWrapper.eq(SettleClaims::getSolutionId, pageWrap.getModel().getSolutionId());
}
if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getCompanyId, pageWrap.getModel().getCompanyId());
+ queryWrapper.eq(SettleClaims::getCompanyId, pageWrap.getModel().getCompanyId());
}
if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(SettleClaims::getMemberId, pageWrap.getModel().getMemberId());
}
if (pageWrap.getModel().getHappenTime() != null) {
- queryWrapper.lambda().eq(SettleClaims::getHappenTime, pageWrap.getModel().getHappenTime());
+ queryWrapper.eq(SettleClaims::getHappenTime, pageWrap.getModel().getHappenTime());
}
if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().ge(SettleClaims::getIdcardNo, Utils.Date.getStart(pageWrap.getModel().getIdcardNo()));
- queryWrapper.lambda().le(SettleClaims::getIdcardNo, Utils.Date.getEnd(pageWrap.getModel().getIdcardNo()));
+ queryWrapper.eq(SettleClaims::getIdcardNo, pageWrap.getModel().getIdcardNo());
+
}
if (pageWrap.getModel().getDuId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getDuId, pageWrap.getModel().getDuId());
+ queryWrapper.eq(SettleClaims::getDuId, pageWrap.getModel().getDuId());
}
if (pageWrap.getModel().getWorktypeId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getWorktypeId, pageWrap.getModel().getWorktypeId());
+ queryWrapper.eq(SettleClaims::getWorktypeId, pageWrap.getModel().getWorktypeId());
}
if (pageWrap.getModel().getFee() != null) {
- queryWrapper.lambda().eq(SettleClaims::getFee, pageWrap.getModel().getFee());
+ queryWrapper.eq(SettleClaims::getFee, pageWrap.getModel().getFee());
}
if (pageWrap.getModel().getCheckInfo() != null) {
- queryWrapper.lambda().eq(SettleClaims::getCheckInfo, pageWrap.getModel().getCheckInfo());
+ queryWrapper.eq(SettleClaims::getCheckInfo, pageWrap.getModel().getCheckInfo());
}
if (pageWrap.getModel().getCheckUserId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getCheckUserId, pageWrap.getModel().getCheckUserId());
+ queryWrapper.eq(SettleClaims::getCheckUserId, pageWrap.getModel().getCheckUserId());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(SettleClaims::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(SettleClaims::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().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.lambda().eq(SettleClaims::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(SettleClaims::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getInHospital() != null) {
- queryWrapper.lambda().eq(SettleClaims::getInHospital, pageWrap.getModel().getInHospital());
+ queryWrapper.eq(SettleClaims::getInHospital, pageWrap.getModel().getInHospital());
}
if (pageWrap.getModel().getMedicalInsurance() != null) {
- queryWrapper.lambda().eq(SettleClaims::getMedicalInsurance, pageWrap.getModel().getMedicalInsurance());
+ queryWrapper.eq(SettleClaims::getMedicalInsurance, pageWrap.getModel().getMedicalInsurance());
}
if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(SettleClaims::getContent, pageWrap.getModel().getContent());
+ queryWrapper.eq(SettleClaims::getContent, pageWrap.getModel().getContent());
}
if (pageWrap.getModel().getInformantName() != null) {
- queryWrapper.lambda().eq(SettleClaims::getInformantName, pageWrap.getModel().getInformantName());
+ queryWrapper.eq(SettleClaims::getInformantName, pageWrap.getModel().getInformantName());
}
if (pageWrap.getModel().getInformantPhone() != null) {
- queryWrapper.lambda().eq(SettleClaims::getInformantPhone, pageWrap.getModel().getInformantPhone());
+ queryWrapper.eq(SettleClaims::getInformantPhone, pageWrap.getModel().getInformantPhone());
}
if (pageWrap.getModel().getAreaId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getAreaId, pageWrap.getModel().getAreaId());
+ queryWrapper.eq(SettleClaims::getAreaId, pageWrap.getModel().getAreaId());
}
if (pageWrap.getModel().getAreaInfo() != null) {
- queryWrapper.lambda().eq(SettleClaims::getAreaInfo, pageWrap.getModel().getAreaInfo());
+ queryWrapper.eq(SettleClaims::getAreaInfo, pageWrap.getModel().getAreaInfo());
}
if (pageWrap.getModel().getReportNum() != null) {
- queryWrapper.lambda().eq(SettleClaims::getReportNum, pageWrap.getModel().getReportNum());
+ queryWrapper.eq(SettleClaims::getReportNum, pageWrap.getModel().getReportNum());
}
if (pageWrap.getModel().getInsuranceApplyId() != null) {
- queryWrapper.lambda().eq(SettleClaims::getInsuranceApplyId, pageWrap.getModel().getInsuranceApplyId());
+ queryWrapper.eq(SettleClaims::getInsuranceApplyId, pageWrap.getModel().getInsuranceApplyId());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ queryWrapper.orderByDesc(SettleClaims::getCreateDate);
+ /*for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
} else {
queryWrapper.orderByAsc(sortData.getProperty());
}
- }
- return PageData.from(settleClaimsMapper.selectPage(page, queryWrapper));
+ }*/
+ PageData<SettleClaims> pageData = PageData.from(settleClaimsJoinMapper.selectJoinPage(page,SettleClaims.class, queryWrapper));
+ return pageData;
}
@Override
--
Gitblit v1.9.3