From 18e164775e7238fe1600bbe9ad9c1d473f4a0e7e Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 25 Nov 2024 12:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/controller/RepairController.java | 2 +- .../material/repair/domain/vo/RepairInputDetailsVo.java | 7 +++++++ .../com/bonus/material/repair/mapper/RepairMapper.java | 2 +- .../com/bonus/material/repair/service/RepairService.java | 2 +- .../material/repair/service/impl/RepairServiceImpl.java | 2 +- .../resources/mapper/material/repair/RepairMapper.xml | 9 ++++----- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 7555ef99..5343a785 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -186,7 +186,7 @@ public class RepairController extends BaseController { @ApiOperation(value = "获取修试后入库列表") @GetMapping("getRepairedList") @RequiresPermissions("warehousing:repair:list") - public TableDataInfo getRepairedList(RepairInputDetails dto){ + public TableDataInfo getRepairedList(RepairInputDetailsVo dto){ startPage(); List list = service.getRepairedList(dto); return getDataTable(list); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairInputDetailsVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairInputDetailsVo.java index 7ffc3a1d..e9a121dd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairInputDetailsVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairInputDetailsVo.java @@ -31,4 +31,11 @@ public class RepairInputDetailsVo { /** 单位 */ private String unitName; + + /** 关键字*/ + private String keyWord; + + /** 设备类型*/ + private String deviceTypeId; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java index 18062f8f..01bbc2f5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java @@ -157,5 +157,5 @@ public interface RepairMapper { BigDecimal selectPartPrice(Long partId); - List getRepairedList(RepairInputDetails dto); + List getRepairedList(RepairInputDetailsVo dto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java index 4a6a5f41..ed3ae13d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java @@ -81,5 +81,5 @@ public interface RepairService { */ List exportRepairTaskList(RepairTask bean); - List getRepairedList(RepairInputDetails dto); + List getRepairedList(RepairInputDetailsVo dto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 557b968d..932e42b0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -844,7 +844,7 @@ public class RepairServiceImpl implements RepairService { } @Override - public List getRepairedList(RepairInputDetails dto) { + public List getRepairedList(RepairInputDetailsVo dto) { return repairMapper.getRepairedList(dto); } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 50fe7a6c..d48687ef 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -414,20 +414,19 @@ ANY_VALUE(tt.`code`) AS repairCode, ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName, ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2, - bpl.lot_name projectName, + bpl.pro_name projectName, bui.unit_name unitName, ANY_VALUE(us.user_name) AS wxName, ANY_VALUE(tt.create_time) AS wxTime, - ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus + tt.task_status AS taskStatus FROM repair_input_details rid LEFT JOIN repair_apply_details rad on rid.repair_id=rad.id LEFT JOIN sys_user us on us.user_id=rad.repairer LEFT JOIN tm_task tt ON rid.task_id = tt.task_id LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id - LEFT JOIN bm_project_lot bpl ON bai.project_id = bpl.lot_id - LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id - LEFT JOIN sys_dic sd ON tt.task_status = sd.id + LEFT JOIN bm_project bpl ON bai.project_id = bpl.pro_id + LEFT JOIN bm_unit bui ON bai.unit_id = bui.unit_id LEFT JOIN tm_task tt2 ON rad.task_id = tt2.task_id LEFT JOIN ( SELECT mt.type_id AS typeId,mt.type_name AS typeName,mt.manage_type,mt2.type_id AS typeId2,mt2.type_name AS typeName2