lidongdong
2023-08-24 8c0b5b30e5200e7bd45aa34507c3623e17fcce91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -14,6 +14,7 @@
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.service.ComSanShuoExpertService;
import com.panzhihua.service_community.service.IComEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -50,6 +51,8 @@
    private IComEventService comEventService;
    @Resource
    private UserService userService;
    @Resource
    private ComSanShuoExpertService comSanShuoExpertService;
    /**
@@ -166,9 +169,15 @@
        ComEvent comEvent=new ComEvent();
        BeanUtils.copyProperties(comEventVO, comEvent);
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
        comEvent.setAppId(appId);
        return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
        if (isNull(comEventVO.getAppId())){
//            String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
            String appId = getAppId();
            comEvent.setAppId(appId);
        }
//        LoginUserInfoVO loginUserInfo1 = this.getLoginUserInfo();
//        loginUserInfo1.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType());
//        loginUserInfo1.setType(loginUserInfo.getType());
        return comEventService.pageByComEvent(comEvent, pagination,loginUserInfo);
    }
@@ -327,8 +336,10 @@
     */
    @ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理,拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
    @GetMapping("/status/calculate")
    public R calculate() {
        return comEventService.calculate(getLoginUserInfo());
    public R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long  id) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
//        loginUserInfo.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType());
        return comEventService.calculate(loginUserInfo,level,id);
    }
    /**
@@ -366,4 +377,12 @@
        return comEventService.listCommunityScreen();
    }
    /**
     * 获取事件范围筛选列表
     * */
    @GetMapping("/rangeList")
    public R rangeList(){
        return comSanShuoExpertService.rangeList();
    }
}