diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java index 3e8e99d..069841d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java @@ -373,6 +373,7 @@ public class AnnualPlanLibManage { fileName = "丽水市" + year + "年数字化项目年度计划增补库编辑表"; } LambdaQueryWrapper query = ProjectHelper.projectQuery(param); + query.eq(Project::getNewest,Boolean.TRUE); query.eq(Project::getIsTemporaryAugment, isTemporaryAugment); query.orderByDesc(Project::getAnnualPlanAddTime); query.in(Project::getStatus, CollUtils.fieldList(ANNUAL_PLAN_LIST_STATUS, ProjectStatusEnum::getCode)); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 64a870e..2026277 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -10,6 +10,7 @@ import java.util.stream.Stream; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import com.ningdatech.basic.exception.BizException; import com.ningdatech.pmapi.projectlib.enumeration.*; @@ -262,6 +263,7 @@ public class TodoCenterManage { * @since 2023/02/01 */ public void exportTodoList(HttpServletResponse response, ToBeProcessedExportReq param) { + // 获取登录用户ID Long userId = LoginUserUtil.getUserId(); // 获取用户全量用户信息 @@ -269,42 +271,37 @@ public class TodoCenterManage { // 获取登录用户浙政钉code String employeeCode = userFullInfo.getEmployeeCode(); + List userTodoList = Lists.newArrayList(); + Map projectInfoMap = MapUtil.newHashMap(); // 查出项目库项目 ProjectListReq projectListReq = new ProjectListReq(); BeanUtils.copyProperties(param, projectListReq); List projects = projectLibManage.projectList(projectListReq); - List userTodoList = Lists.newArrayList(); - Map projectInfoMap = Maps.newHashMap(); if (CollUtil.isNotEmpty(projects)) { Map projectsMap = projects.stream().collect(Collectors.toMap(Project::getId, v -> v)); // 再查出项目关联的流程实例ID List projectIdList = projects.stream().map(Project::getId).collect(Collectors.toList()); List projectInstList = projectInstService.list(Wrappers.lambdaQuery(ProjectInst.class) - .in(ProjectInst::getProjectId, projectIdList) - .orderByDesc(ProjectInst::getProjectId)); - projectInfoMap = projectInstList.stream().collect(Collectors.toMap(ProjectInst::getInstCode, p-> projectsMap.get(p.getProjectId()))); + .in(ProjectInst::getProjectId, projectIdList).orderByDesc(ProjectInst::getProjectId)); + projectInfoMap = projectInstList.stream() + .collect(Collectors.toMap(ProjectInst::getInstCode, p -> projectsMap.get(p.getProjectId()))); List instCodes = projectInstList.stream().map(ProjectInst::getInstCode).collect(Collectors.toList()); + // 查出用户工作流 TodoCenterListReqDTO req = new TodoCenterListReqDTO(); req.setInstCodes(instCodes); req.setProcessDefId(param.getProcessDefId()); - req.setUserId(String.valueOf(userId)); req.setEmployeeCode(employeeCode); - BeanUtils.copyProperties(param,req); - //有待办节点的(不包含退回) + // 有待办节点的(不包含退回) List todoList = processTaskService.getUserTodoList(req); - //有退回待办的 + // 有退回待办的 List backList = processTaskService.getBackTodoList(req); - //合并 并且排序 - userTodoList = Stream.concat(todoList.stream(),backList.stream()) - .filter(Objects::nonNull) - .sorted(Comparator.comparing(ProcessTaskVo::getTaskCreateTime) - .reversed()) - .collect(Collectors.toList()); + // 合并 并且排序 + userTodoList = Stream.concat(todoList.stream(), backList.stream()).filter(Objects::nonNull) + .sorted(Comparator.comparing(ProcessTaskVo::getTaskCreateTime).reversed()).collect(Collectors.toList()); } - ExcelExportWriter excelExportWriter = new ExcelExportWriter(); String fileName = null; if (IsAppendProjectEnum.APPEND_PROJECT.getCode().equals(param.getIsTemporaryAugment())) {