From d9da4d9700133b3fd75006ca4d71623c3dc5b4e6 Mon Sep 17 00:00:00 2001 From: chenze <1824191732@qq.com> Date: Tue, 20 Aug 2024 18:22:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ics/admin/controller/RepairController.java | 7 ++++++- .../com/ics/admin/controller/RepairStatsController.java | 2 +- .../src/main/java/com/ics/admin/mapper/RepairMapper.java | 2 +- .../main/java/com/ics/admin/service/IRepairService.java | 2 +- .../java/com/ics/admin/service/impl/RepairServiceImpl.java | 4 ++-- .../src/main/resources/mapper/admin/RepairMapper.xml | 4 ++++ 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java index 357ccee..ee177b9 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java @@ -49,6 +49,7 @@ public class RepairController extends BaseController { @RequiresPermissions(value = {"repair:manage:operator", "member:center:view"}, logical = Logical.OR) @PostMapping("flow/start") public R startFlow(@RequestBody RepairDTO repairDTO) { + System.out.println("1111111111"+getLoginStaffId()); Long userId = getLoginStaffId(); // if (!repairService.submitCheck(userId.toString())) return R.error("报修过于频繁,请稍后再试."); String result = repairService.handleFlow(repairDTO.getRepair(), userId, repairDTO.getFiles(), null, null); @@ -95,10 +96,14 @@ public class RepairController extends BaseController { String type = map.get("type"); String menu = map.get("menu"); String repairName = map.get("name"); + String sn = map.get("sn"); + String typeName = map.get("typeName"); + String deviceName = map.get("deviceName"); + String status = map.get("status"); if (StringUtils.isBlank(type) || StringUtils.isBlank(menu)) return R.error(); startPage(); Long userId = getLoginStaffId(); - return result(repairService.repairList(menu, userId.toString(), type, repairName)); + return result(repairService.repairList(menu, userId.toString(), type, repairName,sn,typeName,deviceName,status)); } /** diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java index 4a5093e..46e9e7f 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java @@ -47,7 +47,7 @@ public class RepairStatsController extends BaseController { @RequestMapping("oneWorkerList") public R oneWorkerList(String workerId) { startPage(); - return result(repairService.repairList("5", workerId, "", null)); + return result(repairService.repairList("5", workerId, "", null,null,null,null,null)); } /** diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java index 23b210f..8c1ad58 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java @@ -28,7 +28,7 @@ public interface RepairMapper { List workRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName); - List adminRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName); + List adminRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName,@Param("sn") String sn,@Param("typeName") String typeName,@Param("deviceName") String deviceName,@Param("status") String status); /** * 维修工 工单 数量统计 diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java index cc9a095..4183d69 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java @@ -39,7 +39,7 @@ public interface IRepairService { * @param menu 1.普通用户，3派单员，5维修人, 7管理员 * 查询工单列表 */ - List repairList(String menu, String userId, String type ,String repairName); + List repairList(String menu, String userId, String type ,String repairName,String sn,String typeName,String deviceName,String status); /** * 获取维修人员工单数量 diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java index 2817eb4..47aa723 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java @@ -337,11 +337,11 @@ public class RepairServiceImpl implements IRepairService { * 查询工单列表 */ @Override - public List repairList(String menu, String userId, String type, String repairName) { + public List repairList(String menu, String userId, String type, String repairName,String sn,String typeName,String deviceName,String status) { List list = null; //1.普通用户，3派单员，5维修人, 7管理员 ,9楼层管理员 if ("9".equals(menu)) list = repairMapper.floorRepairList(userId, type, repairName); - if ("7".equals(menu)) list = repairMapper.adminRepairList(userId, type, repairName); + if ("7".equals(menu)) list = repairMapper.adminRepairList(userId, type, repairName,sn,typeName,deviceName,status); if ("5".equals(menu)) list = repairMapper.workRepairList(userId, type, repairName); if ("3".equals(menu)) list = repairMapper.preRepairList(userId, type, repairName); if ("1".equals(menu)) list = repairMapper.normalRepairList(userId, type, repairName); diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml index ea1d000..262c4bd 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml @@ -242,6 +242,10 @@ and status = 11 AND repair_name LIKE CONCAT('%', #{repairName}, '%') + AND sn LIKE CONCAT('%', #{sn}, '%') + AND type_name LIKE CONCAT('%', #{typeName}, '%') + AND device_name LIKE CONCAT('%', #{deviceName}, '%') + AND status = #{status} order by create_time desc