Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-10 25addae2c76fbd22145ea5f73b10d755d060dac0

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

@@ -249,6 +249,7 @@
        return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
    }


    @Override
    @Transactional(rollbackFor = Exception.class)
    public R cancelRequest(Long id) {
@@ -332,6 +333,7 @@
        return R.ok(calculateList);
    }


    @Override
    @Transactional(rollbackFor = Exception.class)
    public R archiveRequest(ComEventArchiveVO comEventArchiveVO, LoginUserInfoVO sysUser) {
@@ -359,8 +361,7 @@
        comEventTransferRecord.setSpecialistName(comEvent.getSpecialistName());
        comEventTransferRecord.setEventResult(comEvent.getEventSucceed());
        comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus());
        comEventTransferRecord.setId(Snowflake.getId());
        saveEventImageList(comEventTransferRecord.getImages(), comEvent.getId(), comEventTransferRecord.getId(), 5);
        saveEventImageList(comEventTransferRecord.getImages(), comEvent.getId(), null, 5);
        return comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
    }

@@ -504,4 +505,5 @@
        Integer count = baseMapper.selectCount(queryWrapper);
        return count > 0;
    }

}