From 5cbc354b44bd31ffa010f04fdbaef47619ec6f69 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 30 六月 2021 16:58:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
index efc4818..a04c7bf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -354,13 +354,13 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R cancel(Long id) {
+ public R cancel(IdDTO idDTO) {
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
return R.fail("当前状态不可撤销");
}
- int rt = eventVisitingTasksMapper.cancel(id,EventTasksStatusEnum.YCX.getCode());
+ int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),EventTasksStatusEnum.YCX.getCode());
if(rt > 0){
return R.ok();
}
@@ -369,13 +369,13 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R reset(Long id) {
+ public R reset(IdDTO idDTO) {
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
return R.fail("当前状态不可恢复");
}
- int rt = eventVisitingTasksMapper.updateEventStatus(id,EventTasksStatusEnum.DZF.getCode());
+ int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());
if(rt > 0){
return R.ok();
}
--
Gitblit v1.7.1