From a28247ecb3751689b9aa64c2e3d32c646cd88e6d Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 22 一月 2024 18:19:34 +0800 Subject: [PATCH] 111 --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 370 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 349 insertions(+), 21 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java index 3860d1e..dc2857e 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java @@ -1,5 +1,7 @@ package com.doumee.service.business.impl; +import com.alibaba.fastjson.JSONObject; +import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.LoginUserInfo; @@ -11,6 +13,7 @@ import com.doumee.dao.business.*; import com.doumee.dao.business.dto.InsuranceApplyOptDTO; import com.doumee.dao.business.dto.InsuranceApplyQueryDTO; +import com.doumee.dao.business.join.ApplyDetailJoinMapper; import com.doumee.dao.business.join.ApplyLogJoinMapper; import com.doumee.dao.business.join.InsuranceApplyJoinMapper; import com.doumee.dao.business.model.*; @@ -45,13 +48,19 @@ private InsuranceApplyMapper insuranceApplyMapper; @Autowired + private SystemDictDataBiz systemDictDataBiz; + @Autowired private InsuranceApplyJoinMapper insuranceApplyJoinMapper; @Autowired private ApplyDetailMapper applyDetailMapper; + @Autowired + private ApplyDetailJoinMapper applyDetailJoinMapper; @Autowired private ApplyLogMapper applyLogMapper; + @Autowired + private MultifileMapper multifileMapper; @Autowired private ApplyLogJoinMapper applyLogJoinMapper; @@ -65,6 +74,227 @@ private DuSolutionMapper duSolutionMapper; @Autowired private DuWorktypeMapper duWorktypeMapper; + + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public Integer back(InsuranceApply insuranceApply) { + if(insuranceApply.getId() == null ||StringUtils.isBlank(insuranceApply.getCheckInfo())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId()); + + if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵"); + } + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + InsuranceApply update = new InsuranceApply(); + update.setEditDate(new Date()); + update.setEditor(user.getId()); + update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey()); + update.setCheckDate(update.getEditDate()); + update.setCheckInfo(insuranceApply.getCheckInfo()); + update.setCheckUserId(user.getId()); + update.setId(model.getId()); + insuranceApplyMapper.updateById(update); + + Constants.ApplyLogType applyLogType = Constants.ApplyLogType.PLATFORM_RETURN; + String info =applyLogType.getInfo(); + info = info.replace("${param}", update.getCheckInfo()); + ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update)); + applyLogMapper.insert(log); + return 1; + + } + + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public Integer uploadBaoxiandan(InsuranceApply insuranceApply) { + if(insuranceApply.getId() == null + || insuranceApply.getCode() == null + || insuranceApply.getStartTime() == null + || insuranceApply.getBaoxiandanFile() == null + ||StringUtils.isBlank( insuranceApply.getBaoxiandanFile() .getFileurl()) + ||StringUtils.isBlank( insuranceApply.getBaoxiandanFile() .getName())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + + InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId()); + if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.SIGNATURE.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵"); + } + if(insuranceApply.getApplyEndTime()== null || insuranceApply.getStartTime().getTime()>insuranceApply.getApplyEndTime().getTime() ){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风敓鏁堝懆鏈熸椂闂翠笉绗﹀悎瑕佹眰锛岃纭鍚庝慨鏀归噸璇晘"); + } + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + InsuranceApply update = new InsuranceApply(); + update.setEditDate(new Date()); + update.setEditor(user.getId()); + update.setStatus(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()); + update.setCheckDate(update.getEditDate()); + update.setCheckInfo(insuranceApply.getCheckInfo()); + update.setCheckUserId(user.getId()); + update.setId(model.getId()); + update.setCode(insuranceApply.getCode()); + update.setEndTime(model.getApplyEndTime()); + update.setStartTime(insuranceApply.getStartTime()); + insuranceApplyMapper.updateById(update); + + insuranceApply.getBaoxiandanFile().setIsdeleted(Constants.ZERO); + insuranceApply.getBaoxiandanFile().setCreator(user.getId()); + insuranceApply.getBaoxiandanFile().setCreateDate(update.getEditDate()); + insuranceApply.getBaoxiandanFile().setObjType(Constants.MultiFile.BD_DONE_PDF.getKey()); + insuranceApply.getBaoxiandanFile().setType(Constants.TWO); + multifileMapper.insert(insuranceApply.getBaoxiandanFile()); + update.setBaoxiandanFile(insuranceApply.getBaoxiandanFile()); + + Constants.ApplyLogType applyLogType = Constants.ApplyLogType.UPLOAD_INSURANCE; + String info = ""; + if(model.getApplyStartTime()!=null && model.getApplyStartTime().getTime()/1000!= insuranceApply.getStartTime().getTime()/1000){ + info =applyLogType.getInfo(); + info = info.replace("${param1}",DateUtil.getPlusTime2(model.getApplyEndTime())); + info = info.replace("${param2}",DateUtil.getPlusTime2(insuranceApply.getStartTime())); + } + ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update)); + applyLogMapper.insert(log); + return 1; + + } + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public Integer dealBackApply(InsuranceApply insuranceApply) { + if(insuranceApply.getId() == null ||StringUtils.isBlank(insuranceApply.getCheckInfo())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId()); + + if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + Constants.ApplyLogType applyLogType = null; + String info = ""; + if(insuranceApply.getDealBackApply() ==1){ + //濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炵敵璇风姸鎬佽繘琛屾搷浣� + if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN_SELECT.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵"); + } + applyLogType = Constants.ApplyLogType.PLATFORM_UN_AGREE_BACK; + info = applyLogType.getInfo(); + info = info.replace("${param}", insuranceApply.getCheckInfo()); + }else{ + //濡傛灉鏄悓鎰�,涓ょ鐢宠閫�鍥炵姸鎬侀兘鍙搷浣� + if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN_SELECT.getKey()) + ||Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN.getKey()))){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵"); + } + applyLogType = Constants.ApplyLogType.PLATFORM_AGREE_BACK; + } + InsuranceApply update = new InsuranceApply(); + update.setEditDate(new Date()); + update.setEditor(user.getId()); + //鍚屾剰閫�鍥烇紝鐩存帴鍥炲埌鏈�鍒濈姸鎬侊紝濡傛灉椹冲洖閫�鍥炵敵璇凤紝鍒欎繚鍗曠姸鎬佸洖鍒板緟涓婁紶淇濋櫓鍗� + update.setStatus(insuranceApply.getDealBackApply() ==0?Constants.InsuranceApplyStatus.UPLOAD.getKey():Constants.InsuranceApplyStatus.SIGNATURE.getKey()); + update.setCheckDate(update.getEditDate()); + update.setCheckInfo(insuranceApply.getCheckInfo()); + update.setCheckUserId(user.getId()); + update.setId(model.getId()); + insuranceApplyMapper.updateById(update); + + ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update)); + applyLogMapper.insert(log); + return 1; + + + } + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public Integer uploadToubaodan(InsuranceApply insuranceApply) { + if(insuranceApply.getId() == null + || insuranceApply.getToubaodanFile() == null + ||StringUtils.isBlank( insuranceApply.getToubaodanFile() .getFileurl()) + ||StringUtils.isBlank( insuranceApply.getToubaodanFile() .getName())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId()); + if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey()) + || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()))){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵"); + } + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + InsuranceApply update = new InsuranceApply(); + update.setEditDate(new Date()); + update.setEditor(user.getId()); + update.setStatus(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey()); + update.setCheckDate(update.getEditDate()); + update.setCheckInfo(insuranceApply.getCheckInfo()); + update.setCheckUserId(user.getId()); + update.setId(model.getId()); + insuranceApplyMapper.updateById(update); + + insuranceApply.getToubaodanFile().setIsdeleted(Constants.ZERO); + insuranceApply.getToubaodanFile().setCreator(user.getId()); + insuranceApply.getToubaodanFile().setCreateDate(update.getEditDate()); + insuranceApply.getToubaodanFile().setObjType(Constants.MultiFile.BD_APPLY_PDF.getKey()); + insuranceApply.getToubaodanFile().setType(Constants.TWO); + multifileMapper.insert(insuranceApply.getToubaodanFile()); + update.setToubaodanFile(insuranceApply.getToubaodanFile()); + + Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WAIT_SIGNATURE; + String info =applyLogType.getInfo(); + info = info.replace("${param}", update.getCheckInfo()); + ApplyLog log = new ApplyLog(update,applyLogType.getName(),StringUtils.isNotBlank(update.getCheckInfo())?info:"",update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update)); + applyLogMapper.insert(log); + return 1; + + } + + /** + * 瀹℃牳閫氳繃 + * @param insuranceApply + * @return + */ + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public Integer check(InsuranceApply insuranceApply) { + if(insuranceApply.getId() == null ||StringUtils.isBlank(insuranceApply.getCheckInfo())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId()); + + if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵"); + } + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + InsuranceApply update = new InsuranceApply(); + update.setEditDate(new Date()); + update.setEditor(user.getId()); + update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()); + update.setCheckDate(update.getEditDate()); + update.setCheckInfo(insuranceApply.getCheckInfo()); + update.setCheckUserId(user.getId()); + update.setId(model.getId()); + insuranceApplyMapper.updateById(update); + + Constants.ApplyLogType applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS; + ApplyLog log = new ApplyLog(update,applyLogType.getName(),null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update)); + applyLogMapper.insert(log); + return 1; + + } + @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) @@ -143,7 +373,7 @@ } applyDetail.setIdcardNo(member.getIdcardNo()); applyDetail.setSex(member.getSex()); - applyDetail.setFee(this.countDetailFee(solutions,insuranceApply.getApplyEndTime(),insuranceApply.getApplyStartTime())); + applyDetail.setFee(Constants.countDetailFee(solutions,insuranceApply.getApplyEndTime(),insuranceApply.getApplyStartTime())); //楠岃瘉娲鹃仯鍗曚綅淇℃伅鏄惁瀛樺湪 if(duSolutionList.stream().filter(d->d.getDispatchUnitId().equals(applyDetail.getDuId())).collect(Collectors.toList()).size()<=Constants.ZERO){ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ユ淳閬e崟浣嶆湭鏌ヨ鍒帮紒"); @@ -169,21 +399,21 @@ applyLog.setTitle(insuranceApplyStatus.getName()); applyLog.setContent(content); applyLog.setObjType(insuranceApplyStatus.getKey()); - applyLog.setObjId(Integer.toString(insuranceApply.getId())); + applyLog.setObjId( insuranceApply.getId()); applyLog.setStatus(insuranceApply.getStatus()); applyLogMapper.insert(applyLog); } - public BigDecimal countDetailFee(Solutions solutions ,Date startDate,Date endDate){ - //鏌ヨ淇濋櫓瀹為檯鍛ㄦ湡 - Integer cycle = DateUtil.calculateBetween(endDate,startDate,solutions.getDataType()); - if(cycle==-1){ - throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃ユ湡淇℃伅閿欒!"); - } - return solutions.getPrice().multiply(new BigDecimal(cycle)); - } +// public BigDecimal countDetailFee(Solutions solutions ,Date startDate,Date endDate){ +// //鏌ヨ淇濋櫓瀹為檯鍛ㄦ湡 +// Integer cycle = DateUtil.calculateBetween(endDate,startDate,solutions.getDataType()); +// if(cycle==-1){ +// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃ユ湡淇℃伅閿欒!"); +// } +// return solutions.getPrice().multiply(new BigDecimal(cycle)); +// } // public static void main(String[] args) { // Date date1 = DateUtil.StringToDate("2023-03-01 00:00:00"); @@ -312,12 +542,38 @@ @Override public InsuranceApply findDetail(Integer id) { - InsuranceApply insuranceApply = insuranceApplyMapper.selectById(id); + + MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>() + .selectAll(InsuranceApply.class) + .selectAs(Solutions::getName,InsuranceApply::getSolutionsName) + .selectAs(Company::getName,ApplyLog::getCompanyName) + .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) + .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId) + .eq(InsuranceApply::getId,id) + .last("limit 1"); + + InsuranceApply insuranceApply = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,wrapper); if(Objects.isNull(insuranceApply)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } insuranceApply.setInsureNum(applyDetailMapper.selectCount(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId()) .eq(ApplyDetail::getIsdeleted,Constants.ZERO))); + + //璁剧疆鍦ㄤ繚鏃堕暱锛堝ぉ鏁帮級 + if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){ + //濡傛灉褰撳墠鏃堕棿澶т簬缁撴潫鏃ユ湡 鍒欎娇鐢ㄧ粨鏉熸棩鏈熷姣斿紑濮嬫棩鏈� + if(DateUtil.compareDate(new Date(),insuranceApply.getEndTime())>=Constants.ZERO){ + insuranceApply.setServiceDays(DateUtil.daysBetweenDates(insuranceApply.getEndTime(),insuranceApply.getStartTime())); + }else if(DateUtil.compareDate(insuranceApply.getStartTime(),new Date())>=Constants.ZERO){ + //鏈紑濮� + insuranceApply.setServiceDays(Constants.ZERO); + }else{ + insuranceApply.setServiceDays(DateUtil.daysBetweenDates(new Date(),insuranceApply.getStartTime())); + } + } + + //鏌ヨ闄勪欢鏁版嵁 + initImgData(insuranceApply); //鏌ヨ鎿嶄綔璁板綍 List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class, @@ -333,11 +589,71 @@ insuranceApply.setApplyLogList(applyLogList); return insuranceApply; } + private void initImgData(InsuranceApply model) { + List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda() + .eq(Multifile::getObjId,model.getId()) + .in(Multifile::getObjType,Arrays.asList(new Integer[]{Constants.MultiFile.BD_APPLY_PDF.getKey() + ,Constants.MultiFile.BD_SIGNED_PDF.getKey() + ,Constants.MultiFile.BD_DONE_PDF.getKey()})) + .eq(Multifile::getIsdeleted,Constants.ZERO)); + if(multifiles!=null){ + String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() + +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode(); + for(Multifile f : multifiles){ + if(StringUtils.isBlank(f.getFileurl())){ + continue; + } + f.setFileurlFull(path+f.getFileurl()); + if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.BD_APPLY_PDF.getKey())){ + //绛剧讲鍓嶇殑鎶曚繚鍗� + model.setBaoxiandanFile(f); + }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.BD_SIGNED_PDF.getKey())){ + //绛剧讲鍚庣殑鎶曚繚鍗� + model.setToubaodanSignedFile(f); + }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.BD_DONE_PDF.getKey())){ + //鏈�绲備繚闄╁崟 + model.setBaoxiandanFile(f); + } + } + } + } + @Override + public InsuranceApply findDetailForExport(InsuranceApply model){ + MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>() + .selectAll(InsuranceApply.class) + .selectAs(Solutions::getName,InsuranceApply::getSolutionsName) + .selectAs(Company::getName,ApplyLog::getCompanyName) + .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) + .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId) + .eq(InsuranceApply::getId,model.getId()) + .last("limit 1"); + + InsuranceApply insuranceApply = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,wrapper); + if(Objects.isNull(insuranceApply)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + + MPJLambdaWrapper wrapper1= new MPJLambdaWrapper<ApplyDetail>() + .selectAll(ApplyDetail.class) + .selectAs(Worktype::getName,ApplyDetail::getWorkTypeName) + .selectAs(DispatchUnit::getName,ApplyDetail::getDuName) + .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId) + .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId) + .eq(InsuranceApply::getId,model.getId()); + //鏌ヨ鏄庣粏 + List<ApplyDetail> detailList =applyDetailJoinMapper.selectJoinList(ApplyDetail.class,wrapper1); + if(detailList!=null){ + insuranceApply.setInsureNum(detailList.size()); + insuranceApply.setApplyDetailList(detailList); + } + insuranceApply.setRemark(model.getRemark()); + return insuranceApply; + } @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) - public void applyReturn(InsuranceApplyOptDTO insuranceApplyOptDTO){ + public void applyOpt(InsuranceApplyOptDTO insuranceApplyOptDTO){ if(Objects.isNull(insuranceApplyOptDTO) ||Objects.isNull(insuranceApplyOptDTO.getApplyId()) ||StringUtils.isBlank(insuranceApplyOptDTO.getOptIllustration())){ @@ -354,15 +670,27 @@ if(insuranceApply.getIsdeleted().equals(Constants.ONE)){ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�"); } - if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN.getKey())){ - throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"閫�鍥炵敵璇蜂腑锛岃鍕块噸澶嶆搷浣�"); + Constants.InsuranceApplyStatus insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN; + if(insuranceApplyOptDTO.getOptType().equals(Constants.ONE)){ + if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN.getKey())){ + throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"閫�鍥炵敵璇蜂腑锛岃鍕块噸澶嶆搷浣�"); + } + if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey()) + ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey()) + ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!"); + } + }else if(insuranceApplyOptDTO.getOptType().equals(Constants.TWO)){ + insuranceApplyStatus = Constants.InsuranceApplyStatus.CLOSE; + if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.CLOSE.getKey())){ + throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"宸插叧闂紝璇峰嬁閲嶅鎿嶄綔"); + } + if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey()) + ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()) + ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()))){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!"); + } } - if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey()) - ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey()) - ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!"); - } - Constants.InsuranceApplyStatus insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN; insuranceApply.setStatus(insuranceApplyStatus.getKey()); insuranceApply.setCheckDate(new Date()); insuranceApply.setCheckInfo(insuranceApplyOptDTO.getOptIllustration()); @@ -370,8 +698,8 @@ insuranceApplyMapper.updateById(insuranceApply); //瀛樺偍鏃ュ織鏁版嵁 this.saveApplyLog(insuranceApply,insuranceApplyStatus,null); - } + } -- Gitblit v1.9.3