From b854d8d7604329dcf99584d15f83ff02076d9e07 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Thu, 01 Sep 2022 10:52:04 +0800
Subject: [PATCH] 假删除fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyWorkApproveController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyWorkApproveController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyWorkApproveController.java
index 642d6c1..2cb7dcf 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyWorkApproveController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyWorkApproveController.java
@@ -9,6 +9,7 @@
import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.targetDuty.entity.ExamineMng;
import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDutyWorkApproveDto;
import com.gkhy.safePlatform.targetDuty.service.TargetDutyWorkApproveService;
import com.gkhy.safePlatform.targetDuty.utils.DateUtils;
import org.springframework.security.core.Authentication;
@@ -20,6 +21,7 @@
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDutyWorkApproveQueryCriteria;
import java.sql.Timestamp;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.stream.Collectors;
@@ -63,7 +65,8 @@
*/
@GetMapping(value = "/selectOne/{id}")
public ResultVO selectOne(@PathVariable Serializable id) {
- return new ResultVO<>(ResultCodes.OK,this.targetDutyWorkApproveService.getById(id));
+ TargetDutyWorkApproveDto dto = this.targetDutyWorkApproveService.selectOne(id);
+ return new ResultVO<>(ResultCodes.OK,dto);
}
/**
@@ -106,7 +109,15 @@
return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
}
List<Long> idList = Arrays.asList(ids);
- this.targetDutyWorkApproveService.removeByIds(idList);
+
+ List<TargetDutyWorkApprove> delList = new ArrayList<>();
+ idList.forEach(f->{
+ TargetDutyWorkApprove info = new TargetDutyWorkApprove();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ this.targetDutyWorkApproveService.updateBatchById(delList);
return new ResultVO<>(ResultCodes.OK);
}
--
Gitblit v1.9.2