From 0abdca2751a79476d57fba8513d8321e9cddeddb Mon Sep 17 00:00:00 2001
From: liuchuan <1084917737@qq.com>
Date: Fri, 22 Dec 2023 17:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/RepairController.java     | 24 +++++++++++++++++++
 .../controller/RepairTestInputController.java | 14 +++++++++++
 .../resources/mapper/system/SelectMapper.xml  |  2 +-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
index eaf34708..a8a21f29 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
@@ -40,6 +40,18 @@ public class RepairController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取维修任务列表
+     */
+    @ApiOperation(value = "获取维修任务列表")
+    @Log(title = "维修任务列表", businessType = BusinessType.QUERY)
+    @GetMapping("/getAppRepairTaskList")
+    public AjaxResult getAppRepairTaskList(RepairTask bean)
+    {
+        List<RepairTask> list = service.getRepairTaskList(bean);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 获取维修任务机具列表
      */
@@ -53,6 +65,18 @@ public class RepairController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取维修任务机具列表
+     */
+    @ApiOperation(value = "获取维修任务机具列表")
+    @Log(title = "维修任务机具列表", businessType = BusinessType.QUERY)
+    @GetMapping("/getAppRepairMaTypeList")
+    public AjaxResult getAppRepairMaTypeList(RepairTaskDetails bean)
+    {
+        List<RepairTaskDetails> list = service.getRepairMaTypeList(bean);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 新增维修记录
      */
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java
index a8448a26..fb1c5a97 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java
@@ -33,6 +33,13 @@ public class RepairTestInputController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "获取修试后入库列表")
+    @PostMapping("getAppRepairedList")
+    public AjaxResult getAppRepairedList(@Validated @RequestBody RepairTestInputDto dto){
+        List<RepairTestInputVo> list = service.getRepairedList(dto);
+        return AjaxResult.success(list);
+    }
+
     @ApiOperation(value = "获取修试后入库列表-详情")
     @GetMapping("getRepairedDetailList")
     public TableDataInfo getRepairedDetailList(RepairTestInputDto dto){
@@ -41,6 +48,13 @@ public class RepairTestInputController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "获取修试后入库列表-详情")
+    @PostMapping("getAppRepairedDetailList")
+    public AjaxResult getAppRepairedDetailList(@Validated @RequestBody RepairTestInputDto dto){
+        List<RepairTestInputDetailVo> list = service.getRepairedDetailList(dto);
+        return AjaxResult.success(list);
+    }
+
     @ApiOperation(value = "修试后入库-入库操作")
     @PostMapping("inputByType")
     public AjaxResult inputByType(@RequestBody RepairTestInputDto dto){
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
index c8672bf9..0488276b 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                parent_id AS parentId,
                level
         FROM ma_part_type
-        WHERE del_flag = '0' and level != '4'
+        WHERE del_flag = '0' and level != '3'
         ORDER BY create_time
     </select>
     <!--货架-->