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/TargetMngController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 d0e84d5..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);
}
@@ -137,7 +147,7 @@
Map<String,String> map = new LinkedHashMap<>();
map.put("1","安全目标指标");
map.put("2","目标指标编号");
- map.put("3","指标类型 1:年指标 2:月指标");
+ map.put("3","指标类型 1:年指标 2:月指标 3:半年 4:季度");
map.put("4","年度");
map.put("5","指标值");
map.put("6","指标级别 1:公司级 2:部门分厂级 3:工段班组级");
@@ -217,7 +227,7 @@
*/
@PostMapping(value = "/checkAndSubimt/list")
public ResultVO list(Authentication authentication, @RequestBody PageQuery<TargetCheckAndSubmitQueryCriteria> pageQuery){
- if(pageQuery.getSearchParams().getTargetType() == null){
+ if(pageQuery.getSearchParams().getRelateType() == null){
return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少targetType");
}
PageUtils.checkCheck(pageQuery);
@@ -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