From 2959046b912fc5fc140fdcd043f7a8bf23807671 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Sun, 25 Apr 2021 10:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=B0=B1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20=E8=BF=94=E5=9B=9E=20=E6=98=AF=E5=90=A6=E8=BE=BE?=
 =?UTF-8?q?=E5=88=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/dto/group/result/AchievementDetailResultDTO.java    | 4 ++++
 .../modules/group/service/impl/ResiGroupServiceImpl.java      | 2 ++
 .../resources/mapper/group/ResiGroupAchievementStatsDao.xml   | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AchievementDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AchievementDetailResultDTO.java
index 1abbdc4dd3..76ebe24978 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AchievementDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AchievementDetailResultDTO.java
@@ -33,5 +33,9 @@ public class AchievementDetailResultDTO implements Serializable {
 		 * 成就描述（分拼在一起）
 		 */
 		private String describe;
+		/**
+		 * 是否达成 0，1
+		 */
+		private Integer isArrive;
 	}
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 13aa64d7dc..6799e92c4e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -1208,6 +1208,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				AchievementDetailResultDTO.AchievementBean bean = new AchievementDetailResultDTO.AchievementBean();
 				String describe = item.getAchievementName() + "(" + item.getCurrentValue().toString() + "/" + item.getTargetValue().toString() + ")";
 				bean.setDescribe(describe);
+				bean.setIsArrive(item.getIsArrive());
 				achievementList.add(bean);
 			});
 		}
@@ -1218,6 +1219,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				AchievementDetailResultDTO.AchievementBean bean = new AchievementDetailResultDTO.AchievementBean();
 				bean.setDescribe(item.getAchievementName());
 				bean.setCompletionDate(DateUtils.dateToTimestamp(item.getArriveTime()));
+				bean.setIsArrive(item.getIsArrive());
 				achievementList.add(bean);
 			});
 		}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml
index a6d3c8e49b..03b7aef721 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementStatsDao.xml
@@ -25,7 +25,8 @@
             ACHIEVEMENT_ID,
             ACHIEVEMENT_NAME,
             CURRENT_VALUE,
-            TARGET_VALUE
+            TARGET_VALUE,
+            IS_ARRIVE
         FROM
             resi_group_achievement_stats
         WHERE DEL_FLAG = '0'