Merge branch '20220927' into huacheng_test

zhaozhengjie

2022-09-29 5fb93eaa61d42d7ebb7048057d45e285efd7f0dc

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.SanShuoEventStatusEnum;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
@@ -173,7 +174,7 @@
    public R remove(@PathVariable Long id) {
        ComEvent comEvent = new ComEvent();
        comEvent.setId(id);
        comEvent.setEventProcessStatus(8);
        comEvent.setEventProcessStatus(9);
        return comEventService.updateComEvent(comEvent);
    }

@@ -227,7 +228,7 @@
            @ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"),
    })
    @PutMapping("/accept/Request")
    public R acceptRequest(@RequestParam("id") Long id,@RequestParam("specterId") Long specterId) {
    public R acceptRequest(@RequestParam("id") Long id, @RequestParam("specterId") Long specterId) {
        return comEventService.acceptRequest(id, specterId);
    }

@@ -280,7 +281,7 @@
    @ApiOperation("专家调解处理")
    @PutMapping("/conciliation/Request")
    public R conciliationRequest(@RequestBody ComEventConciliationVO comEventConciliationVO) {
        return comEventService.conciliationEvent(comEventConciliationVO);
        return comEventService.conciliationEvent(comEventConciliationVO, getLoginUserInfo());
    }

    /**
@@ -313,4 +314,22 @@
    public R calculate() {
        return comEventService.calculate();
    }

    /**
     * 大屏事件统计
     *
     * @param indexDataDTO 查询参数
     */
    @PostMapping("/indexData")
    public R indexData(@RequestBody IndexDateDTO indexDataDTO) {
        return comEventService.indexData(indexDataDTO);
    }

    /**
     * 大屏事件统计（事件和专家各级别占比）
     */
    @GetMapping("/indexData/event")
    public R eventIndexData(@RequestParam Integer type) {
        return comEventService.eventIndexData(type);
    }
}