巡检及值班人员 gengdidi

gassafety-admin/src/main/java/com/zehong/web/controller/deviceInspection/TInspectionDataController.java

 package com.zehong.web.controller.deviceInspection;
 
-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.core.page.TableDataInfo;
 import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.system.domain.TInspectionData;
 import com.zehong.system.service.ITInspectionDataService;
-import com.zehong.common.utils.poi.ExcelUtil;
-import com.zehong.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 巡检记录Controller
@@ -45,6 +39,16 @@ public class TInspectionDataController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 获取所有巡检记录
+     * @param tInspectionData
+     * @return
+     */
+    @GetMapping("/getAllTInspectionInfo")
+    public AjaxResult getAllTInspectionInfo(TInspectionData tInspectionData){
+        return AjaxResult.success(tInspectionDataService.selectTInspectionDataList(tInspectionData));
+    }
+
     /**
      * 导出巡检记录列表
      */

gassafety-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectInspectorList" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.del_flag = '0' and r.role_id = 102
+		where u.del_flag = '0' and r.role_key = 'inspector'
 	</select>
 	
 	<select id="checkUserNameUnique" parameterType="String" resultType="int">

gassafety-web/src/api/deviceInspection/inspectionData.js

@@ -9,6 +9,15 @@ export function listInspectionData(query) {
   })
 }
 
+// 查询所有巡检记录不分页
+export function getAllTInspectionInfo(query) {
+  return request({
+    url: '/deviceInspection/inspectionData/getAllTInspectionInfo',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询巡检记录详细
 export function getInspectionData(dataId) {
   return request({