lidongdong
2022-10-20 cf831d87a05c8c9f4dd83410d479973cae2714ad
修改角色创建人问题  导办人员筛选  bug
4个文件已修改
11 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -386,13 +386,14 @@
    {
        WorkOrder workOrder=new WorkOrder();
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消  8未解决  9已解决)
        //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消  )
        workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null));
        workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null,null,null,null));
        workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,null,null,null));
        workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",ids,null,null,null,null));
        workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",ids,null,null,null,null));
        workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",ids,null,null,null,null));
        //8未解决  9已解决
        workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("6",ids,null,null,null,null));
        workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("7",ids,null,null,null,null));
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
@@ -54,13 +54,14 @@
    public ResultData<WorkOrder> getWorkOrder()
    {
        WorkOrder workOrder=new WorkOrder();
        //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消  6未解决  7已解决)
        //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消)
        workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null));
        workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",null,null,null,null,null));
        workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null,null,null,null));
        workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null));
        workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null,null));
        workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",null,null,null,null,null));
        //
        workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("6",null,null,null,null,null));
        workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("7",null,null,null,null,null));
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -235,7 +235,6 @@
    @GetMapping("/smartConsulting")
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
        return  iTransactionEventService.smartConsulting(keyWord);
    }
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
@@ -100,9 +100,9 @@
    private String guideDepartmentId;
    /**
     * 状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6 已超时   7超时未办结  8未解决  9已解决)
     * 状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消)
     */
    @ApiModelProperty("状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6 已超时   7超时未办结  8未解决  9已解决)")
    @ApiModelProperty("状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消)")
    private String state;
    /**