فهرست منبع

refactor(document):优化装置程序清单数据查询接口

- 修改 rcData 和 classifyData 接口参数类型为 TPlantproglist- 移除 Map 参数的使用,直接传递实体对象
- 在 Mapper XML 中添加 parameterType 属性并引入数据权限注解
- 更新 SQL 查询语句,关联 sys_dept 表以支持部门数据过滤
- 注释前端页面中不必要的按钮布局代码
jiangbiao 1 ماه پیش
والد
کامیت
4ca004f0b8

+ 6 - 6
master/src/main/java/com/ruoyi/project/document/controller/TPlantproglistController.java

@@ -96,19 +96,19 @@ public class TPlantproglistController extends BaseController
 
     //情况统计
     @GetMapping("/rcData")
-    public List<DataEntity> rcData(@RequestParam Map param)
+    public List<DataEntity> rcData( TPlantproglist tPlantproglist)
     {
-        param.put("params" , new HashMap<>());
-        List<DataEntity> list = tPlantproglistMapper.selectRcData(param);
+//        param.put("params" , new HashMap<>());
+        List<DataEntity> list = tPlantproglistMapper.selectRcData(tPlantproglist);
         return list;
     }
 
     //情况统计
     @GetMapping("/classifyData")
-    public List<DataEntity> classifyData(@RequestParam Map param)
+    public List<DataEntity> classifyData( TPlantproglist tPlantproglist)
     {
-        param.put("params" , new HashMap<>());
-        List<DataEntity> list = tPlantproglistMapper.selectclassifyData(param);
+//        param.put("params" , new HashMap<>());
+        List<DataEntity> list = tPlantproglistMapper.selectclassifyData(tPlantproglist);
         List<SysDictData> dictList = iSysDictTypeService.selectDictDataByType("CLASSIFY");
         for (DataEntity d: list
         ) {

+ 4 - 3
master/src/main/java/com/ruoyi/project/document/mapper/TPlantproglistMapper.java

@@ -5,7 +5,6 @@ import com.ruoyi.project.common.domain.DataEntity;
 import com.ruoyi.project.document.domain.TPlantproglist;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 装置程序清单Mapper接口
@@ -76,9 +75,11 @@ public interface TPlantproglistMapper
      */
     public int deleteTPlantproglistByIds(Long[] ids);
 
-    List<DataEntity> selectRcData(Map param);
+    @DataScope(deptAlias = "d")
+    List<DataEntity> selectRcData(TPlantproglist tPlantproglist);
 
-    List<DataEntity> selectclassifyData(Map param);
+    @DataScope(deptAlias = "d")
+    List<DataEntity> selectclassifyData(TPlantproglist tPlantproglist);
 
     /**
      * 查询即将到期或已过期的装置程序清单数量

+ 4 - 4
master/src/main/resources/mybatis/document/TPlantproglistMapper.xml

@@ -238,8 +238,8 @@
         </foreach>
     </update>
 
-    <select id="selectRcData" resultType="com.ruoyi.project.common.domain.DataEntity">
-        SELECT count(1) as dataNum,d.rccode as dataName FROM t_plantproglist d
+    <select id="selectRcData" parameterType="TPlantproglist"  resultType="com.ruoyi.project.common.domain.DataEntity">
+        SELECT count(1) as dataNum,d.rccode as dataName FROM t_plantproglist d left join sys_dept s on s.dept_id = d.dept_id
         <where>
             and d.del_flag = 0
             <if test="item != null  and item != ''"> and item = #{item}</if>
@@ -250,8 +250,8 @@
         order by dataName
     </select>
 
-    <select id="selectclassifyData" resultType="com.ruoyi.project.common.domain.DataEntity">
-        SELECT count(1) as dataNum,d.classify as dataName FROM t_plantproglist d
+    <select id="selectclassifyData" parameterType="TPlantproglist" resultType="com.ruoyi.project.common.domain.DataEntity">
+        SELECT count(1) as dataNum,d.classify as dataName FROM t_plantproglist d left join sys_dept s on s.dept_id = d.dept_id
         <where>
             and d.del_flag = 0
             <if test="item != null  and item != ''"> and item = #{item}</if>

+ 2 - 2
ui/src/views/pssr/pssrModel/index.vue

@@ -47,7 +47,7 @@
         >修改
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="success"
           icon="el-icon-edit"
@@ -58,7 +58,7 @@
           v-hasPermi="['pssr:pipe:edit']"
         >批量修改
         </el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"