自报待办事项新增检验人员筛选条件

quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java

@@ -3,6 +3,7 @@ package com.foreverwin.mesnac.quality.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.common.constant.Constants;
+import com.foreverwin.mesnac.quality.mapper.SelfReportMapper;
 import com.foreverwin.mesnac.quality.model.SelfReport;
 import com.foreverwin.mesnac.quality.service.SelfReportService;
 import com.foreverwin.modular.core.util.CommonMethods;
@@ -26,6 +27,9 @@ public class SelfReportController {
 
     @Autowired
     public SelfReportService selfReportService;
+
+    @Autowired
+    public SelfReportMapper selfReportMapper;
     /**
      * 查询所有数据
      *
@@ -148,4 +152,25 @@ public class SelfReportController {
     public R removeByIds(List<String> ids){
         return R.ok(selfReportService.removeByIds(ids));
     }
+
+
+    /**
+     *  查询设备和设备上的检验人员
+     * @param
+     * @return
+     */
+    @GetMapping("/selectResourceAndCheckUsr")
+    public R selectResourceAndCheckUsr() {
+        List<SelfReport> result;
+        try {
+            String site = CommonMethods.getSite();
+            result = selfReportMapper.selectResourceAndCheckUsr(site);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+
+        return R.ok(result);
+    }
+
+
 }

quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java

@@ -22,4 +22,8 @@ import java.util.List;
 public interface SelfReportMapper extends BaseMapper<SelfReport> {
 
     List<SelfReport> selectListByCondition(@Param("ew") QueryWrapper<SelfReport> ew, @Param("locale") String locale, @Param("startTime") LocalDate startTime, @Param("endTime")  LocalDate endTime, @Param("userGroupList")List<UserGroup> userGroupList);
+
+    /*查询设备和设备上的检验人员*/
+    List<SelfReport> selectResourceAndCheckUsr(@Param("site") String site);
+
 }

quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java

@@ -157,6 +157,17 @@ public class SelfReport extends Model<SelfReport> {
     */
    @TableField(exist = false)
    private String pbUser;
+   @TableField(exist = false)
+   private String checkUsr;
+
+
+   public String getCheckUsr() {
+      return checkUsr;
+   }
+
+   public void setCheckUsr(String checkUsr) {
+      this.checkUsr = checkUsr;
+   }
 
    public String getProductCategory() {
       return productCategory;