From 7b3bb22713ca70c58dbc5d05866a75664253c1a1 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Wed, 19 Apr 2023 19:59:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E5=8A=9F=E8=83=BDbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.xml | 2 +-
 .../com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.xml
index 0a02bd9..ca66a40 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.xml
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.xml
@@ -45,7 +45,7 @@
         select
         <include refid="Base_Column_List" />
         from hz_ims_duty_group_p
-        where ID = #{groupId,jdbcType=BIGINT}
+        where GROUP_ID = #{groupId,jdbcType=BIGINT}
     </select>
     <select id="selectPersonIdsByGroupId" resultType="java.lang.String">
         select
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml
index eaaa08f..ae1758f 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml
@@ -148,7 +148,12 @@
     </select>
     <select id="selectByIdOneV2" resultType="com.hnac.hzims.operational.duty.vo.ImsSchedulingVo">
         SELECT
-        DM.*,
+        DM.ID AS id,
+        DM.DUTY_GROUP_ID AS groupId,
+        DM.CLASS_ID AS classId,
+        DM.PRE_DUTY_ID AS preDutyId,
+        DM.DUTY_PERSON_IDS AS dutyPersonIds,
+        DM.status ,
         DC.CLASS_NAME AS className,
         DC.`START_TIME` AS startTime,
         DC.`END_TIME` AS endTime