人员部门关系

src/main/java/cn/palmte/work/controller/backend/ProjectController.java

@@ -44,7 +44,7 @@ public class ProjectController extends BaseController {
     private static final Logger logger = LoggerFactory.getLogger(ProjectController.class);
 
     @Autowired
-    private DeptRepository deptRepository;
+    private DeptService deptService;
     @Autowired
     private ProjectService projectService;
     @Autowired
@@ -77,9 +77,10 @@ public class ProjectController extends BaseController {
         //当前登录人的角色类型
         model.put("keywords", keywords);
         model.put("adminId", InterfaceUtil.getAdminId());
-        model.put("deptList", deptRepository.findAll());
+        model.put("deptList", deptService.findAll());
         ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords, model);
         model.put("pager", projectService.list(searchInfo, pageNumber, pageSize));
+        ///
         /*Page<Project> myApproveProjects = projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), 1, Integer.MAX_VALUE);
         model.put("hasApproveProjects", CollectionUtil.isNotEmpty(myApproveProjects.getList()) ? "1" : "0");*/
         return "admin/project_list";
@@ -104,9 +105,7 @@ public class ProjectController extends BaseController {
      */
     @RequestMapping("/add")
     public String add(Map<String, Object> model) {
-
+        Dept one = deptService.findUserDept(InterfaceUtil.getAdmin());
-        //TODO 根据登录人的部门
-        Dept one = deptRepository.findOne(1);
         model.put("dept", one);
 
         return "admin/project_estimate_add";
@@ -132,10 +131,6 @@ public class ProjectController extends BaseController {
 
     /**
      * 去编辑概算项目页面
-     *
-     * @param id
-     * @param model
-     * @return
      */
     @RequestMapping("/edit")
     public String edit(@RequestParam("id") int id, Map<String, Object> model) {
@@ -150,10 +145,6 @@ public class ProjectController extends BaseController {
 
     /**
      * 编辑概算项目保存
-     * @param project
-     * @param estimateBean
-     * @param model
-     * @return
      */
     @RequestMapping("/estimateEditSave")
     public String estimateEditSave(Project project, EstimateBean estimateBean, Map<String, Object> model) {
@@ -164,11 +155,6 @@ public class ProjectController extends BaseController {
 
     /**
      * 编辑概算项目保存并提交审批
-     * @param project
-     * @param estimateBean
-     * @param model
-     * @return
-     * @throws Exception
      */
     @RequestMapping("/estimateEditSaveAndApprove")
     public String estimateEditSaveAndApprove(Project project, EstimateBean estimateBean, Map<String, Object> model) throws Exception {
@@ -322,7 +308,7 @@ public class ProjectController extends BaseController {
                               Map<String, Object> model) {
         //当前登录人的角色类型
         model.put("keywords", keywords);
-        model.put("deptList", deptRepository.findAll());
+        model.put("deptList", deptService.findAll());
         ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords, model);
         model.put("pager", projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pageNumber, pageSize));
         return "admin/project_list_approve";
@@ -344,10 +330,6 @@ public class ProjectController extends BaseController {
 
     /**
      * 项目查看页面
-     *
-     * @param id
-     * @param model
-     * @return
      */
     @RequestMapping("/detail")
     public String detail(@RequestParam("id") int id, Map<String, Object> model) {
@@ -385,9 +367,6 @@ public class ProjectController extends BaseController {
 
     /**
      * 审核页面
-     * @param id
-     * @param model
-     * @return
      */
     @RequestMapping("/approve")
     public String approve(@RequestParam("id") int id, @RequestParam String listFrom, Map<String, Object> model) {
@@ -424,9 +403,6 @@ public class ProjectController extends BaseController {
 
     /**
      * 审批完成任务
-     * @param projectId
-     * @param json
-     * @return
      */
     @ResponseBody
     @RequestMapping("/completeTask/{projectId}")
@@ -437,9 +413,6 @@ public class ProjectController extends BaseController {
 
     /**
      * 查看审核流程
-     * @param projectId
-     * @param model
-     * @return
      */
     @RequestMapping("/taskRecords/{projectId}")
     public String taskRecords(@PathVariable int projectId, Map<String, Object> model) {
@@ -467,10 +440,6 @@ public class ProjectController extends BaseController {
 
     /**
      * 流程实列图片
-     *
-     * @param response
-     * @param projectId
-     * @throws Exception
      */
     @RequestMapping("/procInsPng/{projectId}")
     public void png(HttpServletResponse response, @PathVariable("projectId") int projectId) throws Exception {

src/main/java/cn/palmte/work/service/DeptService.java

@@ -0,0 +1,27 @@
+package cn.palmte.work.service;
+
+import cn.palmte.work.model.Admin;
+import cn.palmte.work.model.Dept;
+import cn.palmte.work.model.DeptRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author xiongshiyan at 2021/10/29 , contact me with email yanshixiong@126.com or phone 15208384257
+ */
+@Service
+public class DeptService {
+    @Autowired
+    private DeptRepository deptRepository;
+
+    public List<Dept> findAll(){
+        return deptRepository.findAll();
+    }
+
+    public Dept findUserDept(Admin admin){
+        return deptRepository.findOne(admin.getDeptId());
+    }
+
+}

src/main/java/cn/palmte/work/service/ProjectService.java

@@ -34,7 +34,7 @@ public class ProjectService {
     private ProjectInstanceRelationRepository projectInstanceRelationRepository;
 
 
-    private QueryHelper getQueryHelper(Map<String, String> searchInfo, int pageNumber, int pageSize) {
+    private QueryHelper getQueryHelper(Map<String, String> searchInfo) {
         /*"CASE p.type WHEN 1 THEN '工程集成类' WHEN 2 THEN '设备集成类' WHEN 3 THEN '战略合作类' ELSE '未知' AS typeDesc," +
                 "CASE p.status WHEN 0 THEN '草稿' WHEN 1 THEN '项目创建' WHEN 5 THEN '概算完成' WHEN 10 THEN '预算完成' WHEN 15 THEN '结算中' WHEN 20 THEN '决算完成' ELSE '未知' AS statusDesc," +
                 "CASE p.approve_status WHEN 0 THEN '待审核' WHEN 1 THEN '审核通过' WHEN 2 THEN '审核不通过' ELSE '未知' AS approveStatusDesc," +
@@ -43,10 +43,11 @@ 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"))){
+        ///
+        /*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"));
             //四种状态满足其一即可
@@ -95,7 +96,8 @@ public class ProjectService {
     }
 
     public Page<Project> list(Map<String, String> searchInfo, int pageNumber, int pageSize){
-        QueryHelper queryHelper = getQueryHelper(searchInfo, pageNumber, pageSize);
+        QueryHelper queryHelper = getQueryHelper(searchInfo);
+        //TODO 增加权限过滤
         return pagination.paginate(queryHelper.getSql(), Project.class,pageNumber,pageSize);
     }
 
@@ -104,11 +106,13 @@ public class ProjectService {
      * 找到待我审核项目
      */
     public Page<Project> findMyApproveProjects(Map<String, String> searchInfo, int adminId, int pageNumber, int pageSize){
-        //在列表基础上增加审核人是我和待审核状态的条件
+        //待审核状态的条件
-        searchInfo.put("approveId", ""+ adminId);
         searchInfo.put("approveStatus", ""+ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus());
 
-        return list(searchInfo, pageNumber, pageSize);
+        QueryHelper queryHelper = getQueryHelper(searchInfo);
+        //在列表基础上增加审核人是我
+        queryHelper.addCondition("p.approve_id=?", adminId);
+        return pagination.paginate(queryHelper.getSql(), Project.class,pageNumber,pageSize);
     }