From 306a33f152d13beb12a9861b004d778621fa9fe4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 14 七月 2021 13:19:04 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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 0cd7897..16880f7 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
@@ -177,19 +177,15 @@
@Transactional
@Override
public R delete(IdDTO idDTO, Long communityId) {
- StringBuilder rt = new StringBuilder();
- String[] idarr = idDTO.getId().split(",");
- for(String id:idarr){
- if(StringUtils.isEmpty(id)){
- continue;
+ String[] ids = idDTO.getId().split(",");
+ for(String id:ids){
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(id));
+ if(eventVisitingTasksDO != null){
+ if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
+ return R.fail("您选择的走访任务中有已解决的不可删除");
+ }
+ eventVisitingTasksMapper.deleteById(id);
}
- String error = toDelete(Long.valueOf(id));
- if(!StringUtils.isEmpty(error)){
- rt.append(rt);
- }
- }
- if(!StringUtils.isEmpty(rt)){
- return R.fail("部分删除失败:"+rt.toString());
}
return R.ok();
}
@@ -202,7 +198,7 @@
if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
}
- eventVisitingTasksMapper.deleteById(Long.valueOf(id));
+ eventVisitingTasksMapper.deleteById(id);
return null;
}
@@ -371,7 +367,7 @@
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
return R.fail("当前状态不可撤销");
}
- int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),EventTasksStatusEnum.YCX.getCode());
+ int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),5);
if(rt > 0){
return R.ok();
}
@@ -383,7 +379,7 @@
public R reset(IdDTO idDTO) {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
- if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
+ if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != 5){
return R.fail("当前状态不可恢复");
}
int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());
--
Gitblit v1.7.1