张天森
2022-10-10 fb56b182b5148ed8f8a6b09b41df82880b3641ce
update
2个文件已修改
6 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -248,7 +248,7 @@
    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);
        return R.ok(comEventService.updateById(comEvent));
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -145,7 +145,7 @@
            return R.fail(ReturnMsgConstants.DATA_EXIST);
        }
        //提交不视为一次流转记录,不保存图片
        //saveEventImageList(comEvent.getImages(), comEvent.getId(),null,1);
        saveEventImageList(comEvent.getImages(), comEvent.getId(),null,1);
        return R.ok(ReturnMsgConstants.SAVE_SUCCESS);
    }
@@ -283,7 +283,7 @@
        map.put("eventDetail", comEventDetailVO);
        List<ComEventTransferRecord> transferRecord = comEventTransferRecordService.list(new QueryWrapper<ComEventTransferRecord>().lambda().eq(ComEventTransferRecord::getEventId, id));
        transferRecord.forEach(comEventTransferRecord -> {
            List<ComEventResource> list = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, comEvent.getId()));
            List<ComEventResource> list = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, comEvent.getId()).notIn(ComEventResource::getStatus,(1)));
            List<ComEventRequestImageVO> ImageVO = CopyUtil.deepCopyListObject(list, ComEventRequestImageVO.class);
            comEventTransferRecord.setImages(ImageVO);
        });