From 2edfe17a39cb5aa653318cad9474d18fbdaa204e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 30 五月 2024 18:23:47 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 250 insertions(+), 7 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 da0ec66..ad7ed25 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
@@ -13,6 +13,8 @@
import com.doumee.dao.business.join.ApproveJoinMapper;
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;
@@ -20,8 +22,10 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -68,6 +72,9 @@
@Autowired
private VisitsMapper visitsMapper;
+
+ @Autowired
+ private NoticesJoinMapper noticesJoinMapper;
@Override
public Integer create(Approve approve) {
@@ -294,8 +301,13 @@
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) {
Approve approve = new Approve();
+ approve.setRemark(approveParam.getRemark());
approve.setCreateDate(new Date());
approve.setIsdeleted(Constants.ZERO);
approve.setTemplatId(approveTempl.getId());
@@ -313,6 +325,31 @@
approveList.add(approve);
}
}
+ }
+
+ public void createNoticesData(List<Approve> approveList){
+ for (Approve approve:approveList) {
+ Notices notices = new Notices();
+ notices.setCreateDate(new Date());
+ notices.setIsdeleted(Constants.ZERO);
+ notices.setObjId(approve.getObjId());
+ notices.setObjId(approve.getApproveType());
+ if(Constants.equalsInteger(approve.getType(),Constants.approveObjectType.unConstructionVisit)
+ || Constants.equalsInteger(approve.getType(),Constants.approveObjectType.constructionVisit)){
+ notices.setType(Constants.ZERO);
+ }else if(Constants.equalsInteger(approve.getType(),Constants.approveObjectType.visitReporting)){
+ notices.setType(Constants.ONE);
+ }
+
+
+
+ }
+
+
+
+
+
+
}
@@ -435,6 +472,182 @@
return auditCompany;
}
+ @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)
+ .orderByAsc(Approve::getLevel)
+ );
+
+ //鏌ユ壘鍏ㄩ儴levelList
+ List<Approve> levelList = getLevelListFromResult(approveGroupList,approveDateVO,memberId);
+ List<Approve> copyList = getAllCopyList(approveGroupList);
+ //閬嶅巻level鏌ヨ姣忎竴绾у埆涓氬姟鏁版嵁
+ for(Approve level:levelList){
+ List<Approve> tlist = getLevelInfoFromList(level,approveGroupList);
+ approveDateVO.getApproveList().addAll(tlist);
+ if(tlist.size() ==0
+ ||Constants.equalsInteger(Constants.approveStatus.unPass, tlist.get(0).getStatus())
+ ||Constants.equalsInteger(Constants.approveStatus.cancel, tlist.get(0).getStatus())){
+ 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) {
+ List<Approve> list = new ArrayList<>();
+ if(Constants.equalsInteger(level.getApproveType(),Constants.TWO)){
+ //濡傛灉鏄崟浜哄鎵�
+ list.add(level);
+ return list;
+ }
+ //鏌ユ壘鍏ㄩ儴宸插鐞嗙殑闆嗗悎
+ List<Approve> passList = new ArrayList<>();//宸插悓鎰忕殑璁板綍闆�
+ Approve refuseModel = new Approve();//宸叉嫆缁濈殑璁板綍
+ List<Approve> waitList = new ArrayList<>(); //鏌ヨ鍏ㄩ儴鏈鐞嗙殑闆嗗悎
+ List<Approve> otherPassList = new ArrayList<>();//浠栦汉宸插鐞嗙殑璁板綍闆�
+ 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;
+ }
+ list.addAll(sortByCreateTime(passList));
+ if(Constants.equalsInteger(level.getApproveType(),Constants.ONE)){
+ //濡傛灉鏄細绛�
+ if(waitList.size()>0){
+ Approve waitModel = new Approve();
+ waitModel.setApproveType(Constants.ONE);
+ waitModel.setStatusInfo(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�")+"澶勭悊涓�");
+ waitModel.setStatus(Constants.equalsInteger(waitList.get(Constants.ZERO).getStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
+ waitModel.setApproveList(waitList);
+ list.add(waitModel);
+ }
+ }else {
+ if((waitList.size()> 0 || otherPassList.size()>0)){
+ Approve waitModel = new Approve();
+ waitModel.setApproveType(Constants.ONE);
+ 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);
+// }
+ }
+
+
+ return list;
+
+ }
+
+ 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) {
+ Collections.sort(passList, (a, b) -> a.getCheckDate().compareTo(b.getCheckDate()));
+ return passList;
+ }
+
+
+ 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;
+ }
+
/**
* 鏁寸悊 瀹℃壒鏁版嵁
@@ -442,18 +655,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;
@@ -464,6 +677,7 @@
.selectAll(Approve.class)
.selectAs(Member::getName,Approve::getMemberName)
.selectAs(Member::getPhone,Approve::getMemberPhone)
+ .selectAs(Member::getFaceImg,Approve::getFaceImg)
.selectAs(Company::getName,Approve::getCompanyName)
.leftJoin(Member.class,Member::getId,Approve::getChekorId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
@@ -475,14 +689,26 @@
.orderByAsc(Approve::getLevel)
.orderByAsc(Approve::getId)
);
+
+
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ for (Approve approve:approveAllList ) {
+ if(StringUtils.isNotBlank(approve.getFaceImg())){
+ approve.setFaceImg(path + approve.getFaceImg());
+ }
+ }
+
if(CollectionUtils.isEmpty(approveAllList)){
return approveDateVO;
}
- List<Approve> approveList = approveAllList.stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList());
+ List<Approve> approveList = approveAllList.stream().filter(i->Constants.equalsInteger(i.getType(),(Constants.ZERO)))
+ .collect(Collectors.toList());
if(CollectionUtils.isEmpty(approveList)){
return approveDateVO;
}
approveDateVO.setCanBeApproved(this.canBeApproved(approveList,memberId));
+ approveDateVO.setDriverParam(this.canDriverParam(approveList,memberId));
//鏍规嵁瀹℃壒绾у埆 澶勭悊鏁版嵁
for (Approve approve:approveGroupList) {
approve.setApproveList(
@@ -506,6 +732,24 @@
//涓嬩釜瀹℃壒娴佺▼鍐� 濡傛灉瀛樺湪褰撳墠 鐢ㄦ埛鐨勬姄绱� 鍒欏彲浠ヨ繘琛屽鎵�
if(nextApprovedList.stream().filter(i->i.getChekorId().equals(memberId)).collect(Collectors.toList()).size()>0){
return Constants.ONE;
+ }
+ }
+ return Constants.ZERO;
+ }
+
+ public Integer canDriverParam(List<Approve> approveList,Integer memberId){
+ //鑾峰彇鎵�鏈夊緟瀹℃壒鐨勬暟鎹�
+ List<Approve> waitApprovedList = approveList.stream().filter(i->i.getType().equals(Constants.ZERO)&&i.getStatus().equals(Constants.ZERO)).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(waitApprovedList)){
+ //涓嬩釜瀹℃壒娴佺▼绛夌骇
+ Integer nextApprovedLevel = waitApprovedList.get(Constants.ZERO).getLevel();
+ //涓嬩釜瀹℃壒娴佺▼鐨� 鎵�鏈夋暟鎹�
+ List<Approve> nextApprovedList = waitApprovedList.stream().filter(i->i.getStatus().equals(Constants.ZERO)&&i.getLevel().equals(nextApprovedLevel)).collect(Collectors.toList());
+ //涓嬩釜瀹℃壒娴佺▼鍐� 濡傛灉瀛樺湪褰撳墠 鐢ㄦ埛鐨勬姄绱� 鍒欏彲浠ヨ繘琛屽鎵�
+ List<Approve> auditApproveList = nextApprovedList.stream().filter(i->i.getChekorId().equals(memberId)).collect(Collectors.toList());
+ if(auditApproveList.size() >0){
+ Approve auditApprove = auditApproveList.get(Constants.ZERO);
+ return auditApprove.getDriverParam();
}
}
return Constants.ZERO;
@@ -546,6 +790,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();
@@ -635,8 +880,6 @@
//TODO 瀹℃壒鏈�氳繃閫氱煡
}
-
-
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.logisticsCarUse)){
//TODO 鐗╂祦杞﹂绾�
--
Gitblit v1.9.3