Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-10 8457df0ef43fada73d66647b8a5fa43e623b6826

Merge branch 'sanshuohuitang_dev' into huacheng_test

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

@@ -144,7 +144,8 @@
        if (!flag) {
            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);
    }

@@ -359,6 +360,7 @@
        comEventTransferRecord.setSpecialistName(comEvent.getSpecialistName());
        comEventTransferRecord.setEventResult(comEvent.getEventSucceed());
        comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus());
        saveEventImageList(comEventTransferRecord.getImages(), comEvent.getId(), null, 5);
        return comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
    }