From da981624e169b181b170e5d92986e190b9ff8052 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Mon, 22 Aug 2022 10:33:24 +0800
Subject: [PATCH] 目标fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java | 19 ++++++++++++++-----
1 files changed, 14 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..68f0a8b 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)表控制层
@@ -96,7 +95,7 @@
@PostMapping(value = "/addOrUpdate")
public ResultVO update(@RequestBody TargetMng targetMng) {
- if( !StringUtils.hasText(targetMng.getqName()) || !StringUtils.hasText(targetMng.getIndexNum())
+ if( !StringUtils.hasText(targetMng.getQName()) || !StringUtils.hasText(targetMng.getIndexNum())
|| !StringUtils.hasText(targetMng.getYear()) || !StringUtils.hasText(targetMng.getValue())
|| targetMng.getTargetType() == null){
return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少必填字段");
@@ -137,7 +136,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 +216,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,10 +224,20 @@
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();
- mng.setqName("12");
+ mng.setQName("12");
mng.setIndexNum("3");
mng.setYear("2021");
mng.setValue("312");
--
Gitblit v1.9.2