From 7b8437d82ee7bd83c00b9dd007a6c967e68070e9 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Thu, 12 Aug 2021 16:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=BC=82=E5=B8=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/dto/ResourceInspectTaskDto.java       | 10 ++++++++++
 .../meapi/controller/NcGroupController.java     | 17 +++++++++++++++++
 .../mesnac/meapi/mapper/NcGroupMapper.java      |  2 ++
 .../mesnac/meapi/service/NcGroupService.java    |  3 +++
 .../meapi/service/impl/NcGroupServiceImpl.java  | 10 ++++++++++
 5 files changed, 42 insertions(+)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java
index 5adea033..387878fe 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java
@@ -52,6 +52,8 @@ public class ResourceInspectTaskDto implements Serializable {
     private LocalDateTime actualCompleteDate;
     /**执行人**/
     private String executor;
+    /**执行人**/
+    private String executorName;
     /**备注**/
     private String remark;
     /**检索时间段的开始时间**/
@@ -324,6 +326,14 @@ public class ResourceInspectTaskDto implements Serializable {
         this.executor = executor;
     }
 
+    public String getExecutorName() {
+        return executorName;
+    }
+
+    public void setExecutorName(String executorName) {
+        this.executorName = executorName;
+    }
+
     public String getRemark() {
         return remark;
     }
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java
index 4b3dff76..8f911cc0 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java
@@ -32,6 +32,23 @@ public class NcGroupController {
         result = ncGroupService.selectPageByOperation(frontPage.getPagePlus(), frontPage.getGlobalQuery(),operation);
         return R.ok(result);
     }
+
+    /**
+     * 根据工序查询不良代码组，不分页
+     * @param operation
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/selectPageByOperationNoPage")
+    public R selectPageByOperationNoPage(String operation){
+        List<NcGroup> result;
+        try{
+            result = ncGroupService.selectPageByOperationNoPage(operation);
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+        return R.ok(result);
+    }
     /**
     * 根据id查询
     *
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java
index 68be48f3..091e52e1 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java
@@ -24,4 +24,6 @@ public interface NcGroupMapper extends BaseMapper<NcGroup> {
     IPage selectPageByOperation(Page<NcGroup> frontPage, @Param("site") String site, @Param("operationBO") String operationBO,@Param("globalQuery") String globalQuery);
 
     List<NcGroup> findNgGroupByOperationBo(@Param("operation") Operation operation);
+
+    List<NcGroup> selectPageByOperation(@Param("site") String site, @Param("operationBO") String operationBO, @Param("globalQuery") Object o);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java
index a4891d13..4079b0f3 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java
@@ -30,5 +30,8 @@ public interface NcGroupService extends IService<NcGroup> {
 
     IPage selectPageByOperation(Page<NcGroup> pagePlus, String globalQuery, String operation);
 
+
     List<NcGroup> findNgGroupByOperationBo(Operation operation);
+
+    List<NcGroup> selectPageByOperationNoPage(String operation);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java
index 147ef90f..15e96f72 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java
@@ -70,4 +70,14 @@ public class NcGroupServiceImpl extends ServiceImpl<NcGroupMapper, NcGroup> impl
         return ncGroupMapper.findNgGroupByOperationBo(operation);
     }
 
+    @Override
+    public List<NcGroup> selectPageByOperationNoPage(String operation) {
+        String site = CommonMethods.getSite();
+        if (StringUtils.isBlank(operation)) {
+            throw new BaseException("工序不能为空");
+        }
+        String operationBO = new OperationBOHandle(site, operation, "#").getValue();
+        return ncGroupMapper.selectPageByOperation(site, operationBO, null);
+    }
+
 }
\ No newline at end of file