From 47d1add9193f831dbea143c4b6d0e54902f6e1c8 Mon Sep 17 00:00:00 2001 From: lujiang Date: Tue, 13 Aug 2024 15:42:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/RepairController.java | 29 ++++++++----------- .../java/com/ics/admin/domain/Repair.java | 2 +- .../com/ics/admin/service/IRepairService.java | 3 +- .../admin/service/impl/RepairServiceImpl.java | 8 ++--- 4 files changed, 19 insertions(+), 23 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 d3381f9..8ac7306 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 @@ -10,8 +10,8 @@ import com.ics.admin.service.IRepairService; import com.ics.admin.utils.RepairDTO; import com.ics.admin.vo.RepairAttachVO; import com.ics.common.core.controller.BaseController; -import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.core.domain.R; +import com.ics.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -44,9 +44,6 @@ public class RepairController extends BaseController { @Autowired private IRepairAttachService repairAttachService; - @Autowired - private IIcsCustomerStaffService customerStaffService; - /** * 报修 */ @@ -81,25 +78,23 @@ public class RepairController extends BaseController { /** * 工单列表 + * menu:1.保修查询，3派单入口，5维修入口, 7 管理员 *

- * 1.普通用户，3派单员，5维修工, 7管理员 - *

- * 普通用户：全部、处理中、待评价、已评价 type对应值：all、process、evaling、evaled - * 派单员：重新派单、待派单、已派单、已关闭 type对应值：anew、wait、already、close - * 维修工：待完成、进行中、已完成 type对应值：wait、working、close - * 管理员：重派单，全部 type对应值：anew、all - * - * @return + * 报修查询：全部、处理中、待评价、已评价 type对应值：all、process、evaling、evaled + * 派单入口：重新派单、待派单、已派单、已关闭 type对应值：anew、wait、already、close + * 维修入口：待完成、进行中、已完成 type对应值：wait、working、close + * 管理员：重派单，全部 type对应值：anew、all 【小程序暂时用不到】 + *

*/ @RequiresPermissions(value = {"repair:attach:operator", "member:center:view"}, logical = Logical.OR) @RequestMapping("list") - public R list(@RequestBody String type) { + public R list(@RequestBody Map map) { + String type = map.get("type"); + String menu = map.get("menu"); + if (StringUtils.isBlank(type) || StringUtils.isBlank(menu)) return R.error(); startPage(); Long userId = getLoginStaffId(); - IcsCustomerStaff loginUser = customerStaffService.selectIcsCustomerStaffById(userId); - //1.普通用户，3派单员，5维修人, 7管理员 - String role = loginUser.getDataType(); - return result(repairService.repairList(role, userId.toString(), type)); + return result(repairService.repairList(menu, userId.toString(), type)); } /** diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java index a258570..e2b5202 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java @@ -172,7 +172,7 @@ public class Repair extends BaseEntity { private Date timeout; /** 预警状态， 默认0 没有预警；设置时间后 1 绿色 3橙色 5红色 */ - private Integer warn; + private Integer warn = 0; //工单状态，流程相关 /** 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 fcbe141..165ea19 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 @@ -37,9 +37,10 @@ public interface IRepairService extends IService { Repair selectRepairById(Long id); /** + * @param menu 1.普通用户，3派单员，5维修人, 7管理员 * 查询工单列表 */ - List repairList(String role, String userId, String type); + List repairList(String menu, String userId, String type); /** * 新增工单 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 380f503..0e3b8ee 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 @@ -221,11 +221,11 @@ public class RepairServiceImpl extends ServiceImpl impleme * 查询工单列表 */ @Override - public List repairList(String role, String userId, String type) { + public List repairList(String menu, String userId, String type) { //1.普通用户，3派单员，5维修人, 7管理员 - if ("7".equals(role)) return repairMapper.adminRepairList(userId, type); - if ("5".equals(role)) return repairMapper.workRepairList(userId, type); - if ("3".equals(role)) return repairMapper.preRepairList(userId, type); + if ("7".equals(menu)) return repairMapper.adminRepairList(userId, type); + if ("5".equals(menu)) return repairMapper.workRepairList(userId, type); + if ("3".equals(menu)) return repairMapper.preRepairList(userId, type); return repairMapper.normalRepairList(userId, type);//普通用户或者没有角色时都使用普通用户列表 }