隐患审核问题修改

huaxin-admin/src/main/java/com/zehong/web/controller/checktask/TDangerController.java

@@ -9,9 +9,11 @@ import com.zehong.common.core.page.TableDataInfo;
 import com.zehong.common.enums.BusinessType;
 import com.zehong.common.utils.SecurityUtils;
 import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.SysPost;
 import com.zehong.system.domain.TDanger;
 import com.zehong.system.domain.TRectifyGroupMemberInfo;
 import com.zehong.system.domain.vo.DangerApprovalVo;
+import com.zehong.system.service.ISysUserService;
 import com.zehong.system.service.ITDangerService;
 import com.zehong.system.service.ITRectifyGroupMemberInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,9 +41,12 @@ public class TDangerController extends BaseController
     @Autowired
     private ITRectifyGroupMemberInfoService tRectifyGroupMemberInfoService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 审核权限映射关系
-     * 1.班长审核 2.部门经理审核 3.安全部审核 4.安全总监审核通过通过 5.常务副总审核归档 6.总经理审核结束
+     * 1.班长审核 2.部门经理审核 3.安全部审核 4.安全总监审核 5.常务副总审核 6.总经理审核结束
      */
     private final Map<String,String> approvalPermission = new HashMap<String,String>(){{
         put("2","minister");
@@ -75,8 +80,7 @@ public class TDangerController extends BaseController
         SysUser userInfo = SecurityUtils.getLoginUser().getUser();
         for(TDanger danger : list){
             //判断隐患为待审核状态
-            if("3".equals(danger.getStatus())){
-                Boolean hasApprovalPermission = false;
+            if(3 == danger.getStatus()){
                 if("1".equals(danger.getApprovalStatus())){
                     //上报人班长审核
                     Integer reportId = danger.getAdminId();
@@ -89,10 +93,10 @@ public class TDangerController extends BaseController
                             leader.setGroupId(team.getGroupId());
                             leader.setPost("1");
                             leader.setUserId(userInfo.getUserId());
-                            List<TRectifyGroupMemberInfo> leaderInfo = tRectifyGroupMemberInfoService.selectTRectifyGroupMemberInfoList(memberInfo);
+                            List<TRectifyGroupMemberInfo> leaderInfo = tRectifyGroupMemberInfoService.selectTRectifyGroupMemberInfoList(leader);
                             if(!CollectionUtils.isEmpty(leaderInfo)){
                                 danger.setHasApprovalPermission(true);
-                                return;
+                                break;
                             }
                         }
                     }
@@ -104,7 +108,10 @@ public class TDangerController extends BaseController
                     }
                 }else{
                     String post = approvalPermission.get(danger.getApprovalStatus());
-                    if(userInfo.getPostCode().equals(post)){
+                    //查询岗位信息
+                    List<SysPost> userPost = sysUserService.selectPostsByUserName(userInfo.getUserName());
+                    boolean flag = userPost.stream().anyMatch(item -> post.equals(item.getPostCode()));
+                    if(flag){
                         danger.setHasApprovalPermission(true);
                     }
                 }

huaxin-system/src/main/java/com/zehong/system/service/ISysUserService.java

 package com.zehong.system.service;
 
-import java.util.List;
 import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.system.domain.SysPost;
+
+import java.util.List;
 
 /**
  * 用户 业务层
@@ -51,6 +53,15 @@ public interface ISysUserService
      */
     public String selectUserPostGroup(String userName);
 
+
+    /**
+     * 查询用户所属岗位组
+     *
+     * @param userName 用户名
+     * @return 结果
+     */
+    List<SysPost> selectPostsByUserName(String userName);
+
     /**
      * 校验用户名称是否唯一
      * 

huaxin-system/src/main/java/com/zehong/system/service/impl/SysUserServiceImpl.java

@@ -137,6 +137,18 @@ public class SysUserServiceImpl implements ISysUserService
         return idsStr.toString();
     }
 
+
+    /**
+     * 查询用户所属岗位组
+     *
+     * @param userName 用户名
+     * @return 结果
+     */
+    @Override
+    public List<SysPost> selectPostsByUserName(String userName) {
+        return postMapper.selectPostsByUserName(userName);
+    }
+
     /**
      * 校验用户名称是否唯一
      * 

huaxin-system/src/main/java/com/zehong/system/service/impl/TDangerServiceImpl.java

@@ -222,23 +222,23 @@ public class TDangerServiceImpl implements ITDangerService
             if("0".equals(approvalVo.getState())){
                 //审核通过
                 //获取隐患级别
-                if("1".equals(danger.getLevel())){
+                if(1 == danger.getLevel()){
                     int status = Integer.parseInt(danger.getApprovalStatus());
                     //重大隐患
-                    if(status < 5){
+                    if(status < 6){
                         update.setApprovalStatus(String.valueOf(status+1));
                     }else{
-                        update.setApprovalStatus(String.valueOf(status+1));
+                        //update.setApprovalStatus(String.valueOf(status+1));
                         update.setStatus(4);
                     }
 
                 }else{
                     //一般隐患
                     int status = Integer.parseInt(danger.getApprovalStatus());
-                    if(status < 2){
+                    if(status < 3){
                         update.setApprovalStatus(String.valueOf(status+1));
                     }else{
-                        update.setApprovalStatus(String.valueOf(status+1));
+                        //update.setApprovalStatus(String.valueOf(status+1));
                         update.setStatus(4);
                     }
                 }

huaxin-web/src/views/checktask/danger/components/Approval.vue

@@ -64,6 +64,7 @@
               dangerApproval(data).then(res =>{
                 this.$message.success("审核成功");
                 this.approvalOpen = false;
+                this.$parent.getList();
               })
             }
           })