From a6098c8b53ade43169e79dfd5d1405c9ab43374f Mon Sep 17 00:00:00 2001 From: lujiang Date: Thu, 29 Aug 2024 23:01:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/RepairController.java | 3 + .../controller/RepairStatsController.java | 32 ++++++++++ .../com/ics/admin/vo/RepairFloorStatsVo.java | 14 +++++ .../com/ics/admin/vo/RepairWorkerStatsVo.java | 14 +++++ .../resources/mapper/admin/RepairMapper.xml | 6 ++ .../mapper/admin/RepairStatsMapper.xml | 62 +++++++++++++++++-- shoot-hand/ics/2024/view.sql | 4 +- 7 files changed, 129 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 3de5247..a3ab87c 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 @@ -114,6 +114,9 @@ public class RepairController extends BaseController { * room：门牌号，模糊查询 * explain：描述，模糊查询 * failureTypeId：故障类型id，精确查询 + * remark: yes 5110工单 no 普通工单 + * evalService: 1 好评 2 中评 3 差评，其他值无效 + * timeout: 9 查询超时工单，其他值无效 * beginTime : 工单创建日期范围；开始时间;格式示例 2024-08-22；成对出现 * endTime : 工单创建日期范围；结束时间;格式示例 2024-08-25；成对出现 * 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 e3be7fa..316ff0d 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 @@ -38,10 +38,25 @@ public class RepairStatsController extends BaseController { /** * 人员绩效，维修人员 + * 支持查询参数： + * username 姓名 + * mobile 手机号 + * typeid 设备类型id + * startDate 工单创建日期范围；开始时间;格式示例 2024-08-22；成对出现 + * endDate 工单创建日期范围；结束时间;格式示例 2024-08-25；成对出现 + * */ @RequiresPermissions(value = {"repair:manage:operator"}) @RequestMapping("workerList") public R workerList(RepairWorkerStatsVo repairWorkerStatsVo) { + try { + if (StringUtils.isNotBlank(repairWorkerStatsVo.getStartDate()) && StringUtils.isNotBlank(repairWorkerStatsVo.getEndDate())) { + repairWorkerStatsVo.setStart(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, repairWorkerStatsVo.getStartDate() + " 00:00:00")); + repairWorkerStatsVo.setEnd(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, repairWorkerStatsVo.getEndDate() + " 23:59:59")); + } + } catch (Exception e) { + return R.error("参数错误"); + } startPage(); return result(repairWorkerStatsService.selectRepairWorkerStatsList(repairWorkerStatsVo)); } @@ -64,10 +79,27 @@ public class RepairStatsController extends BaseController { /** * 人员绩效，楼层管理员 + * + * 支持查询参数： + * username 姓名 + * mobile 手机号 + * adr 地址名称，地点，楼层等 + * startDate 工单创建日期范围；开始时间;格式示例 2024-08-22；成对出现 + * endDate 工单创建日期范围；结束时间;格式示例 2024-08-25；成对出现 */ @RequiresPermissions(value = {"repair:manage:operator"}) @RequestMapping("floorList") public R floorList(RepairFloorStatsVo repairFloorStatsVo) { + try { + if (StringUtils.isNotBlank(repairFloorStatsVo.getStartDate()) && StringUtils.isNotBlank(repairFloorStatsVo.getEndDate())) { + Date start = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, repairFloorStatsVo.getStartDate() + " 00:00:00"); + repairFloorStatsVo.setStart(start); + Date end = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, repairFloorStatsVo.getEndDate() + " 23:59:59"); + repairFloorStatsVo.setEnd(end); + } + } catch (Exception e) { + return R.error("参数错误"); + } startPage(); return result(repairWorkerStatsService.selectRepairFloorStatsVoList(repairFloorStatsVo)); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairFloorStatsVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairFloorStatsVo.java index b5a78a9..1c09d3f 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairFloorStatsVo.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairFloorStatsVo.java @@ -1,8 +1,10 @@ package com.ics.admin.vo; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 对应视图floor_stats @@ -73,4 +75,16 @@ public class RepairFloorStatsVo implements Serializable { * 差评 */ private String l; + + @JsonIgnore + private String startDate; + + @JsonIgnore + private Date start; + + @JsonIgnore + private String endDate; + + @JsonIgnore + private Date end; } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairWorkerStatsVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairWorkerStatsVo.java index c368708..76d4aaa 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairWorkerStatsVo.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairWorkerStatsVo.java @@ -1,8 +1,10 @@ package com.ics.admin.vo; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 对应视图worker_stats @@ -54,4 +56,16 @@ public class RepairWorkerStatsVo implements Serializable { /** 差评 */ private String l; + + @JsonIgnore + private String startDate; + + @JsonIgnore + private Date start; + + @JsonIgnore + private String endDate; + + @JsonIgnore + private Date end; } 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 5014461..1de2a4f 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 @@ -250,6 +250,12 @@ AND rep.room LIKE CONCAT('%', #{room}, '%') AND rep.`explain` LIKE CONCAT('%', #{explain}, '%') AND rep.failure_type_id = #{failureTypeId} + AND rep.remark = '5110' + AND rep.remark is null + AND rep.eval_service >= 4 + AND rep.eval_service = 3 + AND rep.eval_service <= 2 + and predate < now() and status < 9 order by create_time desc diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml index 52e08d2..c3647c0 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml @@ -3,13 +3,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + +