liux
/
nxdt-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改待审核数据查询

This commit is contained in:
haozq 2025-02-14 16:55:56 +08:00
parent 4835c32f48
commit c58e1ca973
23 changed files with 593 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java
View File

@ -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){

2
bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/utils/FlowTaskUtils.java
View File

@ -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;

9
bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ConsUnit.java
View File

@ -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<String> proInsId;
}

6
bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ConstructionMaterials.java
View File

@ -67,4 +67,10 @@ public class ConstructionMaterials extends BaseBean {
private List<SysFileInfo> fileList;
private String appType;
private int dataType=0;
private List<String> proInsId;
}

10
bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/ContEntryExit.java
View File

@ -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<String> proInsId;
}

4
bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/Equipment.java
View File

@ -91,4 +91,8 @@ public class Equipment extends BaseBean implements Serializable {
private String pageSize;
private int dataType=0;
private List<String> proInsId;
}

6
bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubEntryExit.java
View File

@ -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<String> proInsId;
}

8
bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java
View File

@ -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<String> proInsId;
}

5
bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SupervisionOfAdmission.java
View File

@ -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<String> proInsId;
}

58
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java
View File

@ -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<ConsUnit> getConsEntranceList(ConsUnit bean) {
List<ConsUnit> 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<String, String> 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<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
List<String> 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<ConsUnit> 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<ConsUnit> getConsEntranceList(ConsUnit bean) {
// System.err.println("开始如");
// List<ConsUnit> 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;
// }
/**
* 查询审批列表数据 主要用于获取首页工程出入场审批记录
*

116
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java
View File

@ -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<ContEntryExit> 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<String, String> 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<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
List<String> 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<ContEntryExit> 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<ContEntryExit> listCommencementApproval(ContEntryExit bean) {
// LoginUser us=SecurityUtils.getLoginUser();
// if(us!=null &&us.getSysUser()!=null){
// bean.setContUuid(us.getSysUser().getParentUuid());
// }
// List<ContEntryExit> 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<ContEntryExit> listCompleteApproval(ContEntryExit bean) {
List<ContEntryExit> 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<String, String> 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<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
List<String> 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<ContEntryExit> 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<ContEntryExit> listCompleteApproval(ContEntryExit bean) {
// List<ContEntryExit> 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<String, String> allRequestParams) {

56
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java
View File

@ -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<ConstructionMaterials> listConstructionMaterial(ConstructionMaterials bean) {
List<ConstructionMaterials> 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<String, String> 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<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
List<String> 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<ConstructionMaterials> 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<ConstructionMaterials> listConstructionMaterial(ConstructionMaterials bean) {
// List<ConstructionMaterials> 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

56
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java
View File

@ -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<Equipment> entryOfUtensilsList(Equipment bean) {
List<Equipment> 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<String, String> 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<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
List<String> 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<Equipment> 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<Equipment> entryOfUtensilsList(Equipment bean) {
// List<Equipment> 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

113
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java
View File

@ -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<SubEntryExit> listSubEntry(SubEntryExit bean) {
List<SubEntryExit> 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<String, String> 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<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
List<String> 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<SubEntryExit> 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<SubEntryExit> listSubEntry(SubEntryExit bean) {
// List<SubEntryExit> 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<SubEntryExit> listSubExit(SubEntryExit bean) {
List<SubEntryExit> 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<String, String> 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<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
List<String> 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<SubEntryExit> 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<SubEntryExit> listSubExit(SubEntryExit bean) {
// List<SubEntryExit> 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 分包商实体

59
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java
View File

@ -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<SubPerson> enterPersonList(SubPerson bean) {
long startTime = System.currentTimeMillis();
RequestEntity entity = new RequestEntity();
entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
AjaxResult ajaxResult = flowTaskService.getStayFlow(entity);
List<String> stringList = new ArrayList<>();
if (ajaxResult.isSuccess() ) {
List<Map<String, Object>> data = (List<Map<String, Object>>) 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<String, String> 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<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
List<String> 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<SubPerson> 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;

56
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java
View File

@ -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<SupervisionOfAdmission> listSupEntry(SupervisionOfAdmission bean) {
List<SupervisionOfAdmission> 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<String, String> 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<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
List<String> 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<SupervisionOfAdmission> 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<SupervisionOfAdmission> listSupEntry(SupervisionOfAdmission bean) {
// List<SupervisionOfAdmission> 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;
// }
/**
* 监理入场-监理人员新增
*

12
bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml
View File

@ -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 @@
<if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2 ">
and lpc.into_status = #{status}
</if>
<if test='dataType==1'>
AND lpc.proc_inst_id IN (
<foreach collection="proInsId" item="item" separator=",">
#{item}
</foreach>
)
</if>
<if test="status==2 or status=='2'">
and lpc.into_status = #{status}
</if>
</select>
<select id="getAuditRecord" resultType="com.bonus.project.domain.AuditBean">
<if test="userType == '01'">

25
bonus-modules/bonus-project/src/main/resources/mapper/system/ContEntryExitMapper.xml
View File

@ -75,7 +75,7 @@
lpc.uuid as uuid,
ppi.pro_name as proName,
pci.cont_name as contName,
'0' as status,
#{dataType} as status,
lpc.start_status as intoStatus,
lpc.start_date as startDate,
lpc.task_id_start as taskId,
@ -101,6 +101,17 @@
<if test=" appType == 'app' ">
AND lpc.pro_id = #{proId}
</if>
<if test='dataType==1'>
AND lpc.proc_inst_id IN (
<foreach collection="proInsId" item="item" separator=",">
#{item}
</foreach>
)
</if>
<if test="status==2 or status=='2'">
and lpc.start_status = #{status}
</if>
</select>
<select id="listStartOfWork" resultType="com.bonus.project.domain.ContEntryExit">
SELECT
@ -139,7 +150,7 @@
ppi.pro_name as proName,
pci.cont_name as contName,
lpc.out_status as intoStatus,
'0' as status,
#{dataType} as status,
lpc.task_id_out as taskId,
lpc.proc_inst_id_out as procInsId,
lpc.end_date as endDate
@ -159,10 +170,18 @@
<if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2 ">
AND lpc.out_status = #{status}
</if>
<if test="status == 1 or status == '1' or status == '2' and status == 2 ">
<if test="status == 1 or status == '1' or status == '2' or status == 2 ">
AND lpc.out_status = '1' OR lpc.out_status = '2'
</if>
<if test='dataType==1'>
AND lpc.proc_inst_id_out IN (
<foreach collection="proInsId" item="item" separator=",">
#{item}
</foreach>
)
</if>
<if test="proId != null and proId != ''">
AND lpc.pro_id = #{proId}
</if>

12
bonus-modules/bonus-project/src/main/resources/mapper/system/EngineeringEquipmentBindMapper.xml
View File

@ -105,7 +105,7 @@
lcf.uuid as uuid,
lcf.task_id as taskId,
lcf.proc_inst_id as procInsId,
'0' AS status,
#{dataType} AS status,
lcf.status as intoStatus
FROM (select @rowNum := 0) r, lk_cont_file AS lcf
LEFT JOIN pt_cons_information AS pci ON lcf.uuid = pci.uuid and pci.is_active = '1'
@ -127,6 +127,16 @@
<if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2 ">
AND lcf.status = #{status}
</if>
<if test="status==2 or status=='2'">
and lcf.status = #{status}
</if>
<if test='dataType==1'>
AND lcf.proc_inst_id IN (
<foreach collection="proInsId" item="item" separator=",">
#{item}
</foreach>
)
</if>
ORDER BY lcf.create_time DESC
</select>
<select id="getFileList" resultType="com.bonus.common.entity.SysFileInfo">

14
bonus-modules/bonus-project/src/main/resources/mapper/system/EquipMapper.xml
View File

@ -169,7 +169,7 @@
ppt.admission_date as admissionDate,
ppt.departure_date as departureDate,
ppt.status as intoStatus,
'0' as status,
#{dataType} as status,
group_concat(pci.information_path) as filePath
from pt_pro_tools ppt
left join sys_dict_data sdd on sdd.dict_value = ppt.status and sdd.dict_type = 'sys_approval_state' and
@ -194,6 +194,18 @@
<if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2 ">
and ppt.status = #{status}
</if>
<if test="status==2 or status=='2'">
and ppt.status = #{status}
</if>
<if test='dataType==1'>
AND ppt.proc_inst_id IN (
<foreach collection="proInsId" item="item" separator=",">
#{item}
</foreach>
)
</if>
group by ppt.tools_id
</select>
</mapper>

25
bonus-modules/bonus-project/src/main/resources/mapper/system/SubEntryExitMapper.xml
View File

@ -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 @@
<if test="appType == 'app'">
AND lcs.pro_id = #{proId}
</if>
<if test='dataType==1'>
AND lcs.proc_inst_id IN (
<foreach collection="proInsId" item="item" separator=",">
#{item}
</foreach>
)
</if>
<if test="status==2 or status=='2'">
and lcs.into_status = #{status}
</if>
</select>
<select id="listSubExit" resultType="com.bonus.project.domain.SubEntryExit">
SELECT
@ -92,7 +103,7 @@
psi.sub_user_name as subUserName,
psi.sub_user_phone as subUserPhone,
lcs.out_status as intoStatus,
'0' as status
#{dataType} as status
FROM
(select @rowNum := 0) r,lk_cont_sub lcs
LEFT JOIN pt_sub_info psi ON lcs.sub_uuid = psi.uuid AND psi.is_active = '1'
@ -112,6 +123,16 @@
<if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2 ">
AND lcs.out_status = #{status}
</if>
<if test='dataType==1'>
AND lcs.proc_inst_id_out IN (
<foreach collection="proInsId" item="item" separator=",">
#{item}
</foreach>
)
</if>
<if test="status==2 or status=='2'">
and lcs.out_status = #{status}
</if>
<if test="keyWord != null and keyWord != ''">
AND (
psi.sub_code LIKE CONCAT('%',#{keyWord},'%')

33
bonus-modules/bonus-project/src/main/resources/mapper/system/SubMapper.xml
View File

@ -84,7 +84,7 @@
sdd.dict_label as postName,
pcp.work_type as specialJobType,
pcp.face_path as facePath,
sdd1.dict_label as status,
sdd1.dict_label as statusName,
<if test="type == '出场'">
lcp.task_id_out as taskId,
lcp.proc_inst_id_out as procInsId,
@ -95,7 +95,7 @@
lcp.proc_inst_id as procInsId,
lcp.into_status as intoStatus,
</if>
'0' as status
#{dataType} as status
from pt_cons_person pcp
left join lk_cont_person lcp on lcp.cons_persion_id = pcp.cons_user_id
left join sys_dict_data sdd on sdd.dict_value = pcp.post and sdd.dict_type = 'sys_cons_post' and sdd.status ='0'
@ -133,19 +133,36 @@
<if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2 ">
and lcp.into_status = #{status}
</if>
<if test="status==2 or status=='2'">
and lpc.into_status = #{status}
</if>
<if test='dataType==1'>
AND lcp.proc_inst_id IN (
<foreach collection="proInsId" item="item" separator=",">
#{item}
</foreach>
)
</if>
</if>
<if test="type == '出场'">
and lcp.out_status != '0' and lcp.into_status = '3'
<if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2 ">
and lcp.out_status = #{status}
</if>
<if test="status==2 or status=='2'">
and lpc.out_status = #{status}
</if>
<if test='dataType==1'>
AND lcp.proc_inst_id_out IN (
<foreach collection="proInsId" item="item" separator=",">
#{item}
</foreach>
)
</if>
</if>
<if test="userList != null and userList !='' ">
and lcp.proc_inst_id in
<foreach collection="userList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</select>
<select id="checkIsExistPersonName" resultType="com.bonus.system.api.domain.SysUser">
SELECT user_id as userId,

12
bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml
View File

@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
psi.sup_code as supCode,
psi.legal_name as legalName,
psi.legal_phone as legalPhone,
'0' as status,
#{dataType} as status,
lps.status as intoStatus,
lps.task_id as taskId,
lps.proc_inst_id as procInsId,
@ -182,6 +182,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2 ">
AND lps.status = #{status}
</if>
<if test='dataType==1'>
AND lps.proc_inst_id IN (
<foreach collection="proInsId" item="item" separator=",">
#{item}
</foreach>
)
</if>
<if test="status==2 or status=='2'">
and lps.status = #{status}
</if>
<if test="proName != null and proName != ''">
AND ppi.pro_name = #{proName}
</if>