From b1d362c1e6af668f10738b63576370f0d1ecf995 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Fri, 3 Sep 2021 19:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8A=A5=E5=BE=85=E5=8A=9E=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9=E6=96=B0=E5=A2=9E=E6=A3=80=E9=AA=8C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SelfReportController.java      | 25 +++++++++++++++++++
 .../quality/mapper/SelfReportMapper.java      |  4 +++
 .../mesnac/quality/model/SelfReport.java      | 11 ++++++++
 3 files changed, 40 insertions(+)

diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java
index 3a7022c1..cf2be7c1 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java
+++ b/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);
+    }
+
+
 }
\ No newline at end of file
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java b/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java
index d9f8f19b..9a51143d 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java
+++ b/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);
+
 }
\ No newline at end of file
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java b/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java
index 1ed34e6e..3bfbfbc1 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java
+++ b/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;