Merge remote-tracking branch 'origin/master'

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostAssessmentRatingController.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.annotation.Anonymous;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -180,4 +181,23 @@ public class PostAssessmentRatingController extends BaseController {
     public AjaxResult getProblemByDeptId(@PathVariable Long deptId) {
         return success(postAssessmentRatingService.getProblemByDeptId(deptId));
     }
+
+
+
+
+    /**
+     * 根据部门查询问题
+     */
+    @ApiOperation("根据部门查询问题")
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型1 年度 2 季度 3 月度", dataType = "String", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "year", value = "年份", dataType = "String", dataTypeClass = String.class)
+    })
+    @GetMapping("/{type}/{year}")
+    @Anonymous
+    public AjaxResult assessmentstatistics(@PathVariable("type") Integer type,@PathVariable("year") String year) {
+        return success(postAssessmentRatingService.assessmentstatistics(type,year));
+    }
+
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/mapper/PostCheckedProblemMapper.java

@@ -2,10 +2,22 @@ package com.ruoyi.postCheck.mapper;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.postCheck.domain.PostCheckedProblem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.postCheck.domain.problemStatistics.ProblemNumberBase;
 import com.ruoyi.postCheck.domain.tools.ProblemCategory;
+import org.apache.ibatis.annotations.MapKey;
+
+
+
+
+
+
+
+
+
 
 /**
  * 岗检问题表Mapper接口
@@ -72,4 +84,10 @@ public interface PostCheckedProblemMapper extends BaseMapper<PostCheckedProblem>
      * @return
      */
     List<ProblemCategory> problemCategoryByAttribute();
+    @MapKey("YEAR")
+    Map<String, Object> getYearStatistics(String year);
+    @MapKey("QUARTER")
+    Map<String, Object> getQuarterStatistics(String year);
+    @MapKey("MONTH")
+    Map<String, Object> getMonthStatistics(String year);
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostAssessmentRatingService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.postCheck.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.postCheck.domain.PostAssessmentRating;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.postCheck.domain.PostCheckedProblem;
@@ -71,4 +73,6 @@ public interface IPostAssessmentRatingService extends IService<PostAssessmentRat
     public int deletePostAssessmentRatingById(Long id);
 
     List<PostCheckedProblem> getProblemByDeptId(Long id);
+
+    Map<String,Object> assessmentstatistics(Integer type, String year);
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostAssessmentRatingServiceImpl.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -203,4 +204,15 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
             .eq(PostCheckedProblem::getCheckedDeptId,id)
         );
     }
+
+    @Override
+    public Map<String, Object> assessmentstatistics(Integer type, String year) {
+        if (type == 1)
+            return postCheckedProblemMapper.getYearStatistics(year);
+        if (type == 2)
+            return postCheckedProblemMapper.getQuarterStatistics(year);;
+        if (type == 3)
+            return postCheckedProblemMapper.getMonthStatistics(year);;
+        return new HashMap<>();
+    }
 }

ruoyi-postcheck/src/main/resources/mapper/postCheck/PostCheckedProblemMapper.xml

@@ -359,4 +359,146 @@
         GROUP BY problem_attribute
         ORDER BY t1.problem_attribute
     </select>
+
+    <select id="getQuarterStatistics" resultType="java.util.Map">
+        SELECT "QUARTER",IFNULL(sum(num), '0') "num"
+        FROM (SELECT t."QUARTER", (t."sum" - t."two" - t."one") / "total" AS "num"
+              FROM (SELECT EXTRACT(
+                                   QUARTER
+                                   FROM
+                                   pp."create_time"
+                               )       "QUARTER",
+                           sum(pr."full_score"),
+                           COUNT(0)    total,
+                           SUM(CASE
+                               pp."problem_level"
+                                   WHEN 2 THEN pr."problem_level_two"
+                                   ELSE '0'
+                               END) AS "two",
+                           sum(CASE
+                               pp."problem_level"
+                                   WHEN 1 THEN pr."problem_level_one"
+                                   ELSE '0'
+                               END) AS "one"
+                    FROM "public"."post_checked_problem" pp
+                             INNER JOIN "public"."post_assessment_rules" pr ON
+                                pp."duty_type" = pr."duty_type"
+                            AND pr."type" = 1
+                    WHERE to_date(pp."create_time", 'YYYY') = to_date(#{year}, 'YYYY')
+                    GROUP BY EXTRACT(
+                                     QUARTER
+                                     FROM
+                                     pp."create_time"
+                                 )) t
+              union all
+              SELECT EXTRACT(
+                             QUARTER
+                             FROM
+                             "create_time"
+                         ) AS                        "QUARTER",
+                     sum("by_dept_score") / count(0) "num"
+
+              FROM "public"."post_assessment_rating_other_info"
+              WHERE to_date("create_time", 'YYYY') = to_date(#{year}, 'YYYY')
+              GROUP BY EXTRACT(
+                               QUARTER
+                               FROM
+                               "create_time"
+                           )) a
+        GROUP BY a."QUARTER"
+    </select>
+
+    <select id="getYearStatistics" resultType="java.util.Map">
+        SELECT "YEAR",IFNULL(sum(num), '0') "num"
+        FROM (SELECT t."YEAR", (t."sum" - t."two" - t."one") / "total" AS "num"
+              FROM (SELECT EXTRACT(
+                                   YEAR
+                                   FROM
+                                   pp."create_time"
+                               )       "YEAR",
+                           sum(pr."full_score"),
+                           COUNT(0)    total,
+                           SUM(CASE
+                               pp."problem_level"
+                                   WHEN 2 THEN pr."problem_level_two"
+                                   ELSE '0'
+                               END) AS "two",
+                           sum(CASE
+                               pp."problem_level"
+                                   WHEN 1 THEN pr."problem_level_one"
+                                   ELSE '0'
+                               END) AS "one"
+                    FROM "public"."post_checked_problem" pp
+                             INNER JOIN "public"."post_assessment_rules" pr ON
+                                pp."duty_type" = pr."duty_type"
+                            AND pr."type" = 1
+                    GROUP BY EXTRACT(
+                                     YEAR
+                                     FROM
+                                     pp."create_time"
+                                 )) t
+              union all
+              SELECT EXTRACT(
+                             YEAR
+                             FROM
+                             "create_time"
+                         ) AS                        "YEAR",
+                     sum("by_dept_score") / count(0) "num"
+
+              FROM "public"."post_assessment_rating_other_info"
+              GROUP BY EXTRACT(
+                               YEAR
+                               FROM
+                               "create_time"
+                           )) a
+        GROUP BY a."YEAR"
+    </select>
+
+    <select id="getMonthStatistics" resultType="java.util.Map">
+        SELECT "MONTH", IFNULL(sum(num), '0') "num"
+        FROM (SELECT t."MONTH", (t."sum" - t."two" - t."one") / "total" AS "num"
+              FROM (SELECT EXTRACT(
+                                   MONTH
+                                   FROM
+                                   pp."create_time"
+                               )       "MONTH",
+                           sum(pr."full_score"),
+                           COUNT(0)    total,
+                           SUM(CASE
+                               pp."problem_level"
+                                   WHEN 2 THEN pr."problem_level_two"
+                                   ELSE '0'
+                               END) AS "two",
+                           sum(CASE
+                               pp."problem_level"
+                                   WHEN 1 THEN pr."problem_level_one"
+                                   ELSE '0'
+                               END) AS "one"
+                    FROM "public"."post_checked_problem" pp
+                             INNER JOIN "public"."post_assessment_rules" pr ON
+                                pp."duty_type" = pr."duty_type"
+                            AND pr."type" = 1
+                    WHERE to_date(pp."create_time", 'YYYY') = to_date(#{year}, 'YYYY')
+                    GROUP BY EXTRACT(
+                                     MONTH
+                                     FROM
+                                     pp."create_time"
+                                 )) t
+              union all
+              SELECT EXTRACT(
+                             MONTH
+                             FROM
+                             "create_time"
+                         ) AS                        "MONTH",
+                     sum("by_dept_score") / count(0) "num"
+
+              FROM "public"."post_assessment_rating_other_info"
+              WHERE to_date("create_time", 'YYYY') = to_date(#{year}, 'YYYY')
+              GROUP BY EXTRACT(
+                               MONTH
+                               FROM
+                               "create_time"
+                           )) a
+        GROUP BY a."MONTH"
+    </select>
 </mapper>