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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

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

@@ -28,6 +28,8 @@
import java.util.HashMap;
import java.util.List;

import static java.util.Objects.isNull;

/**
 * ClassName   ComEventController
 * Description 三说会堂事件表控制层
@@ -152,6 +154,7 @@
    })
    @PostMapping("/page")
    public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
        log.info("==============分页参数"+comEventVO);
        Page pagination = new Page(pageNo, pageSize);
        ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
        return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
@@ -248,8 +251,10 @@
    public R rejectRequest(@RequestParam("id") Long id) {
        ComEvent comEvent = comEventService.getById(id);
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
        comEvent.setSpecialistName(null);
        comEvent.setSpecialistName("待分配");
        comEvent.setSpecialistId(null);
        comEvent.setSpecialistName("待分配");
        comEvent.setSpecialistId(0L);
        return R.ok(comEventService.updateById(comEvent));
    }