From 1894f9a15faae479122f6b9dfe9094ccbda36233 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Thu, 19 Sep 2024 16:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E4=B8=AD=E5=8F=B0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/IIntegrationTaskLivingDetailsDao.java         |  2 ++
 .../dao/impl/IntegrationTaskLivingDetailsDaoImpl.java |  4 ++++
 .../entity/IntegrationTaskLivingDetailsEntity.xml     | 11 +++++++++++
 3 files changed, 17 insertions(+)

diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java
index 5e902dd0..976cdb8b 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java
@@ -40,5 +40,7 @@ public interface IIntegrationTaskLivingDetailsDao extends IBaseDao<IntegrationTa
     IntegrationTaskLivingDetailsEntity queryEntity(IntegrationTaskLivingDetailsEntity entity);
 
     Integer deleteEntity(IntegrationTaskLivingDetailsEntity deleteEntity);
+
+    IntegrationTaskLivingDetailsEntity queryEntityById(IntegrationTaskLivingDetailsEntity entity);
 }
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java
index a810e396..557dfcd3 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java
@@ -52,5 +52,9 @@ public class IntegrationTaskLivingDetailsDaoImpl extends MybatisGenericDao<Integ
     public IntegrationTaskLivingDetailsEntity queryEntity(IntegrationTaskLivingDetailsEntity entity) {
         return (IntegrationTaskLivingDetailsEntity) super.selectOne(getSqlIdPrifx() + "queryEntity", entity);
     }
+    @Override
+    public IntegrationTaskLivingDetailsEntity queryEntityById(IntegrationTaskLivingDetailsEntity entity) {
+        return (IntegrationTaskLivingDetailsEntity) super.selectOne(getSqlIdPrifx() + "queryEntityById", entity);
+    }
 }
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml
index 70637480..d36dc5f3 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml
@@ -573,6 +573,17 @@
             </otherwise>
         </choose> where id = #{id} and sts='Y'
     </select>
+
+
+    <select id="queryEntityById" resultMap="get-IntegrationTaskLivingDetailsEntity-result" parameterType="com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity">
+        select
+        <include refid="IntegrationTaskLivingDetailsEntity_Base_Column_List" />
+        FROM integration_task_living_details WHERE id = #{id} AND sts='Y'
+        UNION ALL
+        select
+        <include refid="IntegrationTaskLivingDetailsEntity_Base_Column_List" />
+        FROM integration_task_living_details_success WHERE id = #{id} AND sts='Y'
+    </select>
     <sql id="IntegrationTaskLivingDetailsVo_Base_Column_List">
         id,
 		task_linving_id,