隐患责任归属人和隐患审核去除安全部审核

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

@@ -235,6 +235,8 @@ public class TDangerServiceImpl implements ITDangerService
      * @param approvalList 隐患审核信息
      * @return
      */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public int dangerApproval(List<DangerApprovalVo> approvalList){
         for(DangerApprovalVo approvalVo : approvalList){
             //获取隐患信息
@@ -248,7 +250,12 @@ public class TDangerServiceImpl implements ITDangerService
                     int status = Integer.parseInt(danger.getApprovalStatus());
                     //重大隐患
                     if(status < 6){
-                        update.setApprovalStatus(String.valueOf(status+1));
+                        //2026-09-20 需求变更去掉安全部审核
+                        if(status == 2){
+                            update.setApprovalStatus(String.valueOf(status+2));
+                        }else{
+                            update.setApprovalStatus(String.valueOf(status+1));
+                        }
                     }else{
                         //update.setApprovalStatus(String.valueOf(status+1));
                         update.setStatus(4);
@@ -260,7 +267,8 @@ public class TDangerServiceImpl implements ITDangerService
                 }else{
                     //一般隐患
                     int status = Integer.parseInt(danger.getApprovalStatus());
-                    if(status < 3){
+                    if(status < 2){
+                        //2026-09-20 需求变更去掉安全部审核
                         update.setApprovalStatus(String.valueOf(status+1));
                     }else{
                         //update.setApprovalStatus(String.valueOf(status+1));

huaxin-system/src/main/resources/mapper/system/TDangerMapper.xml

@@ -109,12 +109,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     else '-'
                 end
             ) as meterNum,
-            (select nick_name from sys_user where user_id = danger.reform_id) as reformName,
+            ref.nick_name as reformName,
             us.nick_name as reportName,
             (select nick_name from sys_user where user_id = danger.check_id) as checkName
         FROM
             t_danger danger
         LEFT JOIN sys_user us ON us.user_id = danger.admin_id
+        LEFT JOIN sys_user ref ON ref.user_id = danger.reform_id
     </sql>
 
     <select id="selectTDangerList" parameterType="TDanger" resultMap="TDangerResult">
@@ -151,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="beginDate != null and endDate != null"> and danger.create_time BETWEEN #{beginDate} and #{endDate}</if>
             <if test="branch != null "> and danger.branch = #{branch}</if>
             <if test="params != null and params.approvalCondition != null and params.approvalCondition != ''">${params.approvalCondition}</if>
+            <if test="reformName != null  and reformName != ''"> and ref.nick_name like concat('%',#{reformName},'%')</if>
         </where>
         ORDER BY create_time DESC
     </select>

huaxin-system/src/main/resources/mapper/system/TRectifyGroupMemberInfoMapper.xml

@@ -47,6 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null  and isDel != ''"> and member.is_del = #{isDel}</if>
             <if test="remarks != null  and remarks != ''"> and member.remarks = #{remarks}</if>
             <if test="type != null  and type != ''"> and info.type = #{type}</if>
+            <if test="nickName != null and nickName != ''">
+                AND su.nick_name like concat('%', #{nickName}, '%')
+            </if>
         </where>
     </select>
     

huaxin-web/src/views/checktask/danger/index.vue

@@ -50,6 +50,21 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="责任归属人" prop="reformName">
+        <el-autocomplete
+          class="inline-input"
+          v-model="queryParams.reformName"
+          :fetch-suggestions="queryReformSearch"
+          placeholder="请输入责任归属人"
+          :trigger-on-focus="false"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        ></el-autocomplete>
+      </el-form-item>
+
+
+
       <el-form-item label="上报人" prop="reportName">
         <el-input
           v-model="queryParams.reportName"
@@ -384,7 +399,8 @@ export default {
         reportName: null,
         beginDate: null,
         endDate : null,
-        branch:null
+        branch:null,
+        reformName: null,
       },
       // 表单参数
       form: {},
@@ -426,7 +442,8 @@ export default {
       devicePos: [],
       dangerSource: [],
       reportTimeRange: [],
-      memberInfoList: []
+      memberInfoList: [],
+      reformMemberInfoList: []
     };
   },
   created() {
@@ -627,10 +644,18 @@ export default {
       memberInfoList({type: '2',post: '1'}).then(res =>{
         if(res.code == 200){
           this.memberInfoList = res.data;
-          console.log("===============>>>>",res.data)
         }
       })
-    }
+    },
+    //联想责任归属人
+    queryReformSearch(queryString, cb){
+      memberInfoList({nickName:queryString}).then(res =>{
+        if(res.code == 200 && res.data){
+          let result = res.data.map(item => ({value: item.nickName}));
+          cb(result);
+        }
+      })
+    },
   }
 };
 </script>