java/zhihuishenqu.git

			@@ -144,6 +144,7 @@
			if (!flag) {
			return R.fail(ReturnMsgConstants.DATA_EXIST);
			}
			//提交不视为一次流转记录，不保存图片
			saveEventImageList(comEvent.getImages(), comEvent.getId(),null,1);
			return R.ok(ReturnMsgConstants.SAVE_SUCCESS);
			}
			@@ -247,6 +248,7 @@
			return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
			}


			@Override
			@Transactional(rollbackFor = Exception.class)
			public R cancelRequest(Long id) {
			@@ -281,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);
			});
			@@ -330,6 +332,7 @@
			return R.ok(calculateList);
			}


			@Override
			@Transactional(rollbackFor = Exception.class)
			public R archiveRequest(ComEventArchiveVO comEventArchiveVO, LoginUserInfoVO sysUser) {
			@@ -357,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);
			}

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

			}