Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java

@@ -226,14 +226,16 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService
             statsEntity.setCurrentValue(currentValue);
             statsEntity.setTargetValue(configEntity.getTargetValue());
             statsEntity.setDelFlag(NumConstant.ZERO_STR);
+            statsEntity.setArriveTime(new Date());
 
             haveArrive.add(statsEntity);
             if (currentValue >= configEntity.getTargetValue()) {
                 statsEntity.setIsArrive(NumConstant.ONE);
-                statsEntity.setArriveTime(new Date());
+
             } else {
                 //如果没有达到则 放入这一条后 退出
                 statsEntity.setIsArrive(NumConstant.ZERO);
+                statsEntity.setArriveTime(null);
                 isContinue = false;
                 break;
             }