From add6878fd62d392c41fe5fa18086a03859103a39 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期二, 11 十月 2022 09:13:16 +0800 Subject: [PATCH] 新增 首页统计导办工单总数 导办工单时间统计 导办工单时段筛选接口 新增角色菜单关系表 新增角色菜单关系相关接口 --- flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 82 +++++++++++++++++++++++++++++++++++------ 1 files changed, 70 insertions(+), 12 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java index 9b50967..d9d062d 100644 --- a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java +++ b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java @@ -1,11 +1,22 @@ package com.dg.core.controller; import com.dg.core.ResultData; +import com.dg.core.db.gen.entity.CountList; +import com.dg.core.db.gen.entity.CountListNum; +import com.dg.core.db.gen.entity.TimeWorkOrder; import com.dg.core.db.gen.entity.WorkOrder; +import com.dg.core.service.IGuideRepairOrderService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; + +import java.util.Calendar; +import java.util.List; @Api(tags = {"首页统计接口"}) @RestController @@ -13,25 +24,72 @@ public class HomeStatisticsController { + //导办工单接口 + @Autowired + IGuideRepairOrderService iGuideRepairOrderService; - - - - - - + @ApiOperation("首页统计不同状态工单数") @GetMapping("/getWorkOrder") public ResultData getWorkOrder() { - WorkOrder workOrder=new WorkOrder(); - - - - - return ResultData.success(); + //状态(1待分配 2 待办结 3 已办结 4 待评价 5 已取消6 已超时 7超时未办结 8未解决 9已解决) + workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",null,null)); + workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",null,null)); + workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null)); + workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",null,null)); + workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",null,null)); + workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",null,null)); + workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum("6",null,null)); + workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("7",null,null)); + workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("8",null,null)); + workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("9",null,null)); + return ResultData.success(workOrder); } + @ApiOperation("首页统计不同时间段的工单数量") + @GetMapping("/getTimeWorkOrder") + public ResultData getTimeWorkOrder() + { + //1 今天 2昨天 3本月 4本年度 + //累计全部 本年 本月 今日 昨日 + TimeWorkOrder timeWorkOrder=new TimeWorkOrder(); + timeWorkOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum(null,null,null)); + timeWorkOrder.setYearNum(iGuideRepairOrderService.countStatisticsNum(null,null,"4")); + timeWorkOrder.setMonthNum(iGuideRepairOrderService.countStatisticsNum(null,null,"3")); + timeWorkOrder.setTodayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"1")); + timeWorkOrder.setYesterdayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"2")); + return ResultData.success(timeWorkOrder); + } + + + @ApiOperation("根据选择的时间段 筛选导办工单数 timeType:1 本年度 15 近15天的 30 近30天的") + @GetMapping("/getSelectionTimeOrder") + public ResultData getSelectionTimeOrder(@RequestParam("timeType") Integer timeType) + { + if(timeType<1) + { + return ResultData.error("请输入时间"); + } + + if(timeType==1) + { + Calendar calendar=Calendar.getInstance(); + timeType=calendar.get(Calendar.DAY_OF_YEAR); + } +// System.out.println(timeType); + //1 本年度 15 近15天的 30 近30天的 + List<CountListNum> listOne=iGuideRepairOrderService.countListNum("2",null,timeType); + List<CountListNum> listTwo=iGuideRepairOrderService.countListNum("3",null,timeType); + CountList countList=new CountList(); + countList.setWaitDealWithList(listOne); + countList.setHaveDealWith(listTwo); + return ResultData.success(countList); + } + + + + } -- Gitblit v1.7.1