refactor(ehs): 优化RC审计助手数据查询逻辑- 将naData方法参数从Map改为TRcaudit对象

- 更新Mapper接口和XML文件中的参数类型
- 移除不必要的导入和代码整理
- 添加sys_dept表关联查询支持部门数据过滤- 简化数据统计查询条件判断逻辑
- 统一使用TRcaudit实体传递查询参数

master/src/main/java/com/ruoyi/project/ehs/controller/TRcauditController.java

@@ -1,36 +1,38 @@
 package com.ruoyi.project.ehs.controller;
 
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.common.domain.DataEntity;
+import com.ruoyi.project.ehs.domain.TRcaudit;
 import com.ruoyi.project.ehs.domain.TRcauditmenu;
 import com.ruoyi.project.ehs.mapper.TRcauditMapper;
+import com.ruoyi.project.ehs.service.ITRcauditService;
 import com.ruoyi.project.ehs.service.ITRcauditmenuService;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
-import org.apache.commons.lang.StringUtils;
-import org.apache.poi.ss.usermodel.*;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.ehs.domain.TRcaudit;
-import com.ruoyi.project.ehs.service.ITRcauditService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * RC审计助手Controller
@@ -69,17 +71,16 @@ public class TRcauditController extends BaseController
 
     //情况统计
     @GetMapping("/naData")
-    public List<DataEntity> naData(Map param)
+    public List<DataEntity> naData(TRcaudit tRcaudit)
     {
-        param.put("params" , new HashMap<>());
-        param.put("yes" , 1);
-        DataEntity data1 = tRcauditMapper.selectNaData(param);
+        tRcaudit.setYes(1L);
+        DataEntity data1 = tRcauditMapper.selectNaData(tRcaudit);
         data1.setDataName("YES");
-        param.put("yes" , 2);
-        DataEntity data2 = tRcauditMapper.selectNaData(param);
+        tRcaudit.setYes(2L);
+        DataEntity data2 = tRcauditMapper.selectNaData(tRcaudit);
         data2.setDataName("NO");
-        param.put("yes" , 3);
-        DataEntity data3 = tRcauditMapper.selectNaData(param);
+        tRcaudit.setYes(3L);
+        DataEntity data3 = tRcauditMapper.selectNaData(tRcaudit);
         data3.setDataName("NA");
         List<DataEntity> list = new ArrayList<>();
         list.add(data1);

master/src/main/java/com/ruoyi/project/ehs/mapper/TRcauditMapper.java

@@ -5,7 +5,6 @@ import com.ruoyi.project.common.domain.DataEntity;
 import com.ruoyi.project.ehs.domain.TRcaudit;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * RC审计助手Mapper接口
@@ -65,5 +64,5 @@ public interface TRcauditMapper
     public int deleteTRcauditByIds(Long[] ids);
 
     @DataScope(deptAlias = "d")
-    DataEntity selectNaData(Map param);
+    DataEntity selectNaData(TRcaudit tRcaudit);
 }

master/src/main/resources/mybatis/ehs/TRcauditMapper.xml

@@ -138,15 +138,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
-    <select id="selectNaData" resultType="com.ruoyi.project.common.domain.DataEntity">
+    <select id="selectNaData" parameterType="TRcaudit" resultType="com.ruoyi.project.common.domain.DataEntity">
         SELECT count(1) as dataNum FROM t_rcaudit d
+        left join sys_dept s on s.dept_id = d.dept_id
         <where>
             and d.del_flag = 0
             <if test="yes == 1">and yes is not null</if>
             <if test="yes == 2">and no is not null</if>
             <if test="yes == 3">and na is not null</if>
         </where>
-        <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>