From 15d4a2bf89b0ee5e474f6638ee8cef7e88946b97 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Mon, 10 Nov 2025 17:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=AF=B9=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=A9=BA=E5=80=BC=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/hsz/mapper/AssessTaskMapper.java  |  8 ++++++--
 .../hsz/mapper/AssessTeamRatingMapper.java    |  8 ++++++--
 .../project/hsz/model/AssessObject.java       |  2 +-
 .../hsz/service/AssessTaskService.java        | 19 ++++++++++++++++++-
 .../hsz/service/AssessTeamRatingService.java  |  9 ++++++++-
 5 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gunshi/project/hsz/mapper/AssessTaskMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/AssessTaskMapper.java
index 273c318..6a83bec 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/AssessTaskMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/AssessTaskMapper.java
@@ -109,8 +109,12 @@ public interface AssessTaskMapper extends BaseMapper<AssessTask> {
             <script>
                 select t.* from public.assess_task t
                 where t.status = 3
-                and date_trunc('MONTH', t.start_date) <![CDATA[>=]]> #{obj.start}
-                and date_trunc('MONTH', t.start_date) <![CDATA[<=]]> #{obj.end}
+                <if test = "obj.start != null">
+                    and date_trunc('MONTH', t.start_date) <![CDATA[>=]]> #{obj.start}
+                </if>
+                <if test = "obj.end != null">
+                    and date_trunc('MONTH', t.start_date) <![CDATA[<=]]> #{obj.end}
+                </if>
                 order by t.start_date
             </script>
              """)
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/AssessTeamRatingMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/AssessTeamRatingMapper.java
index 0ac9e61..690b7a9 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/AssessTeamRatingMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/AssessTeamRatingMapper.java
@@ -84,8 +84,12 @@ public interface AssessTeamRatingMapper extends BaseMapper<AssessTeamRating> {
                 left join public.assess_team t1 on t.team_id = t1.id
                 left join public.assess_task t5 on t1.task_id = t5.id
                 where t.is_need_rectify = 1 and t5.status = 3
-                and date_trunc('MONTH', t5.start_date) <![CDATA[>=]]> #{obj.start}
-                and date_trunc('MONTH', t5.start_date) <![CDATA[<=]]> #{obj.end}
+                <if test ="obj.start !=null">
+                    and date_trunc('MONTH', t5.start_date) <![CDATA[>=]]> #{obj.start}
+                </if>
+                <if test="obj.end !=null">
+                    and date_trunc('MONTH', t5.start_date) <![CDATA[<=]]> #{obj.end}
+                </if>
             </script>
              """)
     List<AssessTeamRating> rectifyStat(@Param("obj") MonthRangeSo monthRangeSo);
diff --git a/src/main/java/com/gunshi/project/hsz/model/AssessObject.java b/src/main/java/com/gunshi/project/hsz/model/AssessObject.java
index a52c681..11929e9 100644
--- a/src/main/java/com/gunshi/project/hsz/model/AssessObject.java
+++ b/src/main/java/com/gunshi/project/hsz/model/AssessObject.java
@@ -81,7 +81,7 @@ public class AssessObject implements Serializable {
         * 考核等级（1优秀 2良好 3合格）
         */
         @TableField(value="assess_level")
-        @Schema(description="考核等级（1优秀 2良好 3合格）")
+        @Schema(description="考核等级（1优秀 2良好 3合格 4不合格）")
         private Integer assessLevel;
 
         /**
diff --git a/src/main/java/com/gunshi/project/hsz/service/AssessTaskService.java b/src/main/java/com/gunshi/project/hsz/service/AssessTaskService.java
index a7fe190..3b4a70b 100644
--- a/src/main/java/com/gunshi/project/hsz/service/AssessTaskService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/AssessTaskService.java
@@ -248,7 +248,24 @@ public class AssessTaskService extends ServiceImpl<AssessTaskMapper, AssessTask>
             return new HashMap<>();
         }
         List<AssessObject> objectList = list.stream().map(AssessTask::getAssessObjects).flatMap(List::stream).collect(Collectors.toList());
-        return objectList.stream().collect(Collectors.groupingBy(AssessObject::getAssessLevel,Collectors.counting()));
+        Map<Integer, Long> collect = objectList.stream().collect(Collectors.groupingBy(AssessObject::getAssessLevel, Collectors.counting()));
+        if(!collect.containsKey(1)){
+            //表示优秀的为0
+            collect.put(1,0L);
+        }
+        if(!collect.containsKey(2)){
+            //表示良好的为0
+            collect.put(2,0L);
+        }
+        if(!collect.containsKey(3)){
+            //表示合格的为0
+            collect.put(3,0L);
+        }
+        if(!collect.containsKey(4)){
+            //表示不合格的为0
+            collect.put(4,0L);
+        }
+        return collect;
     }
 }
 
diff --git a/src/main/java/com/gunshi/project/hsz/service/AssessTeamRatingService.java b/src/main/java/com/gunshi/project/hsz/service/AssessTeamRatingService.java
index 65ac10c..eb907b0 100644
--- a/src/main/java/com/gunshi/project/hsz/service/AssessTeamRatingService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/AssessTeamRatingService.java
@@ -239,7 +239,14 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
 
     public Map<Integer, Long> rectifyStat(MonthRangeSo monthRangeSo) {
         List<AssessTeamRating> list = this.baseMapper.rectifyStat(monthRangeSo);
-        return list.stream().collect(Collectors.groupingBy(AssessTeamRating::getRectifyStatus, Collectors.counting()));
+        Map<Integer, Long> collect = list.stream().collect(Collectors.groupingBy(AssessTeamRating::getRectifyStatus, Collectors.counting()));
+        if(!collect.containsKey(0)){
+            collect.put(0,0L);
+        }
+        if(!collect.containsKey(1)){
+            collect.put(1,0L);
+        }
+        return collect;
     }
 }