flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
@@ -47,7 +47,7 @@ @ApiOperation("首页统计不同状态工单数") @GetMapping("/getWorkOrder") public ResultData getWorkOrder() public ResultData<WorkOrder> getWorkOrder() { WorkOrder workOrder=new WorkOrder(); //状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决） @@ -70,7 +70,7 @@ @ApiOperation("首页统计不同时间段的工单数量") @GetMapping("/getTimeWorkOrder") public ResultData getTimeWorkOrder() public ResultData<TimeWorkOrder> getTimeWorkOrder() { //1 今天 2昨天 3本月 4本年度 //累计全部 本年 本月 今日 昨日 @@ -86,7 +86,7 @@ @ApiOperation("根据选择的时间段 筛选导办工单数 timeType：1 本年度 15 近15天的 30 近30天的") @GetMapping("/getSelectionTimeOrder") public ResultData getSelectionTimeOrder(@RequestParam("timeType") Integer timeType) public ResultData<CountList> getSelectionTimeOrder(@RequestParam("timeType") Integer timeType) { if(timeType<1) { @@ -112,7 +112,7 @@ @ApiOperation("获取效率比值") @GetMapping("/getEfficiency") public ResultData getEfficiency() public ResultData<EfficiencyEntity> getEfficiency() { EfficiencyEntity entity=new EfficiencyEntity(); //总工单数 @@ -166,7 +166,7 @@ @ApiOperation("工单 办事指南饼状图数据") @GetMapping("/getPieChart") public ResultData getPieChart() public ResultData<PieChartAll> getPieChart() { PieChartAll pieChartAll=new PieChartAll(); pieChartAll.setWorkOrderNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null)+""); @@ -214,7 +214,7 @@ @ApiOperation("组织排行榜 type 1 安评价 2 按办结量") @GetMapping("/getOrganization") public TableDataInfo getOrganization(@RequestParam("type") String type) public TableDataInfo<OrganizationEntity> getOrganization(@RequestParam("type") String type) { List<OrganizationEntity> guidePlates=homeStatisticsService.getDepartment(); @@ -281,7 +281,7 @@ @ApiOperation("导办人员排行榜 type 1 安评价 2 按办结量 3 按超时") @GetMapping("/getGuidePlate") public TableDataInfo getGuidePlate(@RequestParam("type") String type) public TableDataInfo<GuidePlate> getGuidePlate(@RequestParam("type") String type) { int allNum=homeStatisticsService.staffNum(); @@ -305,7 +305,7 @@ @ApiOperation("办事指南排行榜 type 1 按浏览量 2 按办结量") @GetMapping("/getGuidance") public TableDataInfo getGuidance(@RequestParam("type") String type) public TableDataInfo<Guidance> getGuidance(@RequestParam("type") String type) { int allNum=homeStatisticsService.countWork(); if(StringUtils.equals("1",type)) @@ -323,7 +323,7 @@ @ApiOperation("导办工单按区域统计") @GetMapping("/getRangeStatistics") public TableDataInfo getRangeStatistics() public TableDataInfo<RangeStatistics> getRangeStatistics() { List<AreaCode2022> code2022s=iAreaCodeService.getListByPCode("510400000000");
@@ -9,6 +9,7 @@ /** * 导办工单统计类 */ @ApiModel("不同时间段的工单数量") @Data public class TimeWorkOrder implements Serializable flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
@@ -42,6 +42,7 @@ /** * 部门电话 */ @TableField(exist = false) @ApiModelProperty("部门电话") private String contactNumber;
@@ -1,5 +1,7 @@ package com.dg.core.util; import com.dg.core.ResultData; import java.io.Serializable; import java.util.List; @@ -8,7 +10,7 @@ * * @author ruoyi */ public class TableDataInfo implements Serializable public class TableDataInfo<T> implements Serializable { private static final long serialVersionUID = 1L; @@ -16,7 +18,7 @@ private long total; /** 列表数据 */ private List<?> rows; private List<T> rows; /** 消息状态码 */ private int result; @@ -37,7 +39,7 @@ * @param list 列表数据 * @param total 总记录数 */ public TableDataInfo(List<?> list, long total) public TableDataInfo(List<T> list, long total) { this.rows = list; this.total = total; @@ -53,12 +55,12 @@ this.total = total; } public List<?> getRows() public List<T> getRows() { return rows; } public void setRows(List<?> rows) public void setRows(List<T> rows) { this.rows = rows; } flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
@@ -87,8 +87,8 @@ <select id="selectByKeyWord" resultMap="OrganizationChartResult"> <include refid="selectOrganizationChartVo"/> where organization_name like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', organization_name, '%') or detailed_address like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', detailed_address, '%') or resume like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', resume, '%') or((detailed_address like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', detailed_address, '%')) and TRIM(detailed_address) != '') or((resume like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', resume, '%')) and TRIM(resume) != '' ) </select> <select id="selectByCode" resultMap="OrganizationChartResult">
