From c29ce426a6ce314bc26a23cd92d226cc01825783 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 26 八月 2024 18:18:27 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 62 +++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java index 804ee30..b698dd5 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java @@ -31,6 +31,7 @@ import com.github.xiaoymin.knife4j.core.util.CollectionUtils; import com.github.yulichang.wrapper.MPJLambdaWrapper; import io.swagger.models.auth.In; +import javafx.application.Platform; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.xpath.operations.Bool; @@ -388,6 +389,52 @@ } + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public void createApproveForPlatfrom(Integer tempId,Integer businessId,Integer createMemberId){ + //鏌ヨ澶勭悊妯℃澘 + ApproveTempl approveTempl = approveTemplMapper.selectById(tempId); + if(Objects.isNull(approveTempl)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌瀹℃壒娴侀厤缃ā鏉�"); + } + //鏌ヨ閰嶇疆娴佺▼ + List<ApproveParam> approveParamAllList = approveParamMapper.selectList(new QueryWrapper<ApproveParam>() + .lambda().eq(ApproveParam::getIsdeleted,Constants.ZERO) + .eq(ApproveParam::getTemplId,approveTempl.getId()) + .orderByAsc(ApproveParam::getType) + .orderByAsc(ApproveParam::getLevel) + ); + if(Objects.isNull(approveParamAllList)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈厤缃鎵规祦绋�"); + } + //瀹℃壒閰嶇疆 + List<ApproveParam> approveParamList = approveParamAllList.stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList()); + if(Objects.isNull(approveParamList)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈厤缃鎵规祦绋�"); + } + List<ApproveParam> approveCopyList = approveParamAllList.stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList()); + + Member createMember = memberMapper.selectById(createMemberId); + if(Objects.isNull(createMember)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐢宠浜虹粍缁囦俊鎭紓甯�"); + } + List<Approve> approveList = new ArrayList<>(); + + this.organizeApproveData(approveTempl,approveParamList,createMember,businessId,approveList); + + if(CollectionUtils.isEmpty(approveList)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇�"); + } + + //澶勭悊鎶勯�佹暟鎹� + if(CollectionUtils.isNotEmpty(approveCopyList)){ + this.organizeApproveCopyData(approveTempl,approveCopyList,businessId,approveList); + } + approveJoinMapper.insert(approveList); + + } + + /** * 缁勭粐瀹℃壒娴佹暟鎹� * @param approveTempl @@ -555,8 +602,17 @@ jsonMap.put("eTime", "缁撴潫鏃堕棿:" + DateUtil.DateToStr(carUseBook.getEndTime() , "yyyy-MM-dd HH:mm")); jsonMap.put("usrNum", StringUtils.isBlank(carUseBook.getMemberIds())?"涔樿溅浜烘暟: 0浜�": "涔樿溅浜烘暟: " +carUseBook.getMemberIds().split(",").length +"浜�"); jsonMap.put("mdd", StringUtils.isBlank(carUseBook.getAddr())?"鐩殑鍦�: - ": "鐩殑鍦�:" +carUseBook.getAddr()); - }else { - throw new BusinessException(ResponseStatus.NOT_ALLOWED); + }else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.reason)){ + //鐗╂祦杞﹂绾� + PlatformBooks platformBooks = platformBooksMapper.selectById(businessId); + if(Objects.isNull(platformBooks)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁淇℃伅"); + } + title = "銆愮墿娴佽溅鍏ュ洯棰勭害銆戠敵璇蜂汉 - " + platformBooks.getDriverName(); + jsonMap.put("inType", "鍏ュ簱绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫")); + jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮"); + jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm")); + jsonMap.put("carNum", "杞︾墝鐓э細"+platformBooks.getCarCodeFront()); } return title; } @@ -1345,7 +1401,7 @@ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals( Constants.approveObjectType.unCityUseCar)){ this.updDriver(approveDTO,approve,true); - }else if(approveDTO.getObjType().equals(Constants.approveObjectType.logisticsCarUse)){ + }else if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){ //鐗╂祦杞﹂绾� PlatformBooks platformBooks = platformBooksMapper.selectById(approveDTO.getObjId()); if(Objects.isNull(platformBooks)){ -- Gitblit v1.9.3