From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
index 7a63cb2..023a55e 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
@@ -35,7 +35,6 @@
import java.net.URLEncoder;
import java.sql.Timestamp;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 目标指标(TargetMng)表控制层
@@ -122,9 +121,20 @@
}
List<Long> idList = Arrays.asList(ids);
//删除关联表数据
- this.targetDivideDetailService.remove(new QueryWrapper<TargetDivideDetail>().in("target_id",idList));
+ UpdateWrapper<TargetDivideDetail> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.in("target_id",idList);
+ TargetDivideDetail detail = new TargetDivideDetail();
+ detail.setDelFlag(1);
+ this.targetDivideDetailService.update(detail,updateWrapper);
- this.targetMngService.removeByIds(idList);
+ List<TargetMng> delList = new ArrayList<>();
+ idList.forEach(f->{
+ TargetMng info = new TargetMng();
+ info.setDelFlag(1);
+ info.setId(f);
+ delList.add(info);
+ });
+ this.targetMngService.updateBatchById(delList);
return new ResultVO<>(ResultCodes.OK);
}
@@ -225,6 +235,16 @@
return this.targetMngService.queryAll(currentUser.getUid(),pageQuery);
}
+ /**
+ * 统计
+ *
+ * @return 删除结果
+ */
+ @GetMapping(value = "/statistics")
+ public ResultVO statistics(TargetMngQueryCriteria criteria) {
+ return new ResultVO<>(ResultCodes.OK,this.targetMngService.statistics(criteria));
+ }
+
public static void main(String[] args) {
TargetMng mng = new TargetMng();
--
Gitblit v1.9.2