Merge remote-tracking branch 'origin/crm_Version' into crm_Version

LSH

2023-12-16 4cf50898cd0e7227ae59f1c46264596205ad08c4

Merge remote-tracking branch 'origin/crm_Version' into crm_Version

 src/main/java/com/zy/crm/manager/controller/BIController.java

@@ -34,7 +34,7 @@
    private ProcessPermissionsService processPermissionsService;

    @RequestMapping(value = "/pending/approval/auth")
    @ManagerAuth
    //@ManagerAuth
    public R get() {
        // 传入用户id查询规划单 区分，通过区分出来的规划单类型查询 规划申请单
        //
@@ -58,7 +58,7 @@
    }

    @RequestMapping(value = "/pending/user/approval/auth")
    @ManagerAuth
    //@ManagerAuth
    public R getPlanByUser() {
        PlanType planType = new PlanType();
        planType.setType(2);
@@ -99,7 +99,7 @@


    @RequestMapping(value = "/pending/sum/auth")
    @ManagerAuth
    //@ManagerAuth
    public R getAllPlan() {
        EntityWrapper<Plan> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("count(0) count","MONTH(create_time) month");
@@ -109,7 +109,7 @@
    }

    @RequestMapping(value = "/user/sumyear/auth")
    @ManagerAuth
    //@ManagerAuth
    public R getUserYear() {
        PlanType planType = new PlanType();
        planType.setType(2);