mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

待我审核项目:增加过滤条件

master
xxssyyyyssxx 2021-11-08 16:38:02 +08:00
parent 51bd4838f3
commit 3b2d2f69d0
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -277,6 +277,11 @@ public class ProjectController extends BaseController{
model.put("keywords",keywords); model.put("keywords",keywords);
model.put("deptList", deptRepository.findAll()); model.put("deptList", deptRepository.findAll());
ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords,model); ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords,model);
//在列表基础上增加审核人是我和待审核状态的条件
searchInfo.put("approveId", ""+InterfaceUtil.getAdminId());
searchInfo.put("approveStatus", ""+ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus());
model.put("pager",projectService.list(searchInfo,pageNumber,pageSize)); model.put("pager",projectService.list(searchInfo,pageNumber,pageSize));
return "admin/project_list_approve"; return "admin/project_list_approve";
} }
@ -287,6 +292,11 @@ public class ProjectController extends BaseController{
@RequestMapping("/exportApprove") @RequestMapping("/exportApprove")
public void exportApprove(@RequestParam(value = "keywords",required = false) String keywords, HttpServletResponse httpServletResponse) throws IOException { public void exportApprove(@RequestParam(value = "keywords",required = false) String keywords, HttpServletResponse httpServletResponse) throws IOException {
Map<String, String> searchInfo = getSearchInfo(keywords); Map<String, String> searchInfo = getSearchInfo(keywords);
//在列表基础上增加审核人是我和待审核状态的条件
searchInfo.put("approveId", ""+InterfaceUtil.getAdminId());
searchInfo.put("approveStatus", ""+ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus());
downloadHeader(httpServletResponse , Utils.generateExcelName("待我审核项目报表"), "application/octet-stream"); downloadHeader(httpServletResponse , Utils.generateExcelName("待我审核项目报表"), "application/octet-stream");
String[] headers = {"项目名称","项目类型","项目状态","审核状态","当前审核人","项目创建者","部门名称","项目开始时间","项目结束时间","最后更新时间"}; String[] headers = {"项目名称","项目类型","项目状态","审核状态","当前审核人","项目创建者","部门名称","项目开始时间","项目结束时间","最后更新时间"};
String[] exportColumns = {"name","typeDesc","statusDesc","approveStatusDesc","approveName","creatorName","deptName","startDate","endDate","lastUpdateTime"}; String[] exportColumns = {"name","typeDesc","statusDesc","approveStatusDesc","approveName","creatorName","deptName","startDate","endDate","lastUpdateTime"};

4
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -39,6 +39,10 @@ public class ProjectService {
if(StrUtil.isNotEmpty(searchInfo.get("status")) && !"-1".equals(searchInfo.get("status"))){ if(StrUtil.isNotEmpty(searchInfo.get("status")) && !"-1".equals(searchInfo.get("status"))){
queryHelper.addCondition("p.status=?", Integer.parseInt(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"))){ if(StrUtil.isNotEmpty(searchInfo.get("approveStatus")) && !"-1".equals(searchInfo.get("approveStatus"))){
int approveStatus = Integer.parseInt(searchInfo.get("approveStatus")); int approveStatus = Integer.parseInt(searchInfo.get("approveStatus"));
//四种状态满足其一即可 //四种状态满足其一即可