From c58e1ca973258f13b5dae9f9afa813c6feeb2954 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 14 Feb 2025 16:55:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BusinessServiceImpl.java | 14 ++- .../bonus/flowable/utils/FlowTaskUtils.java | 2 +- .../com/bonus/project/domain/ConsUnit.java | 9 ++ .../project/domain/ConstructionMaterials.java | 6 + .../bonus/project/domain/ContEntryExit.java | 10 ++ .../com/bonus/project/domain/Equipment.java | 4 + .../bonus/project/domain/SubEntryExit.java | 6 + .../com/bonus/project/domain/SubPerson.java | 8 ++ .../domain/SupervisionOfAdmission.java | 5 + .../service/impl/ConsApprovalServiceImpl.java | 58 +++++++-- .../impl/ContEntryExitServiceImpl.java | 116 +++++++++++++++--- .../EngineeringEquipmentBindServiceImpl.java | 56 +++++++-- .../service/impl/EquipServiceImpl.java | 56 +++++++-- .../service/impl/SubEntryExitServiceImpl.java | 113 ++++++++++++++--- .../project/service/impl/SubServiceImpl.java | 59 +++++---- .../impl/SupervisionUnitServiceImpl.java | 56 +++++++-- .../mapper/system/ConsApprovalMapper.xml | 12 +- .../mapper/system/ContEntryExitMapper.xml | 25 +++- .../system/EngineeringEquipmentBindMapper.xml | 12 +- .../resources/mapper/system/EquipMapper.xml | 14 ++- .../mapper/system/SubEntryExitMapper.xml | 25 +++- .../resources/mapper/system/SubMapper.xml | 33 +++-- .../mapper/system/SupervisionUnitMapper.xml | 12 +- 23 files changed, 593 insertions(+), 118 deletions(-) diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java index 4125191..e506cf2 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java @@ -1180,12 +1180,14 @@ public class BusinessServiceImpl implements BusinessService { MsgBean bean=new MsgBean(); bean.setMsg(msg); for (String phone:list){ - bean.setPhone("15755022653"); - remoteUserService.setPhoneMsg(bean); - bean.setMsg("恭喜您已中奖,请您携带信息到宁夏办理处领取奖品,谢谢配合!"); - bean.setPhone("18855456507"); - remoteUserService.setPhoneMsg(bean); - bean.setPhone(phone); +// bean.setPhone("15755022653"); +// bean.setMsg(msg); +// remoteUserService.setPhoneMsg(bean); + +// bean.setMsg("恭喜您已中奖,请您携带信息到宁夏办理处领取奖品,谢谢配合!"); +// bean.setPhone("18855456507"); +// remoteUserService.setPhoneMsg(bean); + // bean.setPhone(phone); // sedPhoneMsg(bean); } }catch (Exception e){ diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java index 1974290..6198d39 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java @@ -275,7 +275,7 @@ public class FlowTaskUtils extends FlowServiceFactory { return AjaxResult.error("userId不能为空"); } if (Objects.isNull(pageSize)) { - pageSize = 100; + pageSize = 500; } if (Objects.isNull(pageNum)) { pageNum = 1; diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ConsUnit.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ConsUnit.java index 5aa8ed7..8581d13 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ConsUnit.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ConsUnit.java @@ -4,6 +4,8 @@ import com.bonus.common.core.domain.BaseBean; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * FileName: ConsUnit * @@ -86,4 +88,11 @@ public class ConsUnit extends BaseBean { private String intoStatus; private String outStatus; private String keyWord; + + private int dataType=0; + + private List proInsId; + + + } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ConstructionMaterials.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ConstructionMaterials.java index 731af09..1811579 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ConstructionMaterials.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ConstructionMaterials.java @@ -67,4 +67,10 @@ public class ConstructionMaterials extends BaseBean { private List fileList; private String appType; + + + private int dataType=0; + + private List proInsId; + } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ContEntryExit.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ContEntryExit.java index 767eccc..3a3329e 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ContEntryExit.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ContEntryExit.java @@ -4,6 +4,8 @@ import com.bonus.common.core.domain.BaseBean; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * FileName: ConsUnit * @@ -79,5 +81,13 @@ public class ContEntryExit extends BaseBean { * APP类型 */ private String appType; + + + private int dataType=0; + + private List proInsId; + + + } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/Equipment.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/Equipment.java index 37bd76f..765abd4 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/Equipment.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/Equipment.java @@ -91,4 +91,8 @@ public class Equipment extends BaseBean implements Serializable { private String pageSize; + private int dataType=0; + + private List proInsId; + } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubEntryExit.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubEntryExit.java index 4c222ce..5ee789c 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubEntryExit.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubEntryExit.java @@ -4,6 +4,8 @@ import com.bonus.common.core.domain.BaseBean; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * FileName: ConsUnit * @@ -77,5 +79,9 @@ public class SubEntryExit extends BaseBean { * app类型 */ private String appType; + + private int dataType=0; + + private List proInsId; } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java index d3c2278..b2ace8b 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java @@ -108,6 +108,9 @@ public class SubPerson extends BaseBean implements Serializable { */ @Excel(name = "状态", width = 30) private String status; + + private String statusName; + /** * 施工人员人脸照片 */ @@ -155,5 +158,10 @@ public class SubPerson extends BaseBean implements Serializable { private String taskType; + private int dataType=0; + + private List proInsId; + + } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SupervisionOfAdmission.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SupervisionOfAdmission.java index 51d48ef..d76aa24 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SupervisionOfAdmission.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SupervisionOfAdmission.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @author 19814 @@ -118,4 +119,8 @@ public class SupervisionOfAdmission extends BaseBean implements Serializable { private String status; private String intoStatus; + private int dataType=0; + + private List proInsId; + } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java index 20591f1..39a2b21 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.project.service.impl; import com.bonus.common.core.domain.RequestEntity; +import com.bonus.common.core.utils.PageUtils; import com.bonus.common.core.utils.StaticVariableUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; @@ -13,10 +14,13 @@ import com.bonus.project.domain.SubPerson; import com.bonus.project.mapper.ConsApprovalMapper; import com.bonus.project.service.ConsApprovalService; import com.bonus.project.service.FlowTaskService; +import com.google.common.collect.Maps; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -42,20 +46,56 @@ public class ConsApprovalServiceImpl implements ConsApprovalService { */ @Override public List getConsEntranceList(ConsUnit bean) { - List list = mapper.getConsEntranceList(bean); RequestEntity entity = new RequestEntity(); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 - GenericProcessor processor = new GenericProcessor(); - processor.processEntities(list, entity, flowTaskService); - if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { - list = list.stream() - .filter(consUnit -> bean.getStatus().equals(consUnit.getIntoStatus())) - .collect(Collectors.toList()); + //数据查询 + Map checkMaps= Maps.newHashMap(); + if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); + } + } } + + PageUtils.startPage(); + List list = mapper.getConsEntranceList(bean); + list.forEach(data->{ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); return list; } +// @Override +// public List getConsEntranceList(ConsUnit bean) { +// System.err.println("开始如"); +// List list = mapper.getConsEntranceList(bean); +// RequestEntity entity = new RequestEntity(); +// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 +// GenericProcessor processor = new GenericProcessor(); +// processor.processEntities(list, entity, flowTaskService); +// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { +// list = list.stream() +// .filter(consUnit -> bean.getStatus().equals(consUnit.getIntoStatus())) +// .collect(Collectors.toList()); +// } +// return list; +// } + /** * 查询审批列表数据 主要用于获取首页工程出入场审批记录 * diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java index b299d8c..4901ff2 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java @@ -4,7 +4,9 @@ import com.aspose.words.IFieldMergingCallback; import com.bonus.common.core.domain.R; import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.PageUtils; import com.bonus.common.core.utils.StringUtils; +import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.project.controller.GenericProcessor; import com.bonus.project.domain.ContEntryExit; @@ -17,6 +19,7 @@ import com.bonus.project.service.FlowTaskService; import com.bonus.system.api.RemoteFileService; import com.bonus.system.api.domain.SysFile; import com.bonus.system.api.model.LoginUser; +import com.google.common.collect.Maps; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.validation.constraints.NotNull; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -71,20 +75,59 @@ public class ContEntryExitServiceImpl implements ContEntryExitService { if(us!=null &&us.getSysUser()!=null){ bean.setContUuid(us.getSysUser().getParentUuid()); } - List list = ceMapper.listCommencementApproval(bean); RequestEntity entity = new RequestEntity(); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 - GenericProcessor processor = new GenericProcessor(); - processor.processEntities(list, entity, flowTaskService); - if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { - list = list.stream() - .filter(contEntryExit -> bean.getStatus().equals(contEntryExit.getIntoStatus())) - .collect(Collectors.toList()); + //数据查询 + Map checkMaps= Maps.newHashMap(); + if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); + } + } } + + PageUtils.startPage(); + List list = ceMapper.listCommencementApproval(bean); + list.forEach(data->{ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); return list; } +// @Override +// public List listCommencementApproval(ContEntryExit bean) { +// LoginUser us=SecurityUtils.getLoginUser(); +// if(us!=null &&us.getSysUser()!=null){ +// bean.setContUuid(us.getSysUser().getParentUuid()); +// } +// List list = ceMapper.listCommencementApproval(bean); +// RequestEntity entity = new RequestEntity(); +// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 +// GenericProcessor processor = new GenericProcessor(); +// processor.processEntities(list, entity, flowTaskService); +// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { +// list = list.stream() +// .filter(contEntryExit -> bean.getStatus().equals(contEntryExit.getIntoStatus())) +// .collect(Collectors.toList()); +// } +// return list; +// } + /** * 查询承包商完工审批列表 * @@ -171,20 +214,57 @@ public class ContEntryExitServiceImpl implements ContEntryExitService { */ @Override public List listCompleteApproval(ContEntryExit bean) { - List list = ceMapper.listCompleteApproval(bean); + RequestEntity entity = new RequestEntity(); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 - GenericProcessor processor = new GenericProcessor(); - processor.processEntities(list, entity, flowTaskService); - if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { - list = list.stream() - .filter(contEntryExit -> bean.getStatus().equals(contEntryExit.getIntoStatus())) - .collect(Collectors.toList()); + //数据查询 + Map checkMaps= Maps.newHashMap(); + if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); + } + } } + PageUtils.startPage(); + List list = ceMapper.listCompleteApproval(bean); + list.forEach(data->{ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); + + return list; } +// @Override +// public List listCompleteApproval(ContEntryExit bean) { +// List list = ceMapper.listCompleteApproval(bean); +// RequestEntity entity = new RequestEntity(); +// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 +// GenericProcessor processor = new GenericProcessor(); +// processor.processEntities(list, entity, flowTaskService); +// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { +// list = list.stream() +// .filter(contEntryExit -> bean.getStatus().equals(contEntryExit.getIntoStatus())) +// .collect(Collectors.toList()); +// } +// return list; +// } + @Override @Transactional(rollbackFor = Exception.class) public int addFinishApply(MultipartFile[] completionApplyFiles, MultipartFile[] otherFiles, Map allRequestParams) { diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java index 5374dfa..adc4a3f 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.project.service.impl; import com.bonus.common.core.domain.RequestEntity; +import com.bonus.common.core.utils.PageUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; @@ -11,10 +12,13 @@ import com.bonus.project.domain.EngineeringEquipmentBind; import com.bonus.project.mapper.EngineeringEquipmentBindMapper; import com.bonus.project.service.EngineeringEquipmentBindService; import com.bonus.project.service.FlowTaskService; +import com.google.common.collect.Maps; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -74,19 +78,53 @@ public class EngineeringEquipmentBindServiceImpl implements EngineeringEquipment */ @Override public List listConstructionMaterial(ConstructionMaterials bean) { - List list = mapper.listConstructionMaterial(bean); + RequestEntity entity = new RequestEntity(); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 - GenericProcessor processor = new GenericProcessor(); - processor.processEntities(list, entity, flowTaskService); - if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { - list = list.stream() - .filter(constructionMaterials -> bean.getStatus().equals(constructionMaterials.getIntoStatus())) - .collect(Collectors.toList()); + //数据查询 + Map checkMaps= Maps.newHashMap(); + if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); + } + } } + PageUtils.startPage(); + List list = mapper.listConstructionMaterial(bean); + list.forEach(data->{ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); return list; } +// @Override +// public List listConstructionMaterial(ConstructionMaterials bean) { +// List list = mapper.listConstructionMaterial(bean); +// RequestEntity entity = new RequestEntity(); +// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 +// GenericProcessor processor = new GenericProcessor(); +// processor.processEntities(list, entity, flowTaskService); +// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { +// list = list.stream() +// .filter(constructionMaterials -> bean.getStatus().equals(constructionMaterials.getIntoStatus())) +// .collect(Collectors.toList()); +// } +// return list; +// } /** * @param bean diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java index 08046b8..7ed047c 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.project.service.impl; import com.bonus.common.core.domain.R; import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.PageUtils; import com.bonus.common.core.utils.StaticVariableUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; @@ -16,6 +17,7 @@ import com.bonus.project.service.EquipService; import com.bonus.project.service.FlowTaskService; import com.bonus.system.api.RemoteFileService; import com.bonus.system.api.domain.SysFile; +import com.google.common.collect.Maps; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,6 +27,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.validation.constraints.NotNull; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -152,19 +155,54 @@ public class EquipServiceImpl implements EquipService { */ @Override public List entryOfUtensilsList(Equipment bean) { - List list = mapper.entryOfUtensilsList(bean); + RequestEntity entity = new RequestEntity(); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 - GenericProcessor processor = new GenericProcessor(); - processor.processEntities(list, entity, flowTaskService); - if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { - list = list.stream() - .filter(equipment -> bean.getStatus().equals(equipment.getIntoStatus())) - .collect(Collectors.toList()); + //数据查询 + Map checkMaps= Maps.newHashMap(); + if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); + } + } } + PageUtils.startPage(); + List list = mapper.entryOfUtensilsList(bean); + list.forEach(data->{ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); return list; } + +// @Override +// public List entryOfUtensilsList(Equipment bean) { +// List list = mapper.entryOfUtensilsList(bean); +// RequestEntity entity = new RequestEntity(); +// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 +// GenericProcessor processor = new GenericProcessor(); +// processor.processEntities(list, entity, flowTaskService); +// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { +// list = list.stream() +// .filter(equipment -> bean.getStatus().equals(equipment.getIntoStatus())) +// .collect(Collectors.toList()); +// } +// return list; +// } /** * 获取工器具文件列表 * @param bean 工器具bean diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java index d963bc6..2be1f2b 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java @@ -2,7 +2,9 @@ package com.bonus.project.service.impl; import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.PageUtils; import com.bonus.common.core.utils.StringUtils; +import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.project.controller.GenericProcessor; import com.bonus.project.domain.SubEntryExit; @@ -10,10 +12,13 @@ import com.bonus.project.domain.SubcontractorsEntity; import com.bonus.project.mapper.SubEntryExitMapper; import com.bonus.project.service.FlowTaskService; import com.bonus.project.service.SubEntryExitService; +import com.google.common.collect.Maps; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -38,20 +43,56 @@ public class SubEntryExitServiceImpl implements SubEntryExitService { */ @Override public List listSubEntry(SubEntryExit bean) { - List list = seMapper.listSubEntry(bean); + RequestEntity entity = new RequestEntity(); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 - GenericProcessor processor = new GenericProcessor(); - processor.processEntities(list, entity, flowTaskService); - if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { - list = list.stream() - .filter(subEntryExit -> bean.getStatus().equals(subEntryExit.getIntoStatus())) - .collect(Collectors.toList()); + //数据查询 + Map checkMaps= Maps.newHashMap(); + if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); + } + } } + PageUtils.startPage(); + List list = seMapper.listSubEntry(bean); + list.forEach(data->{ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); return list; } + +// @Override +// public List listSubEntry(SubEntryExit bean) { +// List list = seMapper.listSubEntry(bean); +// RequestEntity entity = new RequestEntity(); +// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 +// GenericProcessor processor = new GenericProcessor(); +// processor.processEntities(list, entity, flowTaskService); +// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { +// list = list.stream() +// .filter(subEntryExit -> bean.getStatus().equals(subEntryExit.getIntoStatus())) +// .collect(Collectors.toList()); +// } +// return list; +// } + /** * 查询分包商出场审批列表 * @@ -60,19 +101,55 @@ public class SubEntryExitServiceImpl implements SubEntryExitService { */ @Override public List listSubExit(SubEntryExit bean) { - List list = seMapper.listSubExit(bean); + + RequestEntity entity = new RequestEntity(); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 - GenericProcessor processor = new GenericProcessor(); - processor.processEntities(list, entity, flowTaskService); - if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { - list = list.stream() - .filter(subEntryExit -> bean.getStatus().equals(subEntryExit.getIntoStatus())) - .collect(Collectors.toList()); + //数据查询 + Map checkMaps= Maps.newHashMap(); + if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); + } + } } + PageUtils.startPage(); + List list = seMapper.listSubExit(bean); + list.forEach(data->{ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); return list; } + +// @Override +// public List listSubExit(SubEntryExit bean) { +// List list = seMapper.listSubExit(bean); +// RequestEntity entity = new RequestEntity(); +// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 +// GenericProcessor processor = new GenericProcessor(); +// processor.processEntities(list, entity, flowTaskService); +// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { +// list = list.stream() +// .filter(subEntryExit -> bean.getStatus().equals(subEntryExit.getIntoStatus())) +// .collect(Collectors.toList()); +// } +// return list; +// } /** * 分包商出场申请 * @param bean 分包商实体 diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java index 0578da5..0b8c018 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java @@ -17,6 +17,7 @@ import com.bonus.project.service.FlowTaskService; import com.bonus.project.service.SubService; import com.bonus.system.api.RemoteUserService; import com.bonus.system.api.domain.SysUser; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -159,33 +160,47 @@ public class SubServiceImpl implements SubService { public List enterPersonList(SubPerson bean) { long startTime = System.currentTimeMillis(); RequestEntity entity = new RequestEntity(); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); - List stringList = new ArrayList<>(); - if (ajaxResult.isSuccess() ) { - List> data = (List>) ajaxResult.get("data"); - if (data != null && !data.isEmpty()) { - if (data != null && !data.isEmpty()) { - stringList = data.stream() - .map(map -> (String) map.get("proInsId")) - .collect(Collectors.toList()); + //数据查询 + Map checkMaps= Maps.newHashMap(); + if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); } } - } - bean.setUserList(stringList); PageUtils.startPage(); List list = mapper.enterPersonList(bean); - System.err.println("stringList="+stringList); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 - GenericProcessor processor = new GenericProcessor(); - processor.processEntities(list, entity, flowTaskService); - if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { - list = list.stream() - .filter(subPerson -> bean.getStatus().equals(subPerson.getIntoStatus())) - .collect(Collectors.toList()); - } + list.forEach(data->{ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); + + + + +// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 +// GenericProcessor processor = new GenericProcessor(); +// processor.processEntities(list, entity, flowTaskService); +// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { +// list = list.stream() +// .filter(subPerson -> bean.getStatus().equals(subPerson.getIntoStatus())) +// .collect(Collectors.toList()); +// } long endTime = System.currentTimeMillis(); System.err.println("耗时："+(endTime-startTime)); return list; diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java index 6b009c6..606cdb3 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.project.service.impl; import com.bonus.common.core.domain.R; import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.PageUtils; import com.bonus.common.core.utils.StaticVariableUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; @@ -15,6 +16,8 @@ import com.bonus.project.service.FlowTaskService; import com.bonus.project.service.SupervisionUnitService; import com.bonus.system.api.RemoteFileService; import com.bonus.system.api.domain.SysFile; +import com.google.common.collect.Maps; +import org.hibernate.validator.internal.util.StringHelper; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,6 +27,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.validation.constraints.NotNull; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -122,20 +126,54 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { */ @Override public List listSupEntry(SupervisionOfAdmission bean) { - List list = suMapper.listSupEntry(bean); RequestEntity entity = new RequestEntity(); - entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 - GenericProcessor processor = new GenericProcessor(); - processor.processEntities(list, entity, flowTaskService); - if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { - list = list.stream() - .filter(supervisionOfAdmission -> bean.getStatus().equals(supervisionOfAdmission.getIntoStatus())) - .collect(Collectors.toList()); + //数据查询 + Map checkMaps= Maps.newHashMap(); + if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); + } + } } + PageUtils.startPage(); + List list = suMapper.listSupEntry(bean); + list.forEach(data->{ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + if("1".equals(data.getStatus()) && bean.getDataType()==1){ + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); return list; } +// @Override +// public List listSupEntry(SupervisionOfAdmission bean) { +// List list = suMapper.listSupEntry(bean); +// RequestEntity entity = new RequestEntity(); +// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); +// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理 +// GenericProcessor processor = new GenericProcessor(); +// processor.processEntities(list, entity, flowTaskService); +// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) { +// list = list.stream() +// .filter(supervisionOfAdmission -> bean.getStatus().equals(supervisionOfAdmission.getIntoStatus())) +// .collect(Collectors.toList()); +// } +// return list; +// } + /** * 监理入场-监理人员新增 * diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml index b2af8e2..463117c 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml @@ -48,7 +48,7 @@ pci.legal_name as corporateName, pci.comm_usert_name as contractorPrincipal, pci.comm_usert_phone as contractorPrincipalPhone, - '0' as status, + #{dataType} as status, lpc.into_status as intoStatus from lk_pro_cont lpc left join pt_cont_info pci on pci.uuid = lpc.cont_uuid @@ -71,6 +71,16 @@ and lpc.into_status = #{status} + + AND lpc.proc_inst_id IN ( + + #{item} + + ) + + + and lpc.into_status = #{status} + diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/SubEntryExitMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/SubEntryExitMapper.xml index f1cb960..0288c19 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/SubEntryExitMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/SubEntryExitMapper.xml @@ -32,7 +32,7 @@ psi.sub_user_phone as subUserPhone, lcs.task_id as taskId, lcs.proc_inst_id as procInsId, - '0' as status, + #{dataType} as status, lcs.into_status as intoStatus FROM (select @rowNum := 0) r,lk_cont_sub lcs @@ -71,6 +71,17 @@ AND lcs.pro_id = #{proId} + + AND lcs.proc_inst_id IN ( + + #{item} + + ) + + + and lcs.into_status = #{status} + +