From cd3394233ecbed4b70eebeb74303962f9671b4b1 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Sat, 30 Mar 2024 20:50:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/system/base/vo/GxPlanProgressVo.java               | 2 +-
 .../src/main/resources/mapper/HumanManageMapper.xml           | 3 +--
 .../src/main/resources/mapper/base/ProScheduleMapper.xml      | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/GxPlanProgressVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/GxPlanProgressVo.java
index c142294..885c29b 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/GxPlanProgressVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/GxPlanProgressVo.java
@@ -68,7 +68,7 @@ public class GxPlanProgressVo {
     private double planProgress;
 
     @ApiModelProperty(value = "工序名称")
-    private String gxName;
+    private String currentGxName;
 
     /**
      * 查询条件限制
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml
index 2e69712..00ea681 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml
@@ -138,9 +138,8 @@
     <select id="getPersonnelAccessLists" resultType="com.securitycontrol.entity.background.vo.UserAccessVo">
         SELECT tua.user_name AS userName,
                tua.access_time AS accessTime,
-               sd.dict_name AS accessType
+               IF(access_type == '1','入场','出场') AS accessType
         FROM tb_user_access tua
-        LEFT JOIN sys_dict sd ON tua.access_type = sd.dict_code
         WHERE user_id = #{id}
         <if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''">
             AND tua.access_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
index c9390e3..b4a7695 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
@@ -122,12 +122,12 @@
             resultType="com.securitycontrol.entity.system.base.vo.GxPlanProgressVo">
         SELECT tpp.gx_progress AS gxProgress,
                tpp.create_time AS createTime,
-               sd.dict_name AS gxName
+               sd.dict_name AS currentGxName
         FROM tb_project_progress tpp
         LEFT JOIN tb_gx_plan tgp ON tpp.plan_id = tgp.plan_id AND tgp.del_flag = 0
         LEFT JOIN sys_dict sd on tpp.gx_id = sd.dict_code AND sd.del_flag = 0
         WHERE tpp.plan_id = #{planId}
-        ORDER BY tpp.create_time
+        ORDER BY tpp.gx_id,tpp.create_time
     </select>
     <!--工序计划是否第一次填报-->
     <select id="isFirstFillingGxProgress" resultType="java.lang.Integer">