From 3c884ccd7b51edf3b36840bf99de5edaa41a38a7 Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期三, 12 十月 2022 19:05:28 +0800 Subject: [PATCH] 三说会堂事件流程处理 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java index c233b8a..ad1ad31 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java @@ -131,7 +131,7 @@ @PostMapping("/list") public R<List<ComEventVO>> listByComEvent(@RequestBody ComEventVO comEventVO) { ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class); - return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent), ComEventVO.class)); + return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent,this.getLoginUserInfo()), ComEventVO.class)); } /** @@ -154,7 +154,7 @@ public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) { Page pagination = new Page(pageNo, pageSize); ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class); - return comEventService.pageByComEvent(comEvent, pagination); + return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo()); } @@ -246,10 +246,13 @@ }) @PutMapping("/reject/Request") public R rejectRequest(@RequestParam("id") Long id) { - ComEvent comEvent = new ComEvent(); - comEvent.setId(id); - comEvent.setEventProcessStatus(SanShuoEventStatusEnum.REJECT.getCode()); - return comEventService.updateComEvent(comEvent); + ComEvent comEvent = comEventService.getById(id); + comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode()); + comEvent.setSpecialistName("待分配"); + comEvent.setSpecialistId(null); + comEvent.setSpecialistName("待分配"); + comEvent.setSpecialistId(0L); + return R.ok(comEventService.updateById(comEvent)); } /** -- Gitblit v1.7.1