diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java index ff37a24..8234ee7 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java @@ -156,11 +156,12 @@ public class ProjectController extends JeecgController QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap(), customeRuleMap); Page page = new Page(pageNo, pageSize); - //('科技主管部门待提交', '1'); //('不受理', '3'); //('已受理', '4'); //('申请人待提交', '5'); //('申请单位待提交', '6'); + //('科技主管部门待提交(区/县管理员)', '1'); + //('市科技局待提交', '7'); //('市科技局已提交', '8'); //('财政主管理部门待审核', '9'); @@ -169,18 +170,19 @@ public class ProjectController extends JeecgController //申请单位数据 if ("faren_admin".equals(loginUser.getRoleCode())) { queryWrapper.eq("sys_org_code", loginUser.getOrgCode()); - queryWrapper.eq("project_status", 6); + queryWrapper.in("project_status", 6,1,7,8,9,10); + } // 区/县管理员数据 if ("quxian_admin".equals(loginUser.getRoleCode())) { queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode()); - queryWrapper.eq("project_status", 1); + queryWrapper.in("project_status", 1,7,8,9,10); } if ("kejiju_admin".equals(loginUser.getRoleCode())) { - queryWrapper.in("project_status", 7, 8); + queryWrapper.in("project_status", 7,8,9,10); } if ("caizheng_admin".equals(loginUser.getRoleCode())) { - queryWrapper.in("budget_status", 9, 10); + queryWrapper.in("budget_status", 8,9,10); } IPage pageList = projectService.page(page, queryWrapper); return Result.OK(pageList); @@ -420,6 +422,7 @@ public class ProjectController extends JeecgController // project.setProjectStatus("10"); project.setBudgetStatus("10"); + project.setProjectStatus(project1.getProjectStatus()); log.setBudgetStatus("10"); log.setOperationMark("财政主管部门审核通过"); } diff --git a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue index 9c224f1..9d569c4 100644 --- a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue @@ -42,10 +42,22 @@ +
+ +