From afadeb038e0ab8e138d1d4cc4102953dcfd32151 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 21 九月 2022 10:13:35 +0800
Subject: [PATCH] [修改] 三说代码事件流程代码提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
index a8faee8..577cbdb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -111,7 +111,8 @@
return R.ok(ReturnMsgConstants.SAVE_SUCCESS);
}
- private Boolean saveEventImageList(List<ComEventRequestImageVO> images, Long id) {
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean saveEventImageList(List<ComEventRequestImageVO> images, Long id) {
List<ComEventResource> comEventResourceList = new ArrayList<>();
if (!StringUtils.isEmpty(images)) {
List<ComEventRequestImageVO> imagesList = images;
@@ -180,8 +181,8 @@
}
}
}
- baseMapper.updateById(comEvent);
- return R.ok();
+ int flag = baseMapper.updateById(comEvent);
+ return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
}
@Override
@@ -194,8 +195,8 @@
comEvent.setUserEventStatus(4);
comEvent.setEventProcessStatus(SanShuoEventStatusEnum.CANCEL.getCode());
comEvent.setRevokeDes("用户手动取消");
- baseMapper.updateById(comEvent);
- return R.ok();
+ int flag = baseMapper.updateById(comEvent);
+ return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
} else {
return R.fail("当前申请已经受理，不能取消！");
}
@@ -231,8 +232,8 @@
comEvent.setSpecialistAcceptTime(new Date());
comEvent.setSpecialistName(specter.getName());
comEvent.setEventProcessStatus(SanShuoEventStatusEnum.ACCEPT.getCode());
- baseMapper.updateById(comEvent);
- return R.ok();
+ int flag = baseMapper.updateById(comEvent);
+ return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
}
@Override
@@ -245,8 +246,8 @@
comEvent.setSpecialistAcceptTime(new Date());
comEvent.setSpecialistName(specter.getName());
comEvent.setEventProcessStatus(SanShuoEventStatusEnum.ACCEPT.getCode());
- baseMapper.updateById(comEvent);
- return R.ok();
+ int flag = baseMapper.updateById(comEvent);
+ return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
}
@Override
@@ -256,9 +257,14 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public R archiveRequest(ComEventArchiveVO comEventArchiveVO, LoginUserInfoVO sysUser) {
ComEvent comEvent = baseMapper.selectById(comEventArchiveVO.getId());
- comEvent.setEventProcessStatus(6);
+ if (comEvent.getEventSucceed() == 2) {
+ comEvent.setEventProcessStatus(6);
+ } else {
+ comEvent.setEventProcessStatus(5);
+ }
comEvent.setResult(comEventArchiveVO.getResult());
baseMapper.updateById(comEvent);
ComEventTransferRecord comEventTransferRecord = new ComEventTransferRecord();
@@ -277,8 +283,7 @@
comEventTransferRecord.setSpecialistName(comEvent.getSpecialistName());
comEventTransferRecord.setEventResult(comEvent.getEventSucceed());
comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus());
- comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
- return R.ok();
+ return comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
}
private Boolean checkExist(String sn, Long id) {
--
Gitblit v1.7.1