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 3c2a458..e3be7fa 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 @@ -9,6 +9,7 @@ import com.ics.admin.vo.RepairWorkerStatsVo; import com.ics.common.core.controller.BaseController; import com.ics.common.core.domain.R; import com.ics.common.utils.DateUtils; +import com.ics.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -87,6 +88,42 @@ public class RepairStatsController extends BaseController { return result(repairService.repairList(repair)); } + /** + * 人员绩效,楼层管理员自行报修情况 2024-08-26 + */ + @RequiresPermissions(value = {"repair:manage:operator"}) + @RequestMapping("floorCreateList") + public R floorCreateList(String keywords, String startDate, String endDate) { + Date start = null, end = null; + try { + if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) { + start = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, startDate + " 00:00:00"); + end = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, endDate + " 23:59:59"); + } + } catch (Exception e) { + return R.error("参数错误"); + } + startPage(); + return result(repairWorkerStatsService.getRepairFloorCreateStats(keywords, start, end)); + } + + /** + * 人员绩效,指定楼层管理员自行报修情况 2024-08-26 + */ + @RequiresPermissions(value = {"repair:manage:operator"}) + @RequestMapping("oneFloorCreateList") + public R oneFloorCreateList(String floorerId) { + Repair repair = new Repair(); + Map params = new HashMap<>(); + params.put("role", "1"); + params.put("userId", floorerId); + params.put("type", "all"); + repair.setParams(params); + startPage(); + return result(repairService.repairList(repair)); + } + + /** * 第一行 管理员 工单与 通知统计 */ diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java index da6c93e..6f87ae6 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStatsMapper.java @@ -36,14 +36,26 @@ public interface RepairStatsMapper { */ List selectRepairFloorStatsVoList(RepairFloorStatsVo repairFloorStatsVo); + /** + * 楼层管理员自行报修情况 + * + * @param keywords 姓名或者手机号 + * @param startTime 开始时间 + * @param endTime 保修时间 + * @return + */ + List getRepairFloorCreateStats(@Param("keywords") String keywords, @Param("startTime") Date startTime, @Param("endTime") Date endTime); + /** * 第一行 管理员 工单与 通知统计 + * * @return */ List repairAdminStats(Long userId); /** * 第二、三行 工单统计、工单完成情况、评价情况 + * * @return */ List repairStats(@Param("startTime") Date startTime, @Param("endTime") Date endTime); @@ -62,6 +74,7 @@ public interface RepairStatsMapper { * 第四行 右下 故障类型统计 */ List failureStats(@Param("startTime") Date startTime, @Param("endTime") Date endTime); + /** * 第五行 设备、品牌、评价 统计 */ diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java index 536039e..1b9d1aa 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStatsService.java @@ -34,6 +34,15 @@ public interface IRepairStatsService { * @return VIEW集合 */ List selectRepairFloorStatsVoList(RepairFloorStatsVo repairFloorStatsVo); + /** + * 楼层管理员自行报修情况 + * + * @param keywords 姓名或者手机号 + * @param startTime 开始时间 + * @param endTime 保修时间 + * @return + */ + List getRepairFloorCreateStats(String keywords, Date startTime, Date endTime); /** * 第一行 管理员 工单与 通知统计 diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java index 4b6f39f..8684737 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairIOSericeImpl.java @@ -76,6 +76,7 @@ public class RepairIOSericeImpl implements IRepairIOSerice { repairCheckVo = list.get(0); repair.setAddressId(repairCheckVo.getPid()); repair.setFloorId(repairCheckVo.getSid()); + repair.setRemark("5110");//工单标记 return IRepairIOSerice.OK; } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java index 6efd3d3..7761797 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java @@ -54,6 +54,11 @@ public class RepairStatsServiceImpl implements IRepairStatsService { return repairStatsMapper.selectRepairFloorStatsVoList(repairFloorStatsVo); } + @Override + public List getRepairFloorCreateStats(String keywords, Date startTime, Date endTime) { + return repairStatsMapper.getRepairFloorCreateStats(keywords, startTime, endTime); + } + @Override public RepairAdminStatsVo repairAdminStats(Long userId) { List list = repairStatsMapper.repairAdminStats(userId); 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 e6a930c..52e08d2 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 @@ -30,6 +30,43 @@ + + +