From 6be28040e74e1ff7764478174a9b5d706fe4fc39 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 31 五月 2024 11:40:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 312 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 276 insertions(+), 36 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 b1a219e..43286ff 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 @@ -1,18 +1,24 @@ 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.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; +import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; import com.doumee.dao.business.*; import com.doumee.dao.business.dao.CompanyMapper; import com.doumee.dao.business.dto.ApproveDTO; import com.doumee.dao.business.join.ApproveJoinMapper; +import com.doumee.dao.business.join.CarUseBookJoinMapper; +import com.doumee.dao.business.join.VisitsJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.business.vo.ApproveDataVO; +import com.doumee.dao.system.join.NoticesJoinMapper; +import com.doumee.dao.system.model.Notices; import com.doumee.dao.system.model.SystemUser; import com.doumee.dao.web.response.InternalHomeVO; import com.doumee.service.business.ApproveService; @@ -23,6 +29,7 @@ import com.doumee.service.system.NoticesService; import com.github.xiaoymin.knife4j.core.util.CollectionUtils; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; import org.apache.xpath.operations.Bool; import org.springframework.beans.factory.annotation.Autowired; @@ -69,6 +76,16 @@ @Autowired private VisitsMapper visitsMapper; + + @Autowired + private VisitsJoinMapper visitsJoinMapper; + + @Autowired + private CarUseBookJoinMapper carUseBookJoinMapper; + @Autowired + private NoticesJoinMapper noticesJoinMapper; + + @Override public Integer create(Approve approve) { @@ -295,11 +312,33 @@ for (int i = 0; i < approveParamList.size(); i++) { ApproveParam approveParam = approveParamList.get(i); List<Integer> ids = this.getApproveUserIds(approveParam,createMember); - //鐢熸垚寰呭姙 notices 琛ㄦ暟鎹� - if(i==0){ - - } - for (Integer memberId:ids) { + Integer noticeType = Constants.approveTypeToNoticeType(approveTempl.getType()); + String title = "銆愯瀹㈢敵璇枫�戠敵璇蜂汉 - "; + Map<String,Object> jsonMap = new HashMap<>(); + for (int j = 0; j < ids.size(); j++) { + Integer memberId = ids.get(j); + //鐢熸垚寰呭姙 notices 琛ㄦ暟鎹� + if(i==0){ + if(jsonMap.isEmpty()){ + title = this.createNoticesData(noticeType,businessId,title,jsonMap); + } + Notices notices = new Notices(); + notices.setCreateDate(new Date()); + notices.setIsdeleted(Constants.ZERO); + notices.setObjId(businessId); + notices.setObjType(noticeType); + notices.setType(noticeType); + notices.setTitle(title); + notices.setParam1(JSONObject.toJSONString(jsonMap)); + notices.setUserId(memberId); + notices.setPalt(Constants.ZERO); + notices.setStatus(Constants.ZERO); + notices.setReaded(Constants.ZERO); + notices.setSendacopy(Constants.ZERO); + notices.setParam2("0"); + notices.setInfo("寰呭鐞�"); + noticesJoinMapper.insert(notices); + } Approve approve = new Approve(); approve.setRemark(approveParam.getRemark()); approve.setCreateDate(new Date()); @@ -319,6 +358,61 @@ approveList.add(approve); } } + } + + + + public String createNoticesData(Integer noticeType,Integer businessId,String title,Map<String,Object> jsonMap){ + jsonMap.clear(); + if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit) + || Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)){ + //璁垮璁板綍涓庤瀹㈡姤澶� + Visits visits = visitsJoinMapper.selectJoinOne(Visits.class, + new MPJLambdaWrapper<Visits>().selectAll(Visits.class) + .selectAs(Member::getName,Visits::getReceptMemberName) + .selectAs(Company::getName,Visits::getReceptMemberDepartment) + .leftJoin(Member.class,Member::getId,Visits::getReceptMemberId) + .leftJoin(Company.class,Company::getId,Member::getCompanyId) + .eq(Visits::getId,businessId) + .last(" limit 1 ") + ); + if(Objects.isNull(visits)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁淇℃伅"); + } + if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)){ + title = title + visits.getName(); + }else{ + title = "銆愯瀹㈡姤澶囥�戠敵璇蜂汉 - " + visits.getName(); + } + jsonMap.put("name", "璁块棶浜�:" + visits.getCompanyName() + " - " + visits.getReceptMemberName()); + jsonMap.put("sTime", "鍏ュ洯鏃堕棿:" + DateUtil.DateToStr(visits.getStarttime() , "yyyy-MM-dd HH:mm")); + jsonMap.put("eTime", "绂诲洯鏃堕棿:" + DateUtil.DateToStr(visits.getEndtime() , "yyyy-MM-dd HH:mm")); + jsonMap.put("reason", StringUtils.isBlank(visits.getReason())?"鏉ヨ浜嬬敱: - ": "鏉ヨ浜嬬敱:" +visits.getReason()); + jsonMap.put("carNos", StringUtils.isBlank(visits.getCarNos())?"闅忚杞﹁締: - ": "闅忚杞﹁締:" +visits.getCarNos()); + }else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.useCar)){ + //鐢ㄨ溅鐢宠 + CarUseBook carUseBook = carUseBookJoinMapper.selectJoinOne(CarUseBook.class, + new MPJLambdaWrapper<CarUseBook>().selectAll(CarUseBook.class) + .selectAs(Member::getName,CarUseBook::getMemberName) + .selectAs(Company::getName,CarUseBook::getCompanyName) + .leftJoin(Member.class,Member::getId,CarUseBook::getMemberId) + .leftJoin(Company.class,Company::getId,Member::getCompanyId) + .eq(CarUseBook::getId,businessId) + .last(" limit 1 ") + ); + if(Objects.isNull(carUseBook)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁淇℃伅"); + } + title = "銆愮敤杞︾敵璇枫�戠敵璇蜂汉 - " + carUseBook.getMemberName(); + jsonMap.put("name", "鐢宠浜�:" + carUseBook.getCompanyName() + " - " + carUseBook.getMemberName()); + jsonMap.put("sTime", "寮�濮嬫椂闂�:" + DateUtil.DateToStr(carUseBook.getStartTime() , "yyyy-MM-dd HH:mm")); + 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); + } + return title; } @@ -441,13 +535,20 @@ return auditCompany; } - public ApproveDataVO arrangeApprovedDataNew(Integer businessId, Integer businessType, Integer memberId){ + @Override + public ApproveDataVO arrangeApprovedData(Integer businessId, Integer businessType, Integer memberId){ ApproveDataVO approveDateVO = new ApproveDataVO(); approveDateVO.setApproveList(new ArrayList<>()); approveDateVO.setCanBeApproved(Constants.ZERO); List<Approve> approveGroupList = approveJoinMapper.selectJoinList(Approve.class, new MPJLambdaWrapper<Approve>(). selectAll(Approve.class) + .selectAs(Member::getName,Approve::getMemberName) + .selectAs(Member::getPhone,Approve::getMemberPhone) + .selectAs(Member::getFaceImg,Approve::getFaceImg) + .selectAs(Company::getCompanyNamePath,Approve::getCompanyName) + .leftJoin(Member.class,Member::getId,Approve::getChekorId) + .leftJoin(Company.class,Company::getId,Member::getCompanyId) .eq(Approve::getIsdeleted,Constants.ZERO) .eq(Approve::getObjId,businessId) .eq(Approve::getObjType,businessType) @@ -455,7 +556,8 @@ ); //鏌ユ壘鍏ㄩ儴levelList - List<Approve> levelList = getLevelListFromResult(approveGroupList); + List<Approve> levelList = getLevelListFromResult(approveGroupList,approveDateVO,memberId); + List<Approve> copyList = getAllCopyList(approveGroupList); //閬嶅巻level鏌ヨ姣忎竴绾у埆涓氬姟鏁版嵁 for(Approve level:levelList){ List<Approve> tlist = getLevelInfoFromList(level,approveGroupList); @@ -466,7 +568,27 @@ break; } } + + //澶勭悊鎶勯�佽褰� + if (CollectionUtils.isNotEmpty(copyList)) { + Approve waitModel = new Approve(); + waitModel.setApproveType(Constants.ONE); + waitModel.setStatusInfo("鎶勯��"); + waitModel.setStatus(Constants.ONE); + waitModel.setType(Constants.ONE); + waitModel.setApproveList(copyList); + approveDateVO.getApproveList().add(waitModel); + } + return approveDateVO; + } + + private List<Approve> getAllCopyList(List<Approve> approveGroupList) { + List<Approve> copyList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(approveGroupList)) { + copyList.addAll(approveGroupList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).collect(Collectors.toList())); + } + return copyList; } private List<Approve> getLevelInfoFromList(Approve level,List<Approve> approveGroupList) { @@ -481,8 +603,9 @@ Approve refuseModel = new Approve();//宸叉嫆缁濈殑璁板綍 List<Approve> waitList = new ArrayList<>(); //鏌ヨ鍏ㄩ儴鏈鐞嗙殑闆嗗悎 List<Approve> otherPassList = new ArrayList<>();//浠栦汉宸插鐞嗙殑璁板綍闆� - dealGroupListBiz(level,passList,refuseModel,waitList,otherPassList); - if(refuseModel !=null){ + List<Approve> levelApprove = approveGroupList.stream().filter(i->Constants.equalsInteger(i.getLevel(),level.getLevel())).collect(Collectors.toList()); + dealGroupListBiz(level,levelApprove,approveGroupList,passList,refuseModel,waitList,otherPassList); + if(Objects.nonNull(refuseModel) && Objects.nonNull(refuseModel.getId())){ //瀛樺湪鎷掔粷鐨勶紝鍙渶瑕佽繑鍥炰竴鏉″鐞嗘暟鎹紝鍚庣画涓嶉渶瑕佸洖鏄� list.add(refuseModel); return list; @@ -494,20 +617,34 @@ Approve waitModel = new Approve(); waitModel.setApproveType(Constants.ONE); waitModel.setStatusInfo(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�")+"澶勭悊涓�"); - waitModel.setStatus(Constants.ONE); + waitModel.setStatus(Constants.equalsInteger(waitList.get(Constants.ZERO).getStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO); waitModel.setApproveList(waitList); list.add(waitModel); } }else { - //濡傛灉鏄垨绛� - if(otherPassList.size()>0){ + if((waitList.size()> 0 || otherPassList.size()>0)){ Approve waitModel = new Approve(); waitModel.setApproveType(Constants.ONE); - waitModel.setStatusInfo(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�")+"锛堟妱閫佹垨绛惧鎵逛汉锛�"); - waitModel.setStatus(Constants.ONE); - waitModel.setApproveList(otherPassList); + waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉"); + waitModel.setStatus(passList.size()>0?Constants.ONE:Constants.ZERO); + List<Approve> approveList = new ArrayList<>(); + approveList.addAll(waitList); + //濡傛灉鏄垨绛� + if(passList.size()>0){ + approveList.addAll(otherPassList); + } + waitModel.setApproveList(approveList); list.add(waitModel); } + //濡傛灉鏄垨绛� +// if(otherPassList.size()>0){ +// Approve waitModel = new Approve(); +// waitModel.setApproveType(Constants.ONE); +// waitModel.setStatusInfo(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�")+"锛堟妱閫佹垨绛惧鎵逛汉锛�"); +// waitModel.setStatus(Constants.ONE); +// waitModel.setApproveList(otherPassList); +// list.add(waitModel); +// } } @@ -515,22 +652,65 @@ } - private void dealGroupListBiz(Approve level, List<Approve> passList, Approve refuseModel, List<Approve> waitList, List<Approve> otherPassList) { - - //TODO----------rk + private void dealGroupListBiz(Approve level, List<Approve> levelApprove,List<Approve> approveGroupList, List<Approve> passList, Approve refuseModel, List<Approve> waitList, List<Approve> otherPassList) { + //鏌ヨ鏄惁瀛樺湪鎷掔粷鏁版嵁 + for (Approve approve:levelApprove) { + if(Constants.equalsInteger(Constants.approveStatus.pass,approve.getStatus())){ + passList.add(approve); + }else if(Constants.equalsInteger(Constants.approveStatus.otherDeal,approve.getStatus())){ + otherPassList.add(approve); + }else if(Constants.equalsInteger(Constants.approveStatus.auditIng,approve.getStatus())||Constants.equalsInteger(Constants.approveStatus.wait,approve.getStatus())){ + waitList.add(approve); + }else if(Constants.equalsInteger(Constants.approveStatus.unPass,approve.getStatus())){ + refuseModel = approve; + } + } } private List<Approve> sortByCreateTime(List<Approve> passList) { - //TODO----------rk - + Collections.sort(passList, (a, b) -> a.getCheckDate().compareTo(b.getCheckDate())); return passList; } - private List<Approve> getLevelListFromResult(List<Approve> approveGroupList) { - //TODO----------rk - return null; + private List<Approve> getLevelListFromResult(List<Approve> approveGroupList,ApproveDataVO approveDataVO,Integer memberId) { + approveDataVO.setCanBeApproved(Constants.ZERO); + approveDataVO.setDriverParam(Constants.ZERO); + List<Approve> approveList = new ArrayList<>(); + String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); + for (Approve approve:approveGroupList) { + if(StringUtils.isNotBlank(approve.getFaceImg())){ + approve.setFaceImg(path + approve.getFaceImg()); + } + if(Constants.equalsInteger(approve.getType(),Constants.ONE)){ + continue; + } + if(Constants.equalsInteger(approve.getChekorId(),memberId)){ + approveDataVO.setCanBeApproved(Constants.ONE); + approveDataVO.setDriverParam(approve.getDriverParam()); + } + if(notExsits(approveList,approve.getLevel())){ + approveList.add(approve); + } + } + + if(CollectionUtils.isEmpty(approveList)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒淇℃伅锛氱骇鍒暟鎹紓甯�"); + } + + return approveList; } + + private boolean notExsits(List<Approve> approveList, Integer level) { + for (Approve approve:approveList) { + if(Constants.equalsInteger(approve.getLevel(),level)){ + return false; + } + } + return true; + } + /** * 鏁寸悊 瀹℃壒鏁版嵁 @@ -538,18 +718,18 @@ * @param businessType * @return */ - @Override - public ApproveDataVO arrangeApprovedData(Integer businessId, Integer businessType, Integer memberId){ +// @Override + public ApproveDataVO arrangeApprovedDataOld(Integer businessId, Integer businessType, Integer memberId){ ApproveDataVO approveDateVO = new ApproveDataVO(); approveDateVO.setCanBeApproved(Constants.ZERO); List<Approve> approveGroupList = approveJoinMapper.selectJoinList(Approve.class, new MPJLambdaWrapper<Approve>(). - select(Approve::getLevel,Approve::getType) + select(Approve::getLevel,Approve::getType,Approve::getTitle,Approve::getApproveType) .eq(Approve::getIsdeleted,Constants.ZERO) .eq(Approve::getObjId,businessId) .isNotNull(Approve::getLevel) .eq(Approve::getObjType,businessType) - .groupBy(Approve::getLevel,Approve::getType) + .groupBy(Approve::getLevel,Approve::getType,Approve::getTitle,Approve::getApproveType) ); if(CollectionUtils.isEmpty(approveGroupList)){ return approveDateVO; @@ -673,6 +853,7 @@ approve.setCheckInfo(approveDTO.getCheckInfo()); approve.setCheorId(approveDTO.getLoginUserInfo().getMemberId().toString()); approve.setCheckorName(approve.getLoginUserInfo().getRealname()); + approve.setCheckDate(new Date()); approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"瀹℃壒閫氳繃":approveDTO.getCheckInfo()); Visits visits = new Visits(); CarUseBook carUseBook = new CarUseBook(); @@ -704,16 +885,18 @@ .ne(Approve::getId,approve.getId())); }else{ //澶勭悊鍏朵粬涓氬姟鏁版嵁 - if(approve.getApproveType().equals(Constants.ZERO)&&approve.getIsEndCheck()==Constants.ONE){ - //鎴栫 涓� 缁堝 + if((approve.getApproveType().equals(Constants.ZERO) + || approve.getApproveType().equals(Constants.TWO)) &&approve.getIsEndCheck()==Constants.ONE){ + //鎴栫 / 鍗曚汉瀹� 涓� 缁堝 approveJoinMapper.update(null,new UpdateWrapper<Approve>() .lambda() .set(Approve::getStatus,Constants.approveStatus.otherDeal) .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList()))); dealBusinessBean = true; - }else if(approve.getApproveType().equals(Constants.ZERO)&&approve.getIsEndCheck()!=Constants.ONE){ - //鎴栫 闈炵粓瀹� 鍒欏紑鍚笅涓�姝ヤ笟鍔℃祦绋� + }else if((approve.getApproveType().equals(Constants.ZERO) + || approve.getApproveType().equals(Constants.TWO)) &&approve.getIsEndCheck()!=Constants.ONE){ + //鎴栫 / 鍗曚汉瀹� 闈炵粓瀹� 鍒欏紑鍚笅涓�姝ヤ笟鍔℃祦绋� /**澶勭悊鏈骇鏁版嵁**/ approveJoinMapper.update(null,new UpdateWrapper<Approve>() .lambda() @@ -728,7 +911,7 @@ .eq(Approve::getObjType,approve.getObjType()) .eq(Approve::getLevel,(approve.getLevel()+1)) ); - + //TODO 鏇存柊娑堟伅鏁版嵁 鍙戦�佷笅涓�绾ф暟鎹秷鎭� }else if(approve.getApproveType().equals(Constants.ONE)&&approve.getIsEndCheck()==Constants.ONE){ //浼氱 涓旂粓瀹� if(approveList.size()==Constants.ZERO){ @@ -749,8 +932,6 @@ //TODO 瀹℃壒鏈�氳繃閫氱煡 } - - }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals( Constants.approveObjectType.unCityUseCar)){ // 甯傚唴澶栫敤杞︾敵璇� @@ -762,14 +943,73 @@ //TODO 瀹℃壒鏈�氳繃閫氱煡 } - - }else if(approveDTO.getObjType().equals(Constants.approveObjectType.logisticsCarUse)){ //TODO 鐗╂祦杞﹂绾� } } + public void passNextNotices(Boolean dealBusinessBean,Approve approve){ + //鏍规嵁瀹℃壒璁板綍鏌ヨ 閫氱煡璁板綍 + Integer noticeType = Constants.approveTypeToNoticeType(approve.getObjType()); + Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda() + .eq(Notices::getObjId,approve.getObjId()) + .eq(Notices::getObjType,noticeType) + .eq(Notices::getUserId,approve.getChekorId()) + .eq(Notices::getSendacopy,Constants.ZERO) + .eq(Notices::getIsdeleted,Constants.ZERO) + ); + if(Objects.isNull(notices)){ + return; + } + + + if(Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)){ + //鎴栫 + //1銆佷慨鏀硅嚜宸辩殑鏁版嵁璁板綍 + + //2銆佹洿鏂颁粬浜虹殑鍚岀骇璁板綍 涓烘妱閫� + + //3銆佸鏋滀笉鏄粓瀹$敓鎴愪笅涓�绾х殑鏁版嵁璁板綍 + + + }else if(Constants.equalsInteger(approve.getApproveType(),Constants.ONE)){ + //浼氱 + //1銆佷慨鏀硅嚜宸辩殑鏁版嵁璁板綍 + + //2銆佹牴鎹槸鍚︿负鏈�鍚庝竴浣嶅鎵逛汉 濡傛灉涓嶆槸 鍒欑粨鏉� + + //3銆� 濡傛灉鏄渶鍚庝竴浣嶅鎵逛汉 涓斾笉鏄粓瀹″紑鍚笅涓�绾ф暟鎹� + + }else{ + //鍗曚汉绛� + //1銆佷慨鏀硅嚜宸辩殑鏁版嵁璁板綍 + + //2銆� 鏄惁鏄粓瀹� 寮�鍚笅涓�绾ф暟鎹� + + + } + //涓氬姟閫氳繃 淇敼瀹℃壒瀵瑰簲娑堟伅璁板綍 + if(Constants.equalsInteger(approve.getStatus(),Constants.approveStatus.pass)){ + + } + // + + //缁堝涓氬姟 鍙戦�佹妱閫� + if (Constants.equalsInteger(approve.getIsEndCheck(),Constants.ONE)) { + + + + } + + + + + + + + } + public void dealBusinessData(ApproveDTO approveDTO,Approve approve,Visits visits,CarUseBook carUseBook){ if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit) ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit) -- Gitblit v1.9.3