From 55a79f7030dc44b25a26687df8e03311dbced348 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 13 May 2020 10:11:06 +0800
Subject: [PATCH] =?UTF-8?q?PC=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=A7=AF=E5=88=86-=E6=9F=A5=E7=9C=8B=20=20?=
 =?UTF-8?q?=20=E5=8E=BB=E9=99=A4=E5=AD=97=E6=AE=B5=20status=E3=80=81failur?=
 =?UTF-8?q?eReason=EF=BC=8C=20=E8=A7=A3=E5=86=B3=201.=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E4=BC=9A=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=AE=A1=E6=A0=B8=E7=9A=84=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=98=AF=E5=90=A6=E5=8A=A0=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E4=B8=8D=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ActUserRelationServiceImpl.java        |  2 --
 .../mapper/activity/ActUserRelationDao.xml      | 17 ++++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
index 36d2eb32..08ede80e 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
@@ -122,8 +122,6 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
     @Override
     public ActInfoClockResultDTO getActDetail(String id) {
         ActInfoClockResultDTO resultDTO = baseDao.getActDetail(id);
-        resultDTO.setOldStatus(resultDTO.getStatus());
-        System.out.println(resultDTO);
         return resultDTO;
     }
 
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
index fc6c7cb4..0931d941 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
@@ -190,16 +190,15 @@
         <result property="radius" column="CLOCK_RADIUS"/>
 
     </resultMap>
-    <select id="getActDetail" resultMap="actInfoClockResultMap">
+    <select id="getActDetail" resultType="com.elink.esua.epdc.activity.result.ActInfoClockResultDTO">
         SELECT
-        relation.ID,
-        relation.ACT_ID,
-        relation.STATUS,
-        relation.FAILURE_REASON,
-        info.SIGNIN_ADDRESS,
-        info.SIGNIN_LATITUDE,
-        info.SIGNIN_LONGITUDE,
-        info.CLOCK_RADIUS
+        relation.ID id,
+        relation.ACT_ID actId,
+        relation.STATUS oldStatus,
+        info.SIGNIN_ADDRESS address,
+        info.SIGNIN_LATITUDE latitude,
+        info.SIGNIN_LONGITUDE longitude,
+        info.CLOCK_RADIUS radius
         FROM
         epdc_act_user_relation relation
         LEFT JOIN