From 11dc85a65bccd91dafd3ed0d6b289c55c73149f4 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 30 Sep 2024 15:40:24 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/screen/service/impl/ProjectViewServiceImpl.java  | 7 +++++++
 .../src/main/java/com/bonus/screen/vo/TeamRecord.java      | 6 +++++-
 .../src/main/resources/mapper/screen/TeamRecordMapper.xml  | 5 ++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java
index c5cfdf9..291e42e 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java
@@ -244,6 +244,13 @@ public class ProjectViewServiceImpl {
                 if (StringUtils.isNotBlank(people.getPhone())) {
                     people.setPhone(Sm4Utils.decode(people.getPhone()));
                 }
+                if (people.getSex() != null) {
+                    if (people.getSex() == 0) {
+                        people.setSexName("女");
+                    } else if (people.getSex() == 1) {
+                        people.setSexName("男");
+                    }
+                }
                 extracted(people);
             });
         }
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java
index 84f3329..5dc7fef 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java
@@ -78,10 +78,14 @@ public class TeamRecord implements Serializable {
     @ApiModelProperty(value="性别")
     private Integer sex;
 
+    /**
+     * 性别名称
+     */
+    private String sexName;
+
     /**
      * 班组人数
      */
-    @Excel(name = "班组人数")
     private Integer peopleCount;
 
     private static final long serialVersionUID = 1L;
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml
index 540eb7e..6823c9f 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml
@@ -30,8 +30,8 @@
         tt.rel_phone as masterPhone,
         count(tp.id) as peopleCount
         from tb_team tt
-        left join tb_people tp on tt.id = tp.team_id and tp.del_flag = 0 and tt.js_time IS NULL
-        where tt.del_flag = 0
+        left join tb_people tp on tt.id = tp.team_id and tp.del_flag = 0
+        where tt.del_flag = 0 AND tt.js_time IS NULL
         <if test="proId != null">
             AND tt.pro_id = #{proId}
         </if>
@@ -42,7 +42,6 @@
             and tt.rel_name like concat('%',#{masterName},'%')
         </if>
         group by tt.id
-        order by tt.team_name
     </select>
 
     <!--    施工人员详情页  -->