From 15e588eb6a7549ecd2aaffb45e67f11e68354eb6 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 05 二月 2024 18:22:19 +0800 Subject: [PATCH] 111 --- server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 82 +++++++++++++++++++++++++++++++++++------ 1 files changed, 70 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..5a501ce 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,6 +10,7 @@ import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; +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; @@ -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,12 @@ 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())); Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_RETURN; String info =applyLogType.getInfo(); @@ -138,6 +164,12 @@ update.setId(model.getId()); 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(); @@ -179,7 +211,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; @@ -222,6 +254,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 +381,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 +393,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(),"闄勪欢鍐呭寮傚父"); } @@ -365,6 +408,17 @@ } //璁板綍鏃ュ織 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(); } @@ -534,8 +588,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()); @@ -572,8 +627,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()); @@ -595,21 +651,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()); @@ -617,7 +671,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 +758,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 +781,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