lidongdong
2022-11-22 f60f750254beaf0221268c3e2e0e00c8a5d59c28
修改部门数据统计导办人员排行榜问题
3个文件已修改
27 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
@@ -595,7 +595,7 @@
    }
    @ApiOperation("部门数据导办人员排行榜 type 1 安评价   2 按办结量 3 按超时 4按工单量  5 按未办结量")
    @ApiOperation("部门数据导办人员排行榜 type 1 安评价   2按工单量  3按办结量  4 按未办结量 5 按超时")
    @GetMapping("/department/getGuidePlate")
    public TableDataInfo<GuidePlate> getDepartmentGuidePlate(@RequestParam("type") String type,@RequestParam("ids") List<String> ids)
    {
@@ -613,23 +613,23 @@
        }
        else if(StringUtils.equals("2",type))
        {
            //2 按办结量
            return getDataTable(homeStatisticsService.guidePlatePeople(ids),allNum);
            //2按工单量
            return getDataTable(homeStatisticsService.workunit(ids),allNum);
        }
        else if(StringUtils.equals("3",type))
        {
            //3 按超时
            return getDataTable(homeStatisticsService.timeout(ids),allNum);
            //3 按办结量
            return getDataTable(homeStatisticsService.guidePlatePeople(ids),allNum);
        }
        else if(StringUtils.equals("4",type))
        {
            //按工单量
            return getDataTable(homeStatisticsService.workunit(ids),allNum);
            //4按未办结量
            return getDataTable(homeStatisticsService.tosettled(ids),allNum);
        }
        else
        {
            //按未办结量
            return getDataTable(homeStatisticsService.tosettled(ids),allNum);
            //5 按超时
            return getDataTable(homeStatisticsService.timeout(ids),allNum);
        }
    }
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -115,7 +115,6 @@
        {
            DepartmentId=null;
        }
//        List<String> ids=iOrganizationChartService.getIds(DepartmentId);
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
        int num=iTransactionEventService.countNum(null,null,DepartmentId);
        return getDataTable(list,num);
@@ -239,7 +238,7 @@
    @GetMapping("/queryByClassifyIdConfigList")
    public TableDataInfo queryByClassifyIdConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                                     @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                                     @RequestParam("classifyId") String classifyId,
                                                     @RequestParam(value = "classifyId",required = false) String classifyId,
                                                     @RequestParam(required = false,name="departmentId") Integer departmentId){
        Assert.notNull(pageNum, "pageNum 不能为空");
        Assert.notNull(pageSize, "pageSize 不能为空");
@@ -347,7 +346,7 @@
    {
        boolean a = false;
        String fileName = file.getOriginalFilename();
         Integer b = iTransactionEventService.batchImport(fileName, file);
        Integer b = iTransactionEventService.batchImport(fileName, file);
        if (b == 3) {//
            return ResultData.success("全部导入成功");//全部导入成功
        } else if (b == 2) {
flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
@@ -7,7 +7,7 @@
        SELECT
            user_name as userName,
            (SELECT organization_name FROM automessage_organization_chart WHERE  automessage_organization_chart.id=department_id) as departmentNmae,
            (select count(id) from automessage_guide_repair_order WHERE automessage_guide_repair_order.guide_user_id=automessage_sys_user.user_id) as num
            (select count(id) from automessage_guide_repair_order WHERE automessage_guide_repair_order.guide_user_id=automessage_sys_user.user_id and state=3 ) as num
        FROM automessage_sys_user
        <where>
            user_type=2
@@ -89,7 +89,7 @@
        LIMIT 10
    </select>
    <!--  按未办结  -->
    <!--  按工单量  -->
    <select id="workunit" resultType="com.dg.core.db.gen.entity.GuidePlate">
        SELECT
        user_name as userName,