From 759bbb8ee99665382a689fa90277a9b2279238da Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 19 八月 2022 19:04:02 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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..d7bfeff 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
@@ -74,7 +74,7 @@
PageUtils.checkCheck(pageQuery);
return this.targetMngService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -137,7 +137,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,12 +217,22 @@
*/
@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);
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
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));
}
@@ -240,4 +250,4 @@
System.out.println(JSONObject.toJSONString(mng));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2