diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index fed08a0..c8a2793 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -277,6 +277,11 @@ public class ProjectController extends BaseController{ model.put("keywords",keywords); model.put("deptList", deptRepository.findAll()); ConcurrentHashMap searchInfo = getSearchInfo(keywords,model); + + //在列表基础上增加审核人是我和待审核状态的条件 + searchInfo.put("approveId", ""+InterfaceUtil.getAdminId()); + searchInfo.put("approveStatus", ""+ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus()); + model.put("pager",projectService.list(searchInfo,pageNumber,pageSize)); return "admin/project_list_approve"; } @@ -287,6 +292,11 @@ public class ProjectController extends BaseController{ @RequestMapping("/exportApprove") public void exportApprove(@RequestParam(value = "keywords",required = false) String keywords, HttpServletResponse httpServletResponse) throws IOException { Map searchInfo = getSearchInfo(keywords); + + //在列表基础上增加审核人是我和待审核状态的条件 + searchInfo.put("approveId", ""+InterfaceUtil.getAdminId()); + searchInfo.put("approveStatus", ""+ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus()); + downloadHeader(httpServletResponse , Utils.generateExcelName("待我审核项目报表"), "application/octet-stream"); String[] headers = {"项目名称","项目类型","项目状态","审核状态","当前审核人","项目创建者","部门名称","项目开始时间","项目结束时间","最后更新时间"}; String[] exportColumns = {"name","typeDesc","statusDesc","approveStatusDesc","approveName","creatorName","deptName","startDate","endDate","lastUpdateTime"}; diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index ab71600..4970155 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -39,6 +39,10 @@ public class ProjectService { if(StrUtil.isNotEmpty(searchInfo.get("status")) && !"-1".equals(searchInfo.get("status"))){ queryHelper.addCondition("p.status=?", Integer.parseInt(searchInfo.get("status"))); } + if(StrUtil.isNotEmpty(searchInfo.get("approveId"))){ + int approveId = Integer.parseInt(searchInfo.get("approveId")); + queryHelper.addCondition("p.approve_id=?", approveId); + } if(StrUtil.isNotEmpty(searchInfo.get("approveStatus")) && !"-1".equals(searchInfo.get("approveStatus"))){ int approveStatus = Integer.parseInt(searchInfo.get("approveStatus")); //四种状态满足其一即可