From 69a50dada3c48d87dc27f06ee598d6c5711dbe2e Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 19 八月 2022 18:56:47 +0800
Subject: [PATCH] 目标统计fix

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java |   16 +++++++++++++---
 1 files changed, 13 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 bf3ec93..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:工段班组级");
@@ -225,6 +225,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();
@@ -240,4 +250,4 @@
         System.out.println(JSONObject.toJSONString(mng));
 
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.2