From 2e8224782416e546a832aa8cff789bdc7505afa0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 一月 2024 19:24:53 +0800
Subject: [PATCH] 开发业务接口
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 188 +++++++++++++++++++++++++++++++---------------
1 files changed, 127 insertions(+), 61 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 c6d87a5..2a1ba34 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
@@ -17,6 +17,7 @@
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;
@@ -114,8 +115,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);
}
@@ -141,7 +141,7 @@
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;
@@ -162,17 +162,17 @@
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if((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(),"瀵逛笉璧凤紝璇ョ敵璇峰綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
-
+*/
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SettleClaims update = new SettleClaims();
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);
@@ -277,7 +277,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);
}
@@ -285,10 +285,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());
@@ -298,11 +298,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;
@@ -419,25 +421,55 @@
}
}
-
-
@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 ")
- );
-
+ .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 = multifileMapper.selectList(new QueryWrapper<Multifile>()
.lambda().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 = multifileMapper.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()));
@@ -450,17 +482,17 @@
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)
);
@@ -640,6 +672,7 @@
@Override
public SettleClaims findById(Integer id) {
+
return settleClaimsMapper.selectById(id);
}
@@ -658,109 +691,142 @@
@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(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().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());
+ 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.orderByAsc(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