隐患整改修改

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

+package com.zehong.web.controller.checktask;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TDangerApprovalRecord;
+import com.zehong.system.service.ITDangerApprovalRecordService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 隐患审核记录Controller
+ * 
+ * @author zehong
+ * @date 2026-07-17
+ */
+@RestController
+@RequestMapping("/danger/approval")
+public class TDangerApprovalRecordController extends BaseController
+{
+    @Autowired
+    private ITDangerApprovalRecordService tDangerApprovalRecordService;
+
+    /**
+     * 查询隐患审核记录列表
+     */
+   // @PreAuthorize("@ss.hasPermi('danger:approval:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TDangerApprovalRecord tDangerApprovalRecord)
+    {
+        startPage();
+        List<TDangerApprovalRecord> list = tDangerApprovalRecordService.selectTDangerApprovalRecordList(tDangerApprovalRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出隐患审核记录列表
+     */
+   // @PreAuthorize("@ss.hasPermi('danger:approval:export')")
+    @Log(title = "隐患审核记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TDangerApprovalRecord tDangerApprovalRecord)
+    {
+        List<TDangerApprovalRecord> list = tDangerApprovalRecordService.selectTDangerApprovalRecordList(tDangerApprovalRecord);
+        ExcelUtil<TDangerApprovalRecord> util = new ExcelUtil<TDangerApprovalRecord>(TDangerApprovalRecord.class);
+        return util.exportExcel(list, "隐患审核记录数据");
+    }
+
+    /**
+     * 获取隐患审核记录详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('danger:approval:query')")
+    @GetMapping(value = "/{approvalId}")
+    public AjaxResult getInfo(@PathVariable("approvalId") Long approvalId)
+    {
+        return AjaxResult.success(tDangerApprovalRecordService.selectTDangerApprovalRecordById(approvalId));
+    }
+
+    /**
+     * 新增隐患审核记录
+     */
+    //@PreAuthorize("@ss.hasPermi('danger:approval:add')")
+    @Log(title = "隐患审核记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TDangerApprovalRecord tDangerApprovalRecord)
+    {
+        return toAjax(tDangerApprovalRecordService.insertTDangerApprovalRecord(tDangerApprovalRecord));
+    }
+
+    /**
+     * 修改隐患审核记录
+     */
+    //@PreAuthorize("@ss.hasPermi('danger:approval:edit')")
+    @Log(title = "隐患审核记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TDangerApprovalRecord tDangerApprovalRecord)
+    {
+        return toAjax(tDangerApprovalRecordService.updateTDangerApprovalRecord(tDangerApprovalRecord));
+    }
+
+    /**
+     * 删除隐患审核记录
+     */
+    //@PreAuthorize("@ss.hasPermi('danger:approval:remove')")
+    @Log(title = "隐患审核记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{approvalIds}")
+    public AjaxResult remove(@PathVariable Long[] approvalIds)
+    {
+        return toAjax(tDangerApprovalRecordService.deleteTDangerApprovalRecordByIds(approvalIds));
+    }
+}

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

@@ -10,12 +10,17 @@ import com.zehong.common.enums.BusinessType;
 import com.zehong.common.utils.SecurityUtils;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.system.domain.TDanger;
+import com.zehong.system.domain.TRectifyGroupMemberInfo;
+import com.zehong.system.domain.vo.DangerApprovalVo;
 import com.zehong.system.service.ITDangerService;
+import com.zehong.system.service.ITRectifyGroupMemberInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -31,6 +36,20 @@ public class TDangerController extends BaseController
     @Autowired
     private ITDangerService tDangerService;
 
+    @Autowired
+    private ITRectifyGroupMemberInfoService tRectifyGroupMemberInfoService;
+
+    /**
+     * 审核权限映射关系
+     * 1.班长审核 2.部门经理审核 3.安全部审核 4.安全总监审核通过通过 5.常务副总审核归档 6.总经理审核结束
+     */
+    private final Map<String,String> approvalPermission = new HashMap<String,String>(){{
+        put("2","minister");
+        put("4","se");
+        put("5","fuzong");
+        put("6","manager");
+    }};
+
     /**
      * 查询安检隐患整改列表
      */
@@ -44,9 +63,55 @@ public class TDangerController extends BaseController
             tDanger.setIsVisitor("1");
         }
         List<TDanger> list = tDangerService.selectTDangerList(tDanger);
+        setApprovalPermission(list);
         return getDataTable(list);
     }
 
+    /**
+     * 设置审核权限
+     * @param list 隐患列表
+     */
+    private void setApprovalPermission(List<TDanger> list){
+        SysUser userInfo = SecurityUtils.getLoginUser().getUser();
+        for(TDanger danger : list){
+            //判断隐患为待审核状态
+            if("3".equals(danger.getStatus())){
+                Boolean hasApprovalPermission = false;
+                if("1".equals(danger.getApprovalStatus())){
+                    //上报人班长审核
+                    Integer reportId = danger.getAdminId();
+                    TRectifyGroupMemberInfo memberInfo = new TRectifyGroupMemberInfo();
+                    memberInfo.setUserId(Long.valueOf(reportId));
+                    List<TRectifyGroupMemberInfo> memberInfoList = tRectifyGroupMemberInfoService.selectTRectifyGroupMemberInfoList(memberInfo);
+                    if(!CollectionUtils.isEmpty(memberInfoList)){
+                        for(TRectifyGroupMemberInfo team : memberInfoList){
+                            TRectifyGroupMemberInfo leader = new TRectifyGroupMemberInfo();
+                            leader.setGroupId(team.getGroupId());
+                            leader.setPost("1");
+                            leader.setUserId(userInfo.getUserId());
+                            List<TRectifyGroupMemberInfo> leaderInfo = tRectifyGroupMemberInfoService.selectTRectifyGroupMemberInfoList(memberInfo);
+                            if(!CollectionUtils.isEmpty(leaderInfo)){
+                                danger.setHasApprovalPermission(true);
+                                return;
+                            }
+                        }
+                    }
+
+                }else if("3".equals(danger.getApprovalStatus())){
+                    //安全部审核
+                    if("安全管理部".equals(userInfo.getDept().getDeptName())){
+                        danger.setHasApprovalPermission(true);
+                    }
+                }else{
+                    String post = approvalPermission.get(danger.getApprovalStatus());
+                    if(userInfo.getPostCode().equals(post)){
+                        danger.setHasApprovalPermission(true);
+                    }
+                }
+            }
+        }
+    }
+
     @GetMapping("/dangerInfoList")
     public TableDataInfo dangerInfoList(TDanger tDanger){
         startPage();
@@ -153,7 +218,7 @@ public class TDangerController extends BaseController
     public TableDataInfo selectTDangerListByType(TDanger tDanger){
         startPage();
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        //客服运营部
+        /*//客服运营部
         if(200 == user.getDeptId()){
             tDanger.setAdminId(user.getUserId().intValue());
             tDanger.setFlag(2);
@@ -167,9 +232,20 @@ public class TDangerController extends BaseController
         //205 安全管理部
         if(205 != user.getDeptId() && 200 != user.getDeptId() && 102 != user.getDeptId()){
             tDanger.setAdminId(user.getUserId().intValue());
-        }
+        }*/
+        tDanger.setAdminId(user.getUserId().intValue());
+        tDanger.setReformId(user.getUserId().intValue());
         List<TDanger> list = tDangerService.selectTDangerListByType(tDanger);
         return getDataTable(list);
     }
 
+    /**
+     * 隐患审核
+     * @param approvalVo 隐患审核信息
+     * @return
+     */
+    @PostMapping("/dangerApproval")
+    public AjaxResult dangerApproval(@RequestBody List<DangerApprovalVo> approvalVo) {
+        return toAjax(tDangerService.dangerApproval(approvalVo));
+    }
 }

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

+package com.zehong.web.controller.checktask;
+
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.page.TableDataInfo;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.TRectifyGroupMemberInfo;
+import com.zehong.system.service.ITRectifyGroupMemberInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 整改组内成员信息Controller
+ * 
+ * @author zehong
+ * @date 2026-07-16
+ */
+@RestController
+@RequestMapping("/danger/member")
+public class TRectifyGroupMemberInfoController extends BaseController
+{
+    @Autowired
+    private ITRectifyGroupMemberInfoService tRectifyGroupMemberInfoService;
+
+    /**
+     * 查询整改组内成员信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TRectifyGroupMemberInfo tRectifyGroupMemberInfo)
+    {
+        startPage();
+        List<TRectifyGroupMemberInfo> list = tRectifyGroupMemberInfoService.selectTRectifyGroupMemberInfoList(tRectifyGroupMemberInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出整改组内成员信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:export')")
+    @Log(title = "整改组内成员信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TRectifyGroupMemberInfo tRectifyGroupMemberInfo)
+    {
+        List<TRectifyGroupMemberInfo> list = tRectifyGroupMemberInfoService.selectTRectifyGroupMemberInfoList(tRectifyGroupMemberInfo);
+        ExcelUtil<TRectifyGroupMemberInfo> util = new ExcelUtil<TRectifyGroupMemberInfo>(TRectifyGroupMemberInfo.class);
+        return util.exportExcel(list, "整改组内成员信息数据");
+    }
+
+    /**
+     * 获取整改组内成员信息详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:query')")
+    @GetMapping(value = "/{memberId}")
+    public AjaxResult getInfo(@PathVariable("memberId") Long memberId)
+    {
+        return AjaxResult.success(tRectifyGroupMemberInfoService.selectTRectifyGroupMemberInfoById(memberId));
+    }
+
+    /**
+     * 新增整改组内成员信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:add')")
+    @Log(title = "整改组内成员信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TRectifyGroupMemberInfo tRectifyGroupMemberInfo)
+    {
+        return toAjax(tRectifyGroupMemberInfoService.insertTRectifyGroupMemberInfo(tRectifyGroupMemberInfo));
+    }
+
+    /**
+     * 修改整改组内成员信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:edit')")
+    @Log(title = "整改组内成员信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TRectifyGroupMemberInfo tRectifyGroupMemberInfo)
+    {
+        return toAjax(tRectifyGroupMemberInfoService.updateTRectifyGroupMemberInfo(tRectifyGroupMemberInfo));
+    }
+
+    /**
+     * 删除整改组内成员信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:remove')")
+    @Log(title = "整改组内成员信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{memberIds}")
+    public AjaxResult remove(@PathVariable Long[] memberIds)
+    {
+        return toAjax(tRectifyGroupMemberInfoService.deleteTRectifyGroupMemberInfoByIds(memberIds));
+    }
+
+    /**
+     * 根据职位获取整改人信息
+     * @param map
+     * @return
+     */
+    @PostMapping("/selectRectifyUserByPostCode")
+    public AjaxResult selectRectifyUserByPostCode(@RequestBody Map<String,Object> map) {
+        return AjaxResult.success(tRectifyGroupMemberInfoService.selectRectifyUserByPostCode(map));
+    }
+
+
+    /**
+     * 根据登录人职位获取可选成员小程序接口
+     * @return
+     */
+    @GetMapping("/selectMemberByUserPost")
+    public AjaxResult selectMemberByUserPost(){
+        return AjaxResult.success(tRectifyGroupMemberInfoService.selectMemberByUserPost());
+    }
+}

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

+package com.zehong.web.controller.checktask;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TRectifyPersonGroupInfo;
+import com.zehong.system.service.ITRectifyPersonGroupInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 整改人员分组信息Controller
+ * 
+ * @author zehong
+ * @date 2026-07-16
+ */
+@RestController
+@RequestMapping("/danger/group")
+public class TRectifyPersonGroupInfoController extends BaseController
+{
+    @Autowired
+    private ITRectifyPersonGroupInfoService tRectifyPersonGroupInfoService;
+
+    /**
+     * 查询整改人员分组信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TRectifyPersonGroupInfo tRectifyPersonGroupInfo)
+    {
+        startPage();
+        List<TRectifyPersonGroupInfo> list = tRectifyPersonGroupInfoService.selectTRectifyPersonGroupInfoList(tRectifyPersonGroupInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出整改人员分组信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:export')")
+    @Log(title = "整改人员分组信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TRectifyPersonGroupInfo tRectifyPersonGroupInfo)
+    {
+        List<TRectifyPersonGroupInfo> list = tRectifyPersonGroupInfoService.selectTRectifyPersonGroupInfoList(tRectifyPersonGroupInfo);
+        ExcelUtil<TRectifyPersonGroupInfo> util = new ExcelUtil<TRectifyPersonGroupInfo>(TRectifyPersonGroupInfo.class);
+        return util.exportExcel(list, "整改人员分组信息数据");
+    }
+
+    /**
+     * 获取整改人员分组信息详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:query')")
+    @GetMapping(value = "/{groupId}")
+    public AjaxResult getInfo(@PathVariable("groupId") Long groupId)
+    {
+        return AjaxResult.success(tRectifyPersonGroupInfoService.selectTRectifyPersonGroupInfoById(groupId));
+    }
+
+    /**
+     * 新增整改人员分组信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:add')")
+    @Log(title = "整改人员分组信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TRectifyPersonGroupInfo tRectifyPersonGroupInfo)
+    {
+        return toAjax(tRectifyPersonGroupInfoService.insertTRectifyPersonGroupInfo(tRectifyPersonGroupInfo));
+    }
+
+    /**
+     * 修改整改人员分组信息
+     */
+   // @PreAuthorize("@ss.hasPermi('system:info:edit')")
+    @Log(title = "整改人员分组信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TRectifyPersonGroupInfo tRectifyPersonGroupInfo)
+    {
+        return toAjax(tRectifyPersonGroupInfoService.updateTRectifyPersonGroupInfo(tRectifyPersonGroupInfo));
+    }
+
+    /**
+     * 删除整改人员分组信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:info:remove')")
+    @Log(title = "整改人员分组信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{groupIds}")
+    public AjaxResult remove(@PathVariable Long[] groupIds)
+    {
+        return toAjax(tRectifyPersonGroupInfoService.deleteTRectifyPersonGroupInfoByIds(groupIds));
+    }
+}

huaxin-framework/src/main/java/com/zehong/framework/web/service/UserDetailsServiceImpl.java

@@ -34,7 +34,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
     {
         SysUser user ;
-        if(username.substring(0,4).equals("XCX_")){
+        if(username.length() > 4 && username.substring(0,4).equals("XCX_")){
             user = userService.selectUserByUserName(username.substring(4));
         }else{
             user = userService.selectUserByUserName(username);
@@ -54,7 +54,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
             log.info("登录用户：{} 已被停用.", username);
             throw new BaseException("对不起，您的账号已停用");
         }
-        else if (username.substring(0,4).equals("XCX_")&&user.getDeptId()!=200&&user.getDeptId()!=205)
+        else if (username.length() > 4 && username.substring(0,4).equals("XCX_") &&user.getDeptId()!=200&&user.getDeptId()!=205)
         {
             throw new BaseException("没有登录权限");
         }

huaxin-system/src/main/java/com/zehong/system/domain/TDanger.java

@@ -191,6 +191,12 @@ public class TDanger extends BaseEntity
 
     private Long village;
 
+    //1.班长审核2.部门经理审核3.安全部审核4.安全总监审核通过通过5.常务副总审核归档6.总经理审核结束7.归档
+    private String approvalStatus;
+
+    //是否有审核权限
+    private boolean hasApprovalPermission;
+
     public String getBranch() {
         return branch;
     }
@@ -612,6 +618,22 @@ public class TDanger extends BaseEntity
         this.village = village;
     }
 
+    public String getApprovalStatus() {
+        return approvalStatus;
+    }
+
+    public void setApprovalStatus(String approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public boolean isHasApprovalPermission() {
+        return hasApprovalPermission;
+    }
+
+    public void setHasApprovalPermission(boolean hasApprovalPermission) {
+        this.hasApprovalPermission = hasApprovalPermission;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

huaxin-system/src/main/java/com/zehong/system/domain/TDangerApprovalRecord.java

+package com.zehong.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 隐患审核记录对象 t_danger_approval_record
+ * 
+ * @author zehong
+ * @date 2026-07-17
+ */
+public class TDangerApprovalRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long approvalId;
+
+    /** 隐患主键 */
+    @Excel(name = "隐患主键")
+    private Long dangerId;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private Long userId;
+
+    /** 审核状态：0.不通过 1.通过 */
+    @Excel(name = "审核状态：0.不通过 1.通过")
+    private String approvalStatus;
+
+    /** 审核意见 */
+    @Excel(name = "审核意见")
+    private String suggestion;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setApprovalId(Long approvalId) 
+    {
+        this.approvalId = approvalId;
+    }
+
+    public Long getApprovalId() 
+    {
+        return approvalId;
+    }
+    public void setDangerId(Long dangerId) 
+    {
+        this.dangerId = dangerId;
+    }
+
+    public Long getDangerId() 
+    {
+        return dangerId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setApprovalStatus(String approvalStatus) 
+    {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public String getApprovalStatus() 
+    {
+        return approvalStatus;
+    }
+    public void setSuggestion(String suggestion) 
+    {
+        this.suggestion = suggestion;
+    }
+
+    public String getSuggestion() 
+    {
+        return suggestion;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("approvalId", getApprovalId())
+            .append("dangerId", getDangerId())
+            .append("userId", getUserId())
+            .append("approvalStatus", getApprovalStatus())
+            .append("suggestion", getSuggestion())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

huaxin-system/src/main/java/com/zehong/system/domain/TRectifyGroupMemberInfo.java

+package com.zehong.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 整改组内成员信息对象 t_rectify_group_member_info
+ * 
+ * @author zehong
+ * @date 2026-07-16
+ */
+public class TRectifyGroupMemberInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long memberId;
+
+    /** 组主键 */
+    @Excel(name = "组主键")
+    private Long groupId;
+
+    /** 用户主键 */
+    @Excel(name = "用户主键")
+    private Long userId;
+
+    /** 职位：1.组长 2.组员 */
+    @Excel(name = "职位：1.组长 2.组员")
+    private String post;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    private String nickName;
+
+    public void setMemberId(Long memberId) 
+    {
+        this.memberId = memberId;
+    }
+
+    public Long getMemberId() 
+    {
+        return memberId;
+    }
+    public void setGroupId(Long groupId) 
+    {
+        this.groupId = groupId;
+    }
+
+    public Long getGroupId() 
+    {
+        return groupId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setPost(String post) 
+    {
+        this.post = post;
+    }
+
+    public String getPost() 
+    {
+        return post;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("memberId", getMemberId())
+            .append("groupId", getGroupId())
+            .append("userId", getUserId())
+            .append("post", getPost())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

huaxin-system/src/main/java/com/zehong/system/domain/TRectifyPersonGroupInfo.java

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.List;
+
+/**
+ * 整改人员分组信息对象 t_rectify_person_group_info
+ * 
+ * @author zehong
+ * @date 2026-07-16
+ */
+public class TRectifyPersonGroupInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long groupId;
+
+    /** 组名 */
+    @Excel(name = "组名")
+    private String groupName;
+
+    /** 分组类型：1.巡检人 2.维修班 3.网格班 */
+    @Excel(name = "分组类型：1.巡检人 2.维修班 3.网格班")
+    private String type;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    private List<TRectifyGroupMemberInfo> memberInfoList;
+
+    private String memberName;
+
+    public void setGroupId(Long groupId) 
+    {
+        this.groupId = groupId;
+    }
+
+    public Long getGroupId() 
+    {
+        return groupId;
+    }
+    public void setGroupName(String groupName) 
+    {
+        this.groupName = groupName;
+    }
+
+    public String getGroupName() 
+    {
+        return groupName;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    public List<TRectifyGroupMemberInfo> getMemberInfoList() {
+        return memberInfoList;
+    }
+
+    public void setMemberInfoList(List<TRectifyGroupMemberInfo> memberInfoList) {
+        this.memberInfoList = memberInfoList;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("groupId", getGroupId())
+            .append("groupName", getGroupName())
+            .append("type", getType())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

huaxin-system/src/main/java/com/zehong/system/domain/vo/DangerApprovalVo.java

+package com.zehong.system.domain.vo;
+
+public class DangerApprovalVo {
+
+    /**
+     * 隐患主键
+     */
+    private Long id;
+
+    /**
+     * 审核状态 0通过 1不通过
+     */
+    private String state;
+
+    /**
+     * 审核意见
+     */
+    private String suggestion;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getSuggestion() {
+        return suggestion;
+    }
+
+    public void setSuggestion(String suggestion) {
+        this.suggestion = suggestion;
+    }
+}

huaxin-system/src/main/java/com/zehong/system/mapper/TDangerApprovalRecordMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TDangerApprovalRecord;
+
+/**
+ * 隐患审核记录Mapper接口
+ * 
+ * @author zehong
+ * @date 2026-07-17
+ */
+public interface TDangerApprovalRecordMapper 
+{
+    /**
+     * 查询隐患审核记录
+     * 
+     * @param approvalId 隐患审核记录ID
+     * @return 隐患审核记录
+     */
+    public TDangerApprovalRecord selectTDangerApprovalRecordById(Long approvalId);
+
+    /**
+     * 查询隐患审核记录列表
+     * 
+     * @param tDangerApprovalRecord 隐患审核记录
+     * @return 隐患审核记录集合
+     */
+    public List<TDangerApprovalRecord> selectTDangerApprovalRecordList(TDangerApprovalRecord tDangerApprovalRecord);
+
+    /**
+     * 新增隐患审核记录
+     * 
+     * @param tDangerApprovalRecord 隐患审核记录
+     * @return 结果
+     */
+    public int insertTDangerApprovalRecord(TDangerApprovalRecord tDangerApprovalRecord);
+
+    /**
+     * 修改隐患审核记录
+     * 
+     * @param tDangerApprovalRecord 隐患审核记录
+     * @return 结果
+     */
+    public int updateTDangerApprovalRecord(TDangerApprovalRecord tDangerApprovalRecord);
+
+    /**
+     * 删除隐患审核记录
+     * 
+     * @param approvalId 隐患审核记录ID
+     * @return 结果
+     */
+    public int deleteTDangerApprovalRecordById(Long approvalId);
+
+    /**
+     * 批量删除隐患审核记录
+     * 
+     * @param approvalIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTDangerApprovalRecordByIds(Long[] approvalIds);
+}

huaxin-system/src/main/java/com/zehong/system/mapper/TRectifyGroupMemberInfoMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.system.domain.TRectifyGroupMemberInfo;
+
+/**
+ * 整改组内成员信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2026-07-16
+ */
+public interface TRectifyGroupMemberInfoMapper 
+{
+    /**
+     * 查询整改组内成员信息
+     * 
+     * @param memberId 整改组内成员信息ID
+     * @return 整改组内成员信息
+     */
+    public TRectifyGroupMemberInfo selectTRectifyGroupMemberInfoById(Long memberId);
+
+    /**
+     * 查询整改组内成员信息列表
+     * 
+     * @param tRectifyGroupMemberInfo 整改组内成员信息
+     * @return 整改组内成员信息集合
+     */
+    public List<TRectifyGroupMemberInfo> selectTRectifyGroupMemberInfoList(TRectifyGroupMemberInfo tRectifyGroupMemberInfo);
+
+    /**
+     * 新增整改组内成员信息
+     * 
+     * @param tRectifyGroupMemberInfo 整改组内成员信息
+     * @return 结果
+     */
+    public int insertTRectifyGroupMemberInfo(TRectifyGroupMemberInfo tRectifyGroupMemberInfo);
+
+    /**
+     * 修改整改组内成员信息
+     * 
+     * @param tRectifyGroupMemberInfo 整改组内成员信息
+     * @return 结果
+     */
+    public int updateTRectifyGroupMemberInfo(TRectifyGroupMemberInfo tRectifyGroupMemberInfo);
+
+    /**
+     * 删除整改组内成员信息
+     * 
+     * @param memberId 整改组内成员信息ID
+     * @return 结果
+     */
+    public int deleteTRectifyGroupMemberInfoById(Long memberId);
+
+    /**
+     * 批量删除整改组内成员信息
+     * 
+     * @param memberIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTRectifyGroupMemberInfoByIds(Long[] memberIds);
+
+    /**
+     * 获取整改人员人员信息
+     * @return
+     */
+    List<Map<String,Object>> selectRectifyUserByPostCode(Map<String,Object> map);
+
+    int deleteTRectifyGroupMemberInfoByGroupId(Long groupId);
+}

huaxin-system/src/main/java/com/zehong/system/mapper/TRectifyPersonGroupInfoMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TRectifyPersonGroupInfo;
+
+/**
+ * 整改人员分组信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2026-07-16
+ */
+public interface TRectifyPersonGroupInfoMapper 
+{
+    /**
+     * 查询整改人员分组信息
+     * 
+     * @param groupId 整改人员分组信息ID
+     * @return 整改人员分组信息
+     */
+    public TRectifyPersonGroupInfo selectTRectifyPersonGroupInfoById(Long groupId);
+
+    /**
+     * 查询整改人员分组信息列表
+     * 
+     * @param tRectifyPersonGroupInfo 整改人员分组信息
+     * @return 整改人员分组信息集合
+     */
+    public List<TRectifyPersonGroupInfo> selectTRectifyPersonGroupInfoList(TRectifyPersonGroupInfo tRectifyPersonGroupInfo);
+
+    /**
+     * 新增整改人员分组信息
+     * 
+     * @param tRectifyPersonGroupInfo 整改人员分组信息
+     * @return 结果
+     */
+    public int insertTRectifyPersonGroupInfo(TRectifyPersonGroupInfo tRectifyPersonGroupInfo);
+
+    /**
+     * 修改整改人员分组信息
+     * 
+     * @param tRectifyPersonGroupInfo 整改人员分组信息
+     * @return 结果
+     */
+    public int updateTRectifyPersonGroupInfo(TRectifyPersonGroupInfo tRectifyPersonGroupInfo);
+
+    /**
+     * 删除整改人员分组信息
+     * 
+     * @param groupId 整改人员分组信息ID
+     * @return 结果
+     */
+    public int deleteTRectifyPersonGroupInfoById(Long groupId);
+
+    /**
+     * 批量删除整改人员分组信息
+     * 
+     * @param groupIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTRectifyPersonGroupInfoByIds(Long[] groupIds);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TDangerApprovalRecord;
+
+/**
+ * 隐患审核记录Service接口
+ * 
+ * @author zehong
+ * @date 2026-07-17
+ */
+public interface ITDangerApprovalRecordService 
+{
+    /**
+     * 查询隐患审核记录
+     * 
+     * @param approvalId 隐患审核记录ID
+     * @return 隐患审核记录
+     */
+    public TDangerApprovalRecord selectTDangerApprovalRecordById(Long approvalId);
+
+    /**
+     * 查询隐患审核记录列表
+     * 
+     * @param tDangerApprovalRecord 隐患审核记录
+     * @return 隐患审核记录集合
+     */
+    public List<TDangerApprovalRecord> selectTDangerApprovalRecordList(TDangerApprovalRecord tDangerApprovalRecord);
+
+    /**
+     * 新增隐患审核记录
+     * 
+     * @param tDangerApprovalRecord 隐患审核记录
+     * @return 结果
+     */
+    public int insertTDangerApprovalRecord(TDangerApprovalRecord tDangerApprovalRecord);
+
+    /**
+     * 修改隐患审核记录
+     * 
+     * @param tDangerApprovalRecord 隐患审核记录
+     * @return 结果
+     */
+    public int updateTDangerApprovalRecord(TDangerApprovalRecord tDangerApprovalRecord);
+
+    /**
+     * 批量删除隐患审核记录
+     * 
+     * @param approvalIds 需要删除的隐患审核记录ID
+     * @return 结果
+     */
+    public int deleteTDangerApprovalRecordByIds(Long[] approvalIds);
+
+    /**
+     * 删除隐患审核记录信息
+     * 
+     * @param approvalId 隐患审核记录ID
+     * @return 结果
+     */
+    public int deleteTDangerApprovalRecordById(Long approvalId);
+}

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

@@ -2,6 +2,7 @@ package com.zehong.system.service;
 
 import java.util.List;
 import com.zehong.system.domain.TDanger;
+import com.zehong.system.domain.vo.DangerApprovalVo;
 
 /**
  * 安检隐患整改Service接口
@@ -73,4 +74,12 @@ public interface ITDangerService
      * @return
      */
     List<TDanger> selectTDangerListByType(TDanger tDanger);
+
+
+    /**
+     * 隐患审核
+     * @param approvalVo 隐患审核信息
+     * @return
+     */
+    int dangerApproval(List<DangerApprovalVo> approvalVo);
 }

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

+package com.zehong.system.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.system.domain.TRectifyGroupMemberInfo;
+
+/**
+ * 整改组内成员信息Service接口
+ * 
+ * @author zehong
+ * @date 2026-07-16
+ */
+public interface ITRectifyGroupMemberInfoService 
+{
+    /**
+     * 查询整改组内成员信息
+     * 
+     * @param memberId 整改组内成员信息ID
+     * @return 整改组内成员信息
+     */
+    public TRectifyGroupMemberInfo selectTRectifyGroupMemberInfoById(Long memberId);
+
+    /**
+     * 查询整改组内成员信息列表
+     * 
+     * @param tRectifyGroupMemberInfo 整改组内成员信息
+     * @return 整改组内成员信息集合
+     */
+    public List<TRectifyGroupMemberInfo> selectTRectifyGroupMemberInfoList(TRectifyGroupMemberInfo tRectifyGroupMemberInfo);
+
+    /**
+     * 新增整改组内成员信息
+     * 
+     * @param tRectifyGroupMemberInfo 整改组内成员信息
+     * @return 结果
+     */
+    public int insertTRectifyGroupMemberInfo(TRectifyGroupMemberInfo tRectifyGroupMemberInfo);
+
+    /**
+     * 修改整改组内成员信息
+     * 
+     * @param tRectifyGroupMemberInfo 整改组内成员信息
+     * @return 结果
+     */
+    public int updateTRectifyGroupMemberInfo(TRectifyGroupMemberInfo tRectifyGroupMemberInfo);
+
+    /**
+     * 批量删除整改组内成员信息
+     * 
+     * @param memberIds 需要删除的整改组内成员信息ID
+     * @return 结果
+     */
+    public int deleteTRectifyGroupMemberInfoByIds(Long[] memberIds);
+
+    /**
+     * 删除整改组内成员信息信息
+     * 
+     * @param memberId 整改组内成员信息ID
+     * @return 结果
+     */
+    public int deleteTRectifyGroupMemberInfoById(Long memberId);
+
+    /**
+     * 获取整改人员人员信息
+     * @return
+     */
+    List<Map<String,Object>> selectRectifyUserByPostCode(Map<String,Object> map);
+
+    /**
+     * 根据登录人职位获取可选成员
+     * @return
+     */
+    List<TRectifyGroupMemberInfo> selectMemberByUserPost();
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TRectifyPersonGroupInfo;
+
+/**
+ * 整改人员分组信息Service接口
+ * 
+ * @author zehong
+ * @date 2026-07-16
+ */
+public interface ITRectifyPersonGroupInfoService 
+{
+    /**
+     * 查询整改人员分组信息
+     * 
+     * @param groupId 整改人员分组信息ID
+     * @return 整改人员分组信息
+     */
+    public TRectifyPersonGroupInfo selectTRectifyPersonGroupInfoById(Long groupId);
+
+    /**
+     * 查询整改人员分组信息列表
+     * 
+     * @param tRectifyPersonGroupInfo 整改人员分组信息
+     * @return 整改人员分组信息集合
+     */
+    public List<TRectifyPersonGroupInfo> selectTRectifyPersonGroupInfoList(TRectifyPersonGroupInfo tRectifyPersonGroupInfo);
+
+    /**
+     * 新增整改人员分组信息
+     * 
+     * @param tRectifyPersonGroupInfo 整改人员分组信息
+     * @return 结果
+     */
+    public int insertTRectifyPersonGroupInfo(TRectifyPersonGroupInfo tRectifyPersonGroupInfo);
+
+    /**
+     * 修改整改人员分组信息
+     * 
+     * @param tRectifyPersonGroupInfo 整改人员分组信息
+     * @return 结果
+     */
+    public int updateTRectifyPersonGroupInfo(TRectifyPersonGroupInfo tRectifyPersonGroupInfo);
+
+    /**
+     * 批量删除整改人员分组信息
+     * 
+     * @param groupIds 需要删除的整改人员分组信息ID
+     * @return 结果
+     */
+    public int deleteTRectifyPersonGroupInfoByIds(Long[] groupIds);
+
+    /**
+     * 删除整改人员分组信息信息
+     * 
+     * @param groupId 整改人员分组信息ID
+     * @return 结果
+     */
+    public int deleteTRectifyPersonGroupInfoById(Long groupId);
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TDangerApprovalRecordMapper;
+import com.zehong.system.domain.TDangerApprovalRecord;
+import com.zehong.system.service.ITDangerApprovalRecordService;
+
+/**
+ * 隐患审核记录Service业务层处理
+ * 
+ * @author zehong
+ * @date 2026-07-17
+ */
+@Service
+public class TDangerApprovalRecordServiceImpl implements ITDangerApprovalRecordService 
+{
+    @Autowired
+    private TDangerApprovalRecordMapper tDangerApprovalRecordMapper;
+
+    /**
+     * 查询隐患审核记录
+     * 
+     * @param approvalId 隐患审核记录ID
+     * @return 隐患审核记录
+     */
+    @Override
+    public TDangerApprovalRecord selectTDangerApprovalRecordById(Long approvalId)
+    {
+        return tDangerApprovalRecordMapper.selectTDangerApprovalRecordById(approvalId);
+    }
+
+    /**
+     * 查询隐患审核记录列表
+     * 
+     * @param tDangerApprovalRecord 隐患审核记录
+     * @return 隐患审核记录
+     */
+    @Override
+    public List<TDangerApprovalRecord> selectTDangerApprovalRecordList(TDangerApprovalRecord tDangerApprovalRecord)
+    {
+        return tDangerApprovalRecordMapper.selectTDangerApprovalRecordList(tDangerApprovalRecord);
+    }
+
+    /**
+     * 新增隐患审核记录
+     * 
+     * @param tDangerApprovalRecord 隐患审核记录
+     * @return 结果
+     */
+    @Override
+    public int insertTDangerApprovalRecord(TDangerApprovalRecord tDangerApprovalRecord)
+    {
+        tDangerApprovalRecord.setCreateTime(DateUtils.getNowDate());
+        return tDangerApprovalRecordMapper.insertTDangerApprovalRecord(tDangerApprovalRecord);
+    }
+
+    /**
+     * 修改隐患审核记录
+     * 
+     * @param tDangerApprovalRecord 隐患审核记录
+     * @return 结果
+     */
+    @Override
+    public int updateTDangerApprovalRecord(TDangerApprovalRecord tDangerApprovalRecord)
+    {
+        tDangerApprovalRecord.setUpdateTime(DateUtils.getNowDate());
+        return tDangerApprovalRecordMapper.updateTDangerApprovalRecord(tDangerApprovalRecord);
+    }
+
+    /**
+     * 批量删除隐患审核记录
+     * 
+     * @param approvalIds 需要删除的隐患审核记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDangerApprovalRecordByIds(Long[] approvalIds)
+    {
+        return tDangerApprovalRecordMapper.deleteTDangerApprovalRecordByIds(approvalIds);
+    }
+
+    /**
+     * 删除隐患审核记录信息
+     * 
+     * @param approvalId 隐患审核记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDangerApprovalRecordById(Long approvalId)
+    {
+        return tDangerApprovalRecordMapper.deleteTDangerApprovalRecordById(approvalId);
+    }
+}

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

 package com.zehong.system.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.zehong.common.core.domain.entity.SysRole;
 import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.common.exception.CustomException;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.SecurityUtils;
 import com.zehong.system.domain.*;
+import com.zehong.system.domain.vo.DangerApprovalVo;
 import com.zehong.system.mapper.*;
+import com.zehong.system.service.ITDangerApprovalRecordService;
 import com.zehong.system.service.ITDangerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +49,9 @@ public class TDangerServiceImpl implements ITDangerService
     @Autowired
     private TUserMapper userMapper;
 
+    @Autowired
+    private ITDangerApprovalRecordService tDangerApprovalRecordService;
+
 
     /**
      * 查询安检隐患整改
@@ -203,4 +207,55 @@ public class TDangerServiceImpl implements ITDangerService
     {
         return tDangerMapper.selectTDangerListByType(tDanger);
     }
+
+    /**
+     * 隐患审核
+     * @param approvalList 隐患审核信息
+     * @return
+     */
+    public int dangerApproval(List<DangerApprovalVo> approvalList){
+        for(DangerApprovalVo approvalVo : approvalList){
+            //获取隐患信息
+            TDanger danger = tDangerMapper.selectTDangerById(approvalVo.getId());
+            TDanger update = new TDanger();
+            update.setId(danger.getId());
+            if("0".equals(approvalVo.getState())){
+                //审核通过
+                //获取隐患级别
+                if("1".equals(danger.getLevel())){
+                    int status = Integer.parseInt(danger.getApprovalStatus());
+                    //重大隐患
+                    if(status < 5){
+                        update.setApprovalStatus(String.valueOf(status+1));
+                    }else{
+                        update.setApprovalStatus(String.valueOf(status+1));
+                        update.setStatus(4);
+                    }
+
+                }else{
+                    //一般隐患
+                    int status = Integer.parseInt(danger.getApprovalStatus());
+                    if(status < 2){
+                        update.setApprovalStatus(String.valueOf(status+1));
+                    }else{
+                        update.setApprovalStatus(String.valueOf(status+1));
+                        update.setStatus(4);
+                    }
+                }
+            }else{
+                update.setStatus(0);
+            }
+            //更新隐患信息
+            int result = tDangerMapper.updateTDanger(update);
+            if (result == 0) throw new CustomException(danger.getTitle() + "隐患信息更新失败");
+            //隐患记录
+            TDangerApprovalRecord tDangerApprovalRecord = new TDangerApprovalRecord();
+            tDangerApprovalRecord.setDangerId(approvalVo.getId());
+            tDangerApprovalRecord.setUserId(SecurityUtils.getLoginUser().getUser().getUserId());
+            tDangerApprovalRecord.setApprovalStatus(approvalVo.getState());
+            tDangerApprovalRecord.setSuggestion(approvalVo.getSuggestion());
+            tDangerApprovalRecordService.insertTDangerApprovalRecord(tDangerApprovalRecord);
+        }
+        return 1;
+    }
 }

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

+package com.zehong.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import com.zehong.common.exception.CustomException;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TRectifyGroupMemberInfoMapper;
+import com.zehong.system.domain.TRectifyGroupMemberInfo;
+import com.zehong.system.service.ITRectifyGroupMemberInfoService;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+
+/**
+ * 整改组内成员信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2026-07-16
+ */
+@Service
+public class TRectifyGroupMemberInfoServiceImpl implements ITRectifyGroupMemberInfoService 
+{
+    @Resource
+    private TRectifyGroupMemberInfoMapper tRectifyGroupMemberInfoMapper;
+
+    /**
+     * 查询整改组内成员信息
+     * 
+     * @param memberId 整改组内成员信息ID
+     * @return 整改组内成员信息
+     */
+    @Override
+    public TRectifyGroupMemberInfo selectTRectifyGroupMemberInfoById(Long memberId)
+    {
+        return tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoById(memberId);
+    }
+
+    /**
+     * 查询整改组内成员信息列表
+     * 
+     * @param tRectifyGroupMemberInfo 整改组内成员信息
+     * @return 整改组内成员信息
+     */
+    @Override
+    public List<TRectifyGroupMemberInfo> selectTRectifyGroupMemberInfoList(TRectifyGroupMemberInfo tRectifyGroupMemberInfo)
+    {
+        return tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(tRectifyGroupMemberInfo);
+    }
+
+    /**
+     * 新增整改组内成员信息
+     * 
+     * @param tRectifyGroupMemberInfo 整改组内成员信息
+     * @return 结果
+     */
+    @Override
+    public int insertTRectifyGroupMemberInfo(TRectifyGroupMemberInfo tRectifyGroupMemberInfo)
+    {
+        tRectifyGroupMemberInfo.setCreateTime(DateUtils.getNowDate());
+        return tRectifyGroupMemberInfoMapper.insertTRectifyGroupMemberInfo(tRectifyGroupMemberInfo);
+    }
+
+    /**
+     * 修改整改组内成员信息
+     * 
+     * @param tRectifyGroupMemberInfo 整改组内成员信息
+     * @return 结果
+     */
+    @Override
+    public int updateTRectifyGroupMemberInfo(TRectifyGroupMemberInfo tRectifyGroupMemberInfo)
+    {
+        tRectifyGroupMemberInfo.setUpdateTime(DateUtils.getNowDate());
+        return tRectifyGroupMemberInfoMapper.updateTRectifyGroupMemberInfo(tRectifyGroupMemberInfo);
+    }
+
+    /**
+     * 批量删除整改组内成员信息
+     * 
+     * @param memberIds 需要删除的整改组内成员信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTRectifyGroupMemberInfoByIds(Long[] memberIds)
+    {
+        return tRectifyGroupMemberInfoMapper.deleteTRectifyGroupMemberInfoByIds(memberIds);
+    }
+
+    /**
+     * 删除整改组内成员信息信息
+     * 
+     * @param memberId 整改组内成员信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTRectifyGroupMemberInfoById(Long memberId)
+    {
+        return tRectifyGroupMemberInfoMapper.deleteTRectifyGroupMemberInfoById(memberId);
+    }
+
+
+    /**
+     * 获取整改人员人员信息
+     * @return
+     */
+    @Override
+    public List<Map<String,Object>> selectRectifyUserByPostCode(Map<String,Object> map){
+        return tRectifyGroupMemberInfoMapper.selectRectifyUserByPostCode(map);
+    }
+
+
+    /**
+     * 根据登录人职位获取可选成员
+     * @return
+     */
+    @Override
+    public List<TRectifyGroupMemberInfo> selectMemberByUserPost(){
+        //登录人信息
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        //获取登录人职务
+        TRectifyGroupMemberInfo tRectifyGroupMemberInfo = new TRectifyGroupMemberInfo();
+        tRectifyGroupMemberInfo.setUserId(userId);
+        List<TRectifyGroupMemberInfo> memberInfoList = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(tRectifyGroupMemberInfo);
+        if(CollectionUtils.isEmpty(memberInfoList)) throw new CustomException("未获取到登录人分组信息");
+        List<TRectifyGroupMemberInfo> result = new ArrayList<>();
+        for(TRectifyGroupMemberInfo memberInfo : memberInfoList){
+            /**
+             * 1.组长能看到自己组的成员和其他组的组长
+             * 2.组成员只能看到自己班的班长
+             */
+
+            if("1".equals(memberInfo.getPost())){
+                //组员信息
+                TRectifyGroupMemberInfo team = new TRectifyGroupMemberInfo();
+                team.setGroupId(memberInfo.getGroupId());
+                team.setPost("2");
+                List<TRectifyGroupMemberInfo> teamInfo = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(team);
+                result.addAll(teamInfo);
+                //判断是否存在组长信息
+                Optional<TRectifyGroupMemberInfo> isHasLeaderInfo = result.stream().filter(item -> "1".equals(item.getPost())).findAny();
+                if(isHasLeaderInfo.isPresent()){
+                    //组长信息
+                    TRectifyGroupMemberInfo leader = new TRectifyGroupMemberInfo();
+                    leader.setPost("1");
+                    List<TRectifyGroupMemberInfo> leaderInfo = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(team);
+                    result.addAll(leaderInfo);
+                }
+            }else{
+                //本组组长信息
+                TRectifyGroupMemberInfo team = new TRectifyGroupMemberInfo();
+                team.setGroupId(memberInfo.getGroupId());
+                team.setPost("1");
+                List<TRectifyGroupMemberInfo> leaderInfo = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(team);
+                result.addAll(leaderInfo);
+            }
+        }
+        return result;
+    }
+}

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

+package com.zehong.system.service.impl;
+
+import com.zehong.common.exception.CustomException;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.SecurityUtils;
+import com.zehong.system.domain.TRectifyGroupMemberInfo;
+import com.zehong.system.domain.TRectifyPersonGroupInfo;
+import com.zehong.system.mapper.TRectifyGroupMemberInfoMapper;
+import com.zehong.system.mapper.TRectifyPersonGroupInfoMapper;
+import com.zehong.system.service.ITRectifyPersonGroupInfoService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 整改人员分组信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2026-07-16
+ */
+@Service
+public class TRectifyPersonGroupInfoServiceImpl implements ITRectifyPersonGroupInfoService 
+{
+    @Resource
+    private TRectifyPersonGroupInfoMapper tRectifyPersonGroupInfoMapper;
+    @Resource
+    private TRectifyGroupMemberInfoMapper tRectifyGroupMemberInfoMapper;
+
+    /**
+     * 查询整改人员分组信息
+     * 
+     * @param groupId 整改人员分组信息ID
+     * @return 整改人员分组信息
+     */
+    @Override
+    public TRectifyPersonGroupInfo selectTRectifyPersonGroupInfoById(Long groupId)
+    {
+        TRectifyPersonGroupInfo personGroupInfo = tRectifyPersonGroupInfoMapper.selectTRectifyPersonGroupInfoById(groupId);
+        TRectifyGroupMemberInfo tRectifyGroupMemberInfo = new TRectifyGroupMemberInfo();
+        tRectifyGroupMemberInfo.setGroupId(groupId);
+        List<TRectifyGroupMemberInfo> memberInfoList = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(tRectifyGroupMemberInfo);
+        personGroupInfo.setMemberInfoList(memberInfoList);
+        return personGroupInfo;
+    }
+
+    /**
+     * 查询整改人员分组信息列表
+     * 
+     * @param tRectifyPersonGroupInfo 整改人员分组信息
+     * @return 整改人员分组信息
+     */
+    @Override
+    public List<TRectifyPersonGroupInfo> selectTRectifyPersonGroupInfoList(TRectifyPersonGroupInfo tRectifyPersonGroupInfo) {
+        return tRectifyPersonGroupInfoMapper.selectTRectifyPersonGroupInfoList(tRectifyPersonGroupInfo);
+    }
+
+    /**
+     * 新增整改人员分组信息
+     * 
+     * @param tRectifyPersonGroupInfo 整改人员分组信息
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertTRectifyPersonGroupInfo(TRectifyPersonGroupInfo tRectifyPersonGroupInfo) {
+        tRectifyPersonGroupInfo.setCreateTime(DateUtils.getNowDate());
+        tRectifyPersonGroupInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+        int result = tRectifyPersonGroupInfoMapper.insertTRectifyPersonGroupInfo(tRectifyPersonGroupInfo);
+        addMemberInfo(tRectifyPersonGroupInfo);
+        return result;
+    }
+
+    /**
+     * 新增组成员
+     * @param tRectifyPersonGroupInfo 组信息
+     */
+    private void addMemberInfo(TRectifyPersonGroupInfo tRectifyPersonGroupInfo){
+        for(TRectifyGroupMemberInfo memberInfo : tRectifyPersonGroupInfo.getMemberInfoList()){
+            //校验人员是否已在其他组
+            TRectifyGroupMemberInfo tRectifyGroupMemberInfo = new TRectifyGroupMemberInfo();
+            tRectifyGroupMemberInfo.setUserId(memberInfo.getUserId());
+            List<TRectifyGroupMemberInfo> memberInfoList = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(tRectifyGroupMemberInfo);
+            if(!CollectionUtils.isEmpty(memberInfoList)) throw new CustomException(memberInfo.getNickName() + "已加入其他组");
+            memberInfo.setGroupId(tRectifyPersonGroupInfo.getGroupId());
+            memberInfo.setCreateTime(new Date());
+            memberInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+            tRectifyGroupMemberInfoMapper.insertTRectifyGroupMemberInfo(memberInfo);
+        }
+    }
+
+    /**
+     * 修改整改人员分组信息
+     * 
+     * @param tRectifyPersonGroupInfo 整改人员分组信息
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateTRectifyPersonGroupInfo(TRectifyPersonGroupInfo tRectifyPersonGroupInfo){
+        tRectifyPersonGroupInfo.setUpdateTime(DateUtils.getNowDate());
+        tRectifyPersonGroupInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+        tRectifyGroupMemberInfoMapper.deleteTRectifyGroupMemberInfoByGroupId(tRectifyPersonGroupInfo.getGroupId());
+        addMemberInfo(tRectifyPersonGroupInfo);
+        return tRectifyPersonGroupInfoMapper.updateTRectifyPersonGroupInfo(tRectifyPersonGroupInfo);
+    }
+
+    /**
+     * 批量删除整改人员分组信息
+     * 
+     * @param groupIds 需要删除的整改人员分组信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTRectifyPersonGroupInfoByIds(Long[] groupIds)
+    {
+        return tRectifyPersonGroupInfoMapper.deleteTRectifyPersonGroupInfoByIds(groupIds);
+    }
+
+    /**
+     * 删除整改人员分组信息信息
+     * 
+     * @param groupId 整改人员分组信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTRectifyPersonGroupInfoById(Long groupId)
+    {
+        return tRectifyPersonGroupInfoMapper.deleteTRectifyPersonGroupInfoById(groupId);
+    }
+}

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TDangerApprovalRecordMapper">
+    
+    <resultMap type="TDangerApprovalRecord" id="TDangerApprovalRecordResult">
+        <result property="approvalId"    column="approval_id"    />
+        <result property="dangerId"    column="danger_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="approvalStatus"    column="approval_status"    />
+        <result property="suggestion"    column="suggestion"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTDangerApprovalRecordVo">
+        select approval_id, danger_id, user_id, approval_status, suggestion, create_time, update_by, update_time, is_del, remarks from t_danger_approval_record
+    </sql>
+
+    <select id="selectTDangerApprovalRecordList" parameterType="TDangerApprovalRecord" resultMap="TDangerApprovalRecordResult">
+        <include refid="selectTDangerApprovalRecordVo"/>
+        <where>  
+            <if test="dangerId != null "> and danger_id = #{dangerId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="approvalStatus != null  and approvalStatus != ''"> and approval_status = #{approvalStatus}</if>
+            <if test="suggestion != null  and suggestion != ''"> and suggestion = #{suggestion}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTDangerApprovalRecordById" parameterType="Long" resultMap="TDangerApprovalRecordResult">
+        <include refid="selectTDangerApprovalRecordVo"/>
+        where approval_id = #{approvalId}
+    </select>
+        
+    <insert id="insertTDangerApprovalRecord" parameterType="TDangerApprovalRecord" useGeneratedKeys="true" keyProperty="approvalId">
+        insert into t_danger_approval_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dangerId != null">danger_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="approvalStatus != null">approval_status,</if>
+            <if test="suggestion != null">suggestion,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dangerId != null">#{dangerId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="approvalStatus != null">#{approvalStatus},</if>
+            <if test="suggestion != null">#{suggestion},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTDangerApprovalRecord" parameterType="TDangerApprovalRecord">
+        update t_danger_approval_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="dangerId != null">danger_id = #{dangerId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
+            <if test="suggestion != null">suggestion = #{suggestion},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where approval_id = #{approvalId}
+    </update>
+
+    <delete id="deleteTDangerApprovalRecordById" parameterType="Long">
+        delete from t_danger_approval_record where approval_id = #{approvalId}
+    </delete>
+
+    <delete id="deleteTDangerApprovalRecordByIds" parameterType="String">
+        delete from t_danger_approval_record where approval_id in 
+        <foreach item="approvalId" collection="array" open="(" separator="," close=")">
+            #{approvalId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

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

@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="safetyEmergencyPlan"    column="safety_emergency_plan"    />
         <result property="dealMethod"    column="deal_method"    />
         <result property="branch"    column="branch"    />
+        <result property="approvalStatus"    column="approval_status"    />
     </resultMap>
 
     <sql id="selectTDangerVo">
@@ -90,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             danger.safety_emergency_plan,
             danger.deal_method,
             danger.branch,
+            danger.approval_status,
             (SELECT nick_name FROM sys_user where user_id = danger.file_id) as fileName,
             (
                 case type
@@ -199,6 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="safetyEmergencyPlan != null">safety_emergency_plan,</if>
             <if test="dealMethod != null">deal_method,</if>
             <if test="branch != null">branch,</if>
+            <if test="approvalStatus != null">approval_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
@@ -240,6 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="safetyEmergencyPlan != null">#{safetyEmergencyPlan},</if>
             <if test="dealMethod != null">#{dealMethod},</if>
             <if test="branch != null"> #{branch},</if>
+            <if test="approvalStatus != null"> #{approvalStatus},</if>
          </trim>
     </insert>
 
@@ -285,6 +289,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="safetyEmergencyPlan != null">safety_emergency_plan = #{safetyEmergencyPlan},</if>
             <if test="dealMethod != null">deal_method = #{dealMethod},</if>
             <if test="branch != null">branch = #{branch},</if>
+            <if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
         </trim>
         where id = #{id}
     </update>
@@ -309,7 +314,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </delete>
     <update id="updateByInspect">
-        UPDATE t_danger SET STATUS = IF(ISNULL(reform_id),0,3)
+        UPDATE t_danger SET STATUS = IF(ISNULL(reform_time),0,2)
         WHERE inspect_id =#{inspectId}
         <if test="type &gt; 3">
             and `type` = #{type}
@@ -361,6 +366,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             danger.funds_materials,
             danger.safety_emergency_plan,
             danger.deal_method,
+            danger.approval_status,
             (SELECT nick_name FROM sys_user where user_id = danger.file_id) as fileName,
             (
                 <if test="type == 1">
@@ -409,12 +415,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="beforeVideo != null  and beforeVideo != ''"> and danger.before_video = #{beforeVideo}</if>
             <if test="flag != null and adminId == null"> and danger.flag = #{flag}</if>
             <if test="afterContent != null  and afterContent != ''"> and danger.after_content = #{afterContent}</if>
-            <if test="reformId != null "> and danger.reform_id = #{reformId}</if>
+            <if test="reformId != null and adminId == null"> and danger.reform_id = #{reformId}</if>
             <if test="afterImg != null  and afterImg != ''"> and danger.after_img = #{afterImg}</if>
             <if test="startTime != null "> and danger.start_time = #{startTime}</if>
             <if test="endTime != null "> and danger.end_time = #{endTime}</if>
             <if test="status != null "> and danger.status = #{status}</if>
-            <if test="adminId != null and flag == null"> and danger.admin_id = #{adminId}</if>
+            <if test="adminId != null and flag == null and reformId == null"> and danger.admin_id = #{adminId}</if>
             <if test="finish != null "> and danger.finish = #{finish}</if>
             <if test="status == null "> and danger.status not in (-1)</if>
             <if test="flag != null and adminId != null"> and (danger.flag = #{flag} or danger.admin_id = #{adminId})</if>
@@ -426,6 +432,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and (tu.username like concat('%',#{userInfo},'%') or tu.phone like concat('%',#{userInfo},'%')  or tu.meternum like concat('%',#{userInfo},'%'))
             </if>
             <if test="type == 1 and village != null "> and com.id = #{village} </if>
+            <if test="adminId != null and reformId != null"> and (danger.admin_id = #{adminId} or danger.reform_id = #{reformId})</if>
         </where>
         ORDER BY create_time DESC
     </select>

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

@@ -36,16 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTGroupMemberInfoList" parameterType="TGroupMemberInfo" resultMap="TGroupMemberInfoResult">
         <include refid="selectTGroupMemberInfoVo"/>
         <where>  
-            <if test="groupId != null "> and group_id = #{groupId}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="groupId != null "> and member.group_id = #{groupId}</if>
+            <if test="userId != null "> and member.user_id = #{userId}</if>
+            <if test="isDel != null  and isDel != ''"> and member.is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and member.remarks = #{remarks}</if>
         </where>
     </select>
     
     <select id="selectTGroupMemberInfoById" parameterType="Long" resultMap="TGroupMemberInfoResult">
         <include refid="selectTGroupMemberInfoVo"/>
-        where member_id = #{memberId}
+        where member.member_id = #{memberId}
     </select>
         
     <insert id="insertTGroupMemberInfo" parameterType="TGroupMemberInfo" useGeneratedKeys="true" keyProperty="memberId">

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TRectifyGroupMemberInfoMapper">
+    
+    <resultMap type="TRectifyGroupMemberInfo" id="TRectifyGroupMemberInfoResult">
+        <result property="memberId"    column="member_id"    />
+        <result property="groupId"    column="group_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="post"    column="post"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTRectifyGroupMemberInfoVo">
+        SELECT
+            member.member_id,
+            member.group_id,
+            member.user_id,
+            member.post,
+            member.create_by,
+            member.create_time,
+            member.update_by,
+            member.update_time,
+            member.is_del,
+            member.remarks,
+            su.nick_name as nickName
+        FROM
+            t_rectify_group_member_info member
+        LEFT JOIN sys_user su ON su.user_id = member.user_id
+    </sql>
+
+    <select id="selectTRectifyGroupMemberInfoList" parameterType="TRectifyGroupMemberInfo" resultMap="TRectifyGroupMemberInfoResult">
+        <include refid="selectTRectifyGroupMemberInfoVo"/>
+        <where>  
+            <if test="groupId != null "> and member.group_id = #{groupId}</if>
+            <if test="userId != null "> and member.user_id = #{userId}</if>
+            <if test="post != null  and post != ''"> and member.post = #{post}</if>
+            <if test="isDel != null  and isDel != ''"> and member.is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and member.remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTRectifyGroupMemberInfoById" parameterType="Long" resultMap="TRectifyGroupMemberInfoResult">
+        <include refid="selectTRectifyGroupMemberInfoVo"/>
+        where member.member_id = #{memberId}
+    </select>
+        
+    <insert id="insertTRectifyGroupMemberInfo" parameterType="TRectifyGroupMemberInfo" useGeneratedKeys="true" keyProperty="memberId">
+        insert into t_rectify_group_member_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="groupId != null">group_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="post != null">post,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="groupId != null">#{groupId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="post != null">#{post},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTRectifyGroupMemberInfo" parameterType="TRectifyGroupMemberInfo">
+        update t_rectify_group_member_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="groupId != null">group_id = #{groupId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="post != null">post = #{post},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where member_id = #{memberId}
+    </update>
+
+    <delete id="deleteTRectifyGroupMemberInfoById" parameterType="Long">
+        delete from t_rectify_group_member_info where member_id = #{memberId}
+    </delete>
+
+    <delete id="deleteTRectifyGroupMemberInfoByGroupId" parameterType="Long">
+        delete from t_rectify_group_member_info where group_id = #{groupId}
+    </delete>
+
+    <delete id="deleteTRectifyGroupMemberInfoByIds" parameterType="String">
+        delete from t_rectify_group_member_info where member_id in 
+        <foreach item="memberId" collection="array" open="(" separator="," close=")">
+            #{memberId}
+        </foreach>
+    </delete>
+
+    <select id="selectRectifyUserByPostCode" parameterType="Map" resultType="Map">
+        SELECT
+            su.user_id as userId,
+            su.nick_name as nickName,
+            su.phonenumber,
+            dept.dept_name as deptName
+        FROM
+            sys_user su
+        LEFT JOIN sys_dept dept ON dept.dept_id = su.dept_id
+        LEFT JOIN sys_user_post up ON up.user_id = su.user_id
+        LEFT JOIN sys_post post ON post.post_id = up.post_id
+        LEFT JOIN t_rectify_group_member_info member ON member.user_id = su.user_id
+        <where>
+            su.status = '0' and su.del_flag = '0'
+            <if test="groupId != null">
+                and (member.group_id is null or member.group_id = #{groupId})
+            </if>
+            <if test="groupId == null">
+                and member.group_id is null
+            </if>
+            <if test="userName != null and userName != ''">and su.user_name like concat('%', #{userName}, '%')</if>
+            <if test="postCode != null and postCode != ''">and post.post_code = #{postCode}</if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TRectifyPersonGroupInfoMapper">
+    
+    <resultMap type="TRectifyPersonGroupInfo" id="TRectifyPersonGroupInfoResult">
+        <result property="groupId"    column="group_id"    />
+        <result property="groupName"    column="group_name"    />
+        <result property="type"    column="type"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTRectifyPersonGroupInfoVo">
+        SELECT
+            info.group_id,
+            info.group_name,
+            info.type,
+            info.create_by,
+            info.create_time,
+            info.update_by,
+            info.update_time,
+            info.is_del,
+            info.remarks,
+            (select GROUP_CONCAT(su.nick_name SEPARATOR '|') from t_rectify_group_member_info me,sys_user su where me.group_id = info.group_id and me.user_id = su.user_id)as memberName
+        FROM
+            t_rectify_person_group_info info
+    </sql>
+
+    <select id="selectTRectifyPersonGroupInfoList" parameterType="TRectifyPersonGroupInfo" resultMap="TRectifyPersonGroupInfoResult">
+        <include refid="selectTRectifyPersonGroupInfoVo"/>
+        <where>  
+            <if test="groupName != null  and groupName != ''"> and info.group_name like concat('%', #{groupName}, '%')</if>
+            <if test="type != null  and type != ''"> and info.type = #{type}</if>
+            <if test="isDel != null  and isDel != ''"> and info.is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and info.remarks = #{remarks}</if>
+        </where>
+        ORDER BY info.create_time DESC
+    </select>
+    
+    <select id="selectTRectifyPersonGroupInfoById" parameterType="Long" resultMap="TRectifyPersonGroupInfoResult">
+        <include refid="selectTRectifyPersonGroupInfoVo"/>
+        where info.group_id = #{groupId}
+    </select>
+        
+    <insert id="insertTRectifyPersonGroupInfo" parameterType="TRectifyPersonGroupInfo" useGeneratedKeys="true" keyProperty="groupId">
+        insert into t_rectify_person_group_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="groupName != null">group_name,</if>
+            <if test="type != null">type,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="groupName != null">#{groupName},</if>
+            <if test="type != null">#{type},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTRectifyPersonGroupInfo" parameterType="TRectifyPersonGroupInfo">
+        update t_rectify_person_group_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="groupName != null">group_name = #{groupName},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where group_id = #{groupId}
+    </update>
+
+    <delete id="deleteTRectifyPersonGroupInfoById" parameterType="Long">
+        delete from t_rectify_person_group_info where group_id = #{groupId}
+    </delete>
+
+    <delete id="deleteTRectifyPersonGroupInfoByIds" parameterType="String">
+        delete from t_rectify_person_group_info where group_id in 
+        <foreach item="groupId" collection="array" open="(" separator="," close=")">
+            #{groupId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

huaxin-web/src/api/checktask/danger.js

@@ -60,3 +60,12 @@ export function dangerDataPermission(query) {
     params: query
   })
 }
+
+//审核隐患
+export function dangerApproval(data) {
+  return request({
+    url: '/checkTask/danger/dangerApproval',
+    method: 'post',
+    data: data
+  })
+}

huaxin-web/src/api/checktask/dangerGroup.js

+import request from '@/utils/request'
+
+// 查询整改人员分组信息列表
+export function listInfo(query) {
+  return request({
+    url: '/danger/group/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询整改人员分组信息详细
+export function getInfo(groupId) {
+  return request({
+    url: '/danger/group/' + groupId,
+    method: 'get'
+  })
+}
+
+// 新增整改人员分组信息
+export function addInfo(data) {
+  return request({
+    url: '/danger/group',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改整改人员分组信息
+export function updateInfo(data) {
+  return request({
+    url: '/danger/group',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除整改人员分组信息
+export function delInfo(groupId) {
+  return request({
+    url: '/danger/group/' + groupId,
+    method: 'delete'
+  })
+}
+
+// 导出整改人员分组信息
+export function exportInfo(query) {
+  return request({
+    url: '/danger/group/export',
+    method: 'get',
+    params: query
+  })
+}

huaxin-web/src/api/checktask/dangerGroupMember.js

+import request from '@/utils/request'
+
+// 查询整改组内成员信息列表
+export function listInfo(query) {
+  return request({
+    url: '/danger/member/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询整改组内成员信息详细
+export function getInfo(memberId) {
+  return request({
+    url: '/danger/member/' + memberId,
+    method: 'get'
+  })
+}
+
+// 新增整改组内成员信息
+export function addInfo(data) {
+  return request({
+    url: '/danger/member',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改整改组内成员信息
+export function updateInfo(data) {
+  return request({
+    url: '/danger/member',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除整改组内成员信息
+export function delInfo(memberId) {
+  return request({
+    url: '/danger/member/' + memberId,
+    method: 'delete'
+  })
+}
+
+// 导出整改组内成员信息
+export function exportInfo(query) {
+  return request({
+    url: '/danger/member/export',
+    method: 'get',
+    params: query
+  })
+}
+
+//获取整改人员信息
+export function selectRectifyUserByPostCode(data) {
+  return request({
+    url: '/danger/member/selectRectifyUserByPostCode',
+    method: 'post',
+    data: data
+  })
+}

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

+<template>
+  <el-dialog :title="title" :visible.sync="approvalOpen" width="800px" append-to-body destroy-on-close :close-on-click-modal="false">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="审核状态" prop="state">
+            <el-radio-group v-model="form.state">
+              <el-radio :label="0">通过</el-radio>
+              <el-radio :label="1">不通过</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="审核意见" prop="suggestion">
+            <el-input type="textarea" v-model="form.suggestion" placeholder="请输入审核意见"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { dangerApproval } from "@/api/checktask/danger";
+    export default {
+      name: "approval",
+      data(){
+          return{
+            title: "审核",
+            approvalOpen: false,
+            ids: [],
+            form: {},
+            rules: {
+              state: [
+                { required: true, message: "请选择审核状态", trigger: "change" }
+              ],
+            }
+          }
+      },
+      methods:{
+        open(ids){
+          this.reset();
+          this.ids = ids;
+          this.approvalOpen = true;
+        },
+        submitForm(){
+          this.$refs["form"].validate(valid => {
+            if (valid) {
+              let data = [];
+              this.ids.forEach(item =>{
+                data.push({
+                  id: item,
+                  ...this.form
+                })
+              })
+              dangerApproval(data).then(res =>{
+                this.$message.success("审核成功");
+                this.approvalOpen = false;
+              })
+            }
+          })
+
+        },
+        cancel(){
+          this.approvalOpen = false;
+        },
+        reset(){
+          this.form = {
+            state: null,
+            suggestion: null
+          }
+          this.resetForm("form");
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -31,8 +31,8 @@
                   <el-form-item label="隐患状态">
                     <span v-if="dangerDetailInfo.status == 0">待处理</span>
                     <span v-if="dangerDetailInfo.status == 1">拒绝整改</span>
-                    <span v-if="dangerDetailInfo.status == 2">待复核</span>
-                    <span v-if="dangerDetailInfo.status == 3">已处理</span>
+                    <span v-if="dangerDetailInfo.status == 2">待复查</span>
+                    <span v-if="dangerDetailInfo.status == 3">待审核</span>
                     <span v-if="dangerDetailInfo.status == 4">已归档</span>
                   </el-form-item>
                 </el-col>
@@ -481,8 +481,8 @@
                 <el-form-item label="隐患状态">
                   <span v-if="dangerDetailInfo.status == 0">待处理</span>
                   <span v-if="dangerDetailInfo.status == 1">拒绝整改</span>
-                  <span v-if="dangerDetailInfo.status == 2">待复核</span>
-                  <span v-if="dangerDetailInfo.status == 3">已处理</span>
+                  <span v-if="dangerDetailInfo.status == 2">待复查</span>
+                  <span v-if="dangerDetailInfo.status == 3">待审核</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -719,8 +719,8 @@
                 <template slot-scope="scope">
                   <span v-if="scope.row.status == 0">待处理</span>
                   <span v-if="scope.row.status == 1">拒绝整改</span>
-                  <span v-if="scope.row.status == 2">待复核</span>
-                  <span v-if="scope.row.status == 3">已处理</span>
+                  <span v-if="scope.row.status == 2">待复查</span>
+                  <span v-if="scope.row.status == 3">待审核</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -787,12 +787,12 @@ export default {
           b: ["上报时间", "-"],
         },
         {
-          title: "已整改待复核",
+          title: "已整改待复查",
           a: ["整改人", "-"],
           b: ["整改时间", "-"],
         },
         {
-          title: "已处理",
+          title: "待审核",
           a: ["复核人", "-"],
           b: ["复核时间", "-"],
         },

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

@@ -44,8 +44,8 @@
         <el-select v-model="queryParams.status" placeholder="请选择隐患状态" clearable size="small">
           <el-option label="待处理" value="0" />
           <el-option label="拒绝整改" value="1" />
-          <el-option label="待复核" value="2" />
-          <el-option label="已处理" value="3" />
+          <el-option label="待复查" value="2" />
+          <el-option label="待审核" value="3" />
           <el-option label="已归档" value="4" />
         </el-select>
       </el-form-item>
@@ -114,10 +114,21 @@
           v-hasPermi="['checkTask:danger:export']"
         >导出</el-button>
       </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleApproval"
+          v-hasPermi="['checkTask:danger:approval']"
+        >审核</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dangerList">
+    <el-table v-loading="loading" :data="dangerList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" v-if="!$store.state.user.roles.includes('visitor')"/>
       <el-table-column label="隐患标题" align="center" prop="title" width="150" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -146,8 +157,8 @@
         <template slot-scope="scope">
           <span v-if="scope.row.status == 0" style="color: red">待处理</span>
           <span v-if="scope.row.status == 1" style="color: blue">拒绝整改</span>
-          <span v-if="scope.row.status == 2" style="color: blue">待复核</span>
-          <span v-if="scope.row.status == 3" style="color: green">已处理</span>
+          <span v-if="scope.row.status == 2" style="color: blue">待复查</span>
+          <span v-if="scope.row.status == 3" style="color: green">待审核</span>
           <span v-if="scope.row.status == 4" style="color: green">已归档</span>
         </template>
       </el-table-column>
@@ -181,6 +192,13 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['checkTask:danger:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleApproval(scope.row)"
+            v-if="scope.row.hasApprovalPermission"
+            v-hasPermi="['checkTask:danger:approval']"
+          >审核</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -298,6 +316,10 @@
 
     <!-- 详情 -->
     <DangerDetail ref="dangerDetail"/>
+
+    <!-- 审核 -->
+    <Approval ref="approval"/>
+
   </div>
 </template>
 
@@ -306,12 +328,14 @@ import { listDanger, getDanger, delDanger, addDanger, updateDanger, exportDanger
 import Editor from '@/components/Editor';
 import GetPos from '@/components/GetPos';
 import DangerDetail from "./components/DangerDetail";
+import Approval from "./components/Approval";
 export default {
   name: "Danger",
   components: {
     Editor,
     GetPos,
-    DangerDetail
+    DangerDetail,
+    Approval
   },
   data() {
     return {
@@ -372,7 +396,7 @@ export default {
       dialogTableVisibles: false,
       devicePos: [],
       dangerSource: [],
-      reportTimeRange: []
+      reportTimeRange: [],
     };
   },
   created() {
@@ -553,6 +577,19 @@ export default {
       this.queryParams.beginDate = val[0];
       this.queryParams.endDate = val[1];
     },
+    handleApproval(row){
+      let approvalIds = [];
+      if(row.id){
+        approvalIds = [row.id];
+      }else{
+        if(this.ids.length == 0) {
+          this.$message.error("至少选择一个隐患");
+          return;
+        }
+        approvalIds = this.ids;
+      }
+      this.$refs.approval.open(approvalIds);
+    }
   }
 };
 </script>

huaxin-web/src/views/checktask/task/components/DangerDetailInfo.vue

@@ -31,8 +31,8 @@
                   <el-form-item label="隐患状态">
                     <span v-if="dangerDetailInfo.status == 0">待处理</span>
                     <span v-if="dangerDetailInfo.status == 1">拒绝整改</span>
-                    <span v-if="dangerDetailInfo.status == 2">待复核</span>
-                    <span v-if="dangerDetailInfo.status == 3">已处理</span>
+                    <span v-if="dangerDetailInfo.status == 2">待复查</span>
+                    <span v-if="dangerDetailInfo.status == 3">待审核</span>
                     <span v-if="dangerDetailInfo.status == 4">已归档</span>
                   </el-form-item>
                 </el-col>
@@ -449,8 +449,8 @@
                   <el-form-item label="隐患状态">
                     <span v-if="dangerDetailInfo.status == 0">待处理</span>
                     <span v-if="dangerDetailInfo.status == 1">拒绝整改</span>
-                    <span v-if="dangerDetailInfo.status == 2">待复核</span>
-                    <span v-if="dangerDetailInfo.status == 3">已处理</span>
+                    <span v-if="dangerDetailInfo.status == 2">待复查</span>
+                    <span v-if="dangerDetailInfo.status == 3">待审核</span>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -677,8 +677,8 @@
                   <template slot-scope="scope">
                     <span v-if="scope.row.status == 0">待处理</span>
                     <span v-if="scope.row.status == 1">拒绝整改</span>
-                    <span v-if="scope.row.status == 2">待复核</span>
-                    <span v-if="scope.row.status == 3">已处理</span>
+                    <span v-if="scope.row.status == 2">待复查</span>
+                    <span v-if="scope.row.status == 3">待审核</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -738,12 +738,12 @@ export default {
           b: ["上报时间", "-"],
         },
         {
-          title: "已整改待复核",
+          title: "已整改待复查",
           a: ["整改人", "-"],
           b: ["整改时间", "-"],
         },
         {
-          title: "已处理",
+          title: "待审核",
           a: ["复核人", "-"],
           b: ["复核时间", "-"],
         },