WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

未符合项--跳转数据

Browse Source
This commit is contained in:
zhn
2022-05-13 14:35:19 +08:00
parent a1805564f5
commit 70b21c9c84
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+12 -8
View File
@@ -24,7 +24,6 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -175,24 +174,29 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
} }
//待办任务id //待办任务id
if(trackVOList.size() != 0){ if(trackVOList.size() != 0){
List<String> projectTaskInventoryIdList = trackVOList.stream().map(NcrTrackVO::getId).distinct().collect(Collectors.toList()); List<String> projectLawsInventoryIdList = trackVOList.stream().map(NcrTrackVO::getProjectLawsInventoryId).distinct().collect(Collectors.toList());
QueryWrapper<ProjectTaskInventoryDetailEO> taskDetailQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectTaskInventoryDetailEO> taskDetailQueryWrapper = new QueryWrapper<>();
taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectTaskInventoryIdList); taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectLawsInventoryIdList);
//任务清单数据
List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList = projectTaskInventoryDetailEOService.list(taskDetailQueryWrapper); List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList = projectTaskInventoryDetailEOService.list(taskDetailQueryWrapper);
for (NcrTrackVO trackVO : trackVOList) { for (NcrTrackVO trackVO : trackVOList) {
String projectTaskInventoryId = trackVO.getId(); String projectLawsInventoryId = trackVO.getProjectLawsInventoryId();//任务清单id
String prcType = trackVO.getPrcType(); String prcType = trackVO.getPrcType();//流程类型
if(StringUtils.isNotBlank(projectTaskInventoryId) && StringUtils.isNotBlank(prcType)){ if(StringUtils.isNotBlank(projectLawsInventoryId) && StringUtils.isNotBlank(prcType)){
List<ProjectTaskInventoryDetailEO> collect = projectTaskInventoryDetailEOList.stream() List<ProjectTaskInventoryDetailEO> collect = projectTaskInventoryDetailEOList.stream()
.filter(e -> projectTaskInventoryId.equals(e.getProjectTaskInventoryId()) && prcType.equals(e.getFlowType())) .filter(e -> projectLawsInventoryId.equals(e.getProjectTaskInventoryId()) && prcType.equals(e.getFlowType()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if(collect.size() != 0){ if(collect.size() != 0){
trackVO.setTaskId(collect.get(0).getTaskId()); trackVO.setTaskId(collect.get(0).getTaskId());//待办任务id
trackVO.setStatus(collect.get(0).getStatus());
trackVO.setProjectTaskInventoryDetailId(collect.get(0).getId());
trackVO.setTaskDefinitionKey(collect.get(0).getTaskDefinitionKey());
} }
} }
} }
} }
List<NcrTrackVO> trackVOListTemp = new ArrayList<>(); List<NcrTrackVO> trackVOListTemp = new ArrayList<>();
String idJson = ncrTrackVO.getNcrTrackVOList(); String idJson = ncrTrackVO.getNcrTrackVOList();
if(StringUtils.isNotBlank(idJson)){ if(StringUtils.isNotBlank(idJson)){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+6
View File
@@ -129,6 +129,12 @@ public class NcrTrackVO implements Serializable {
private String prcId; private String prcId;
//流程类型 //流程类型
private String prcType; private String prcType;
//状态：待办 、已办
private String status;
//任务清单详情id
private String projectTaskInventoryDetailId;
//任务节点定义key
private String taskDefinitionKey;