张天森
2022-10-10 dd031a2d62991222ca682bd3c687bf47f46d2d6d
update
3个文件已修改
16 ■■■■■ 已修改文件
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 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventTransferRecordServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -249,7 +249,7 @@
        ComEvent comEvent = comEventService.getById(id);
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
        comEvent.setSpecialistName("待分配");
        comEvent.setSpecialistId(null);
        comEvent.setSpecialistId(0L);
        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);
    }
@@ -243,6 +243,7 @@
        comEventTransferRecord.setSpecialistName(comEvent.getSpecialistName());
        comEventTransferRecord.setEventResult(comEvent.getEventSucceed());
        comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus());
        comEventTransferRecord.setId(Snowflake.getId());
        saveEventImageList(comEvent.getImages(),comEvent.getId(),comEventTransferRecord.getId(),4);
        comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
        return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
@@ -282,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()).notIn(ComEventResource::getStatus,(1)));
            List<ComEventResource> list = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, comEvent.getId()).notIn(ComEventResource::getStatus,(1)).eq(ComEventResource::getTransferId, comEventTransferRecord.getId()));
            List<ComEventRequestImageVO> ImageVO = CopyUtil.deepCopyListObject(list, ComEventRequestImageVO.class);
            comEventTransferRecord.setImages(ImageVO);
        });
@@ -358,7 +359,8 @@
        comEventTransferRecord.setSpecialistName(comEvent.getSpecialistName());
        comEventTransferRecord.setEventResult(comEvent.getEventSucceed());
        comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus());
        saveEventImageList(comEventTransferRecord.getImages(), comEvent.getId(), null, 5);
        comEventTransferRecord.setId(Snowflake.getId());
        saveEventImageList(comEventTransferRecord.getImages(), comEvent.getId(), comEventTransferRecord.getId(), 5);
        return comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventTransferRecordServiceImpl.java
@@ -18,6 +18,8 @@
import java.util.Date;
import java.util.List;
import static java.util.Objects.isNull;
/**
 * Description 三说会堂事件流转表业务层实现类
 * ClassName   ComEventTransferRecordServiceImpl
@@ -50,7 +52,9 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R insertComEventTransferRecord(ComEventTransferRecord comEventTransferRecord) {
        comEventTransferRecord.setId(Snowflake.getId());
        if (isNull(comEventTransferRecord.getId())){
            comEventTransferRecord.setId(Snowflake.getId());
        }
        comEventTransferRecord.setCreateAt(new Date());
        boolean flag = save(comEventTransferRecord);
        if (!flag) {