boyue2025/dbd-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting.git synced 2025-06-21 21:49:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增对应的数据结构

Browse Source
This commit is contained in:
chenze 2024-08-20 18:22:41 +08:00
parent 2ad5208944
commit d9da4d9700
6 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
View File

@ -49,6 +49,7 @@ public class RepairController extends BaseController {
@RequiresPermissions(value = {"repair:manage:operator", "member:center:view"}, logical = Logical.OR) @RequiresPermissions(value = {"repair:manage:operator", "member:center:view"}, logical = Logical.OR)
@PostMapping("flow/start") @PostMapping("flow/start")
public R startFlow(@RequestBody RepairDTO repairDTO) { public R startFlow(@RequestBody RepairDTO repairDTO) {
System.out.println("1111111111"+getLoginStaffId());
Long userId = getLoginStaffId(); Long userId = getLoginStaffId();
// if (!repairService.submitCheck(userId.toString())) return R.error("报修过于频繁,请稍后再试."); // if (!repairService.submitCheck(userId.toString())) return R.error("报修过于频繁,请稍后再试.");
String result = repairService.handleFlow(repairDTO.getRepair(), userId, repairDTO.getFiles(), null, null); 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 type = map.get("type");
String menu = map.get("menu"); String menu = map.get("menu");
String repairName = map.get("name"); 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(); if (StringUtils.isBlank(type) || StringUtils.isBlank(menu)) return R.error();
startPage(); startPage();
Long userId = getLoginStaffId(); 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));
} }
/** /**

2
shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStatsController.java
View File

@ -47,7 +47,7 @@ public class RepairStatsController extends BaseController {
@RequestMapping("oneWorkerList") @RequestMapping("oneWorkerList")
public R oneWorkerList(String workerId) { public R oneWorkerList(String workerId) {
startPage(); startPage();
return result(repairService.repairList("5", workerId, "", null)); return result(repairService.repairList("5", workerId, "", null,null,null,null,null));
} }
/** /**

2
shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java
View File

@ -28,7 +28,7 @@ public interface RepairMapper {
List<Repair> workRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName); List<Repair> workRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName);
List<Repair> adminRepairList(@Param("userId") String userId, @Param("type") String type, @Param("repairName") String repairName); List<Repair> 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);
/** /**
* 维修工 工单 数量统计 * 维修工 工单 数量统计

2
shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java
View File

@ -39,7 +39,7 @@ public interface IRepairService {
* @param menu 1.普通用户，3派单员，5维修人, 7管理员 * @param menu 1.普通用户，3派单员，5维修人, 7管理员
* 查询工单列表 * 查询工单列表
*/ */
List<Repair> repairList(String menu, String userId, String type ,String repairName); List<Repair> repairList(String menu, String userId, String type ,String repairName,String sn,String typeName,String deviceName,String status);
/** /**
* 获取维修人员工单数量 * 获取维修人员工单数量

4
shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java
View File

@ -337,11 +337,11 @@ public class RepairServiceImpl implements IRepairService {
* 查询工单列表 * 查询工单列表
*/ */
@Override @Override
public List<Repair> repairList(String menu, String userId, String type, String repairName) { public List<Repair> repairList(String menu, String userId, String type, String repairName,String sn,String typeName,String deviceName,String status) {
List<Repair> list = null; List<Repair> list = null;
//1.普通用户，3派单员，5维修人, 7管理员 ,9楼层管理员 //1.普通用户，3派单员，5维修人, 7管理员 ,9楼层管理员
if ("9".equals(menu)) list = repairMapper.floorRepairList(userId, type, repairName); 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 ("5".equals(menu)) list = repairMapper.workRepairList(userId, type, repairName);
if ("3".equals(menu)) list = repairMapper.preRepairList(userId, type, repairName); if ("3".equals(menu)) list = repairMapper.preRepairList(userId, type, repairName);
if ("1".equals(menu)) list = repairMapper.normalRepairList(userId, type, repairName); if ("1".equals(menu)) list = repairMapper.normalRepairList(userId, type, repairName);

4
shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml
View File

@ -242,6 +242,10 @@
<if test="type == 'invalid'">and status = 11</if> <if test="type == 'invalid'">and status = 11</if>
<if test="type == 'all'"></if> <if test="type == 'all'"></if>
<if test="repairName != null and repairName != ''"> AND repair_name LIKE CONCAT('%', #{repairName}, '%')</if> <if test="repairName != null and repairName != ''"> AND repair_name LIKE CONCAT('%', #{repairName}, '%')</if>
<if test="sn != null and sn != ''"> AND sn LIKE CONCAT('%', #{sn}, '%')</if>
<if test="typeName != null and typeName != ''"> AND type_name LIKE CONCAT('%', #{typeName}, '%')</if>
<if test="deviceName != null and deviceName != ''"> AND device_name LIKE CONCAT('%', #{deviceName}, '%')</if>
<if test="status != null and status != ''"> AND status = #{status}</if>
order by create_time desc order by create_time desc
</select> </select>