Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActAddressResultDTO.java

@@ -0,0 +1,46 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result.resi;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 是否到达活动打卡地址
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-19
+ */
+@Data
+public class ResiActAddressResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private Boolean isAddress;
+
+    /**
+     * 未报到活动范围的提示信息
+     */
+	private String errorTip;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java

@@ -52,4 +52,9 @@ public class CanceledActResultDTO implements Serializable {
      * 活动取消的原因
      */
     private String cancelReason;
+
+    /**
+     * 活动地点
+     */
+    private String actAddress;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java

@@ -53,4 +53,9 @@ public class FinishedActResultDTO implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date actualEndTime;
+
+    /**
+     * 活动地点
+     */
+    private String actAddress;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java

@@ -77,4 +77,9 @@ public class InProgressActResultDTO implements Serializable {
     @JsonIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date signUpStartTime;
+
+    /**
+     * 活动地点
+     */
+    private String actAddress;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/JoinedUserResultDTO.java

@@ -51,6 +51,12 @@ public class JoinedUserResultDTO implements Serializable {
      */
     private Boolean signInFlag;
 
+    /**
+     * 已签到:signed_in; 默认""
+     */
+    @JsonIgnore
+    private String signInFlagStr;
+
     /**
      * true: 是志愿者 false : 不是志愿者
      */

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.4
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.5
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@@ -235,16 +235,15 @@ public class ResiActListController {
     }
 
     /**
-     * 重新定位
      * 根据活动id、前端传的实时经纬度，与活动设置的经纬度相比较，判断用户是否已到达打卡地点
      *
      * @param formDTO
-     * @return javax.xml.transform.Result
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resi.ResiActAddressResultDTO>
      * @Author zhangyong
-     * @Date 16:48 2020-07-20
+     * @Date 11:21 2020-07-28
      **/
     @PostMapping("checksigninaddress")
-    public Result cancelSignUp(@RequestBody ResiActCaculateDistanceFormDTO formDTO) {
+    public Result<ResiActAddressResultDTO> cancelSignUp(@RequestBody ResiActCaculateDistanceFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ResiActCaculateDistanceFormDTO.AddUserInternalGroup.class);
         return actInfoService.checkSignInAddress(formDTO);
     }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java

@@ -73,7 +73,7 @@ public class WorkActController {
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.work.InProgressActResultDTO>
      * @param formDTO
      * @author yinzuomei
-     * @description 进行中活动列表
+     * @description 进行中-活动列表
      * @Date 2020/7/23 21:24
      **/
     @PostMapping("inprogresslist")

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java

@@ -101,12 +101,13 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
 
     /**
      * 根据活动id、前端传的实时经纬度，与活动设置的经纬度相比较，判断用户是否已到达打卡地点
-     * @param fromDTO
-     * @return javax.xml.transform.Result
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resi.ResiActAddressResultDTO>
      * @Author zhangyong
-     * @Date 16:48 2020-07-20
+     * @Date 11:21 2020-07-28
      **/
-    Result checkSignInAddress(ResiActCaculateDistanceFormDTO fromDTO);
+    Result<ResiActAddressResultDTO> checkSignInAddress(ResiActCaculateDistanceFormDTO formDTO);
 
     /**
      * 活动列表(包含状态：报名中：signing_up；已报满：enough；截止报名: end_sign_up; 已开始： in_progress; 已结束：finished；)

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java

@@ -23,7 +23,6 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -42,6 +41,8 @@ import com.epmet.service.ActInfoService;
 import com.epmet.service.ActUserRelationService;
 import com.epmet.utils.CaculateDistance;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,6 +58,8 @@ import java.util.*;
 @Service
 public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntity> implements ActInfoService {
 
+    private Logger logger = LogManager.getLogger(ActInfoServiceImpl.class);
+
     @Autowired
     private ActInfoRedis actInfoRedis;
 
@@ -355,14 +358,20 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     }
 
     @Override
-    public Result checkSignInAddress(ResiActCaculateDistanceFormDTO formDTO) {
+    public Result<ResiActAddressResultDTO> checkSignInAddress(ResiActCaculateDistanceFormDTO formDTO) {
         // 根据活动id，查询活动基本信息
         ActInfoEntity entity = baseDao.selectById(formDTO.getActId());
         Double distance = CaculateDistance.getDistance(formDTO.getLongitude(),formDTO.getLatitude(),entity.getActLongitude().doubleValue(),entity.getActLatitude().doubleValue());
+        ResiActAddressResultDTO dto = new ResiActAddressResultDTO();
         if (distance <= entity.getSignInRadius()){
-            return new Result();
+            dto.setIsAddress(true);
+            dto.setErrorTip("");
+            return new Result<ResiActAddressResultDTO>().ok(dto);
         } else {
-            throw new RenException(EpmetErrorCode.NOT_IN_THE_SIGN_IN_RANGE.getCode());
+            logger.info("您还未进入指定的签到范围～");
+            dto.setIsAddress(false);
+            dto.setErrorTip(EpmetErrorCode.NOT_IN_THE_SIGN_IN_RANGE.getMsg());
+            return new Result<ResiActAddressResultDTO>().ok(dto);
         }
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java

@@ -81,7 +81,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
     @Autowired
     private HeartUserInfoDao heartUserInfoDao;
 
-    private Logger logger = LogManager.getLogger(WorkActDraftServiceImpl.class);
+    private Logger logger = LogManager.getLogger(ActUserRelationServiceImpl.class);
 
     @Override
     public PageData<ActUserRelationDTO> page(Map<String, Object> params) {

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/GrantPointsServiceImpl.java

@@ -21,6 +21,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -104,6 +105,7 @@ public class GrantPointsServiceImpl implements GrantPointsService {
      * @Date 2020/7/24 13:34
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void agree(GrantPointsFormDTO formDTO) {
         //是否是待处理
         ActUserRelationDTO actUserRelationDTO=actUserRelationService.get(formDTO.getActUserRelationId());
@@ -148,6 +150,7 @@ public class GrantPointsServiceImpl implements GrantPointsService {
      * @Date 2020/7/24 15:03
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deny(GrantPointsFormDTO formDTO) {
         //是否是待处理
         ActUserRelationDTO actUserRelationDTO=actUserRelationService.get(formDTO.getActUserRelationId());

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@@ -91,7 +91,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             this.grantActPoints(formDTO);
         }
         // 更新用户基础信息表 并 更新用户微信表
-        WxUserInfoFormDTO wxUserInfoFormDTO = ConvertUtils.sourceToTarget(formDTO, WxUserInfoFormDTO.class);
+        WxUserInfoFormDTO wxUserInfoFormDTO = this.packageWxUserInfo(formDTO);
         return epmetUserOpenFeignClient.updateUserBaseAndWxUserInfo(wxUserInfoFormDTO);
     }
 
@@ -118,4 +118,21 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             logger.error("志愿者认证事件发送失败");
         }
     }
+
+    /**
+     * 根据志愿者认证参数，组装微信基本信息
+     *
+     * @param formDTO
+     * @return com.epmet.dto.form.WxUserInfoFormDTO
+     * @Author zhangyong
+     * @Date 13:54 2020-07-28
+     **/
+    private WxUserInfoFormDTO packageWxUserInfo(ResiVolunteerAuthenticateFormDTO formDTO){
+        WxUserInfoFormDTO wxUserInfoFormDTO = new WxUserInfoFormDTO();
+        wxUserInfoFormDTO.setUserId(formDTO.getUserId());
+        wxUserInfoFormDTO.setNickName(formDTO.getNickname());
+        wxUserInfoFormDTO.setAvatarUrl(formDTO.getAvatarUrl());
+        wxUserInfoFormDTO.setGender(formDTO.getGender());
+        return wxUserInfoFormDTO;
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java

@@ -16,6 +16,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -92,6 +93,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
      * @Date 2020/7/21 14:00
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public SaveActDraftResultDTO saveAct(DraftActInfoFormDTO formDTO) {
         //保存活动属性
         LatestActInfoDTO latestActInfoDTO=this.constructLatestActInfoDTO(formDTO);

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -534,28 +534,41 @@ public class WorkActServiceImpl implements WorkActService {
 //            活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough
             if (nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == -1
                     || nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == 0) {
+                logger.info(String.format("当前时间%s报名截止时间%s处于报名中",
+                        DateUtils.format(nowDate,DateUtils.DATE_TIME_PATTERN),
+                        DateUtils.format(inProgressActResultDTO.getSignUpEndTime(),DateUtils.DATE_TIME_PATTERN)));
                 //截止报名时间之前(包含报名时间截止时间点)
                 if (!inProgressActResultDTO.getActQuotaCategory()) {
                     //如果是不限制名额，则显示报名中
                     inProgressActResultDTO.setStatus("signing_up");
+                    logger.info("活动不限制名额,界面显示 报名中");
                     continue;
                 } else {
                     //固定名额，且已报名人数<活动需要人数显示报名中
                     if (inProgressActResultDTO.getActQuota() > inProgressActResultDTO.getSignedUp()) {
+                        logger.info("活动限制名额,未报满,界面显示报名中");
                         inProgressActResultDTO.setStatus("signing_up");
                         continue;
                     } else if (inProgressActResultDTO.getActQuota().equals(inProgressActResultDTO.getSignedUp())) {
                         inProgressActResultDTO.setStatus("enough");
+                        logger.info("活动限制名额,且已报满,界面显示已报满");
                         continue;
                     }
                 }
             } else if (nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == 1
-                    || nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == -1) {
+                    &&nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == -1) {
+                logger.info(String.format("当前时间%s报名截止时间%s活动预计开始时间%s界面显示截止报名",
+                        DateUtils.format(nowDate,DateUtils.DATE_TIME_PATTERN),
+                        DateUtils.format(inProgressActResultDTO.getSignUpEndTime(),DateUtils.DATE_TIME_PATTERN),
+                        DateUtils.format(inProgressActResultDTO.getActStartTime(),DateUtils.DATE_TIME_PATTERN)));
                 //活动报名截止-活动预计开始之间显示截止报名
                 inProgressActResultDTO.setStatus("end_sign_up");
                 continue;
             } else if (nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == 1
                     || nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == 0) {
+                logger.info(String.format("当前时间%s活动预计开始时间%s界面显示已开始",
+                                    DateUtils.format(nowDate,DateUtils.DATE_TIME_PATTERN),
+                                    DateUtils.format(inProgressActResultDTO.getActStartTime(),DateUtils.DATE_TIME_PATTERN)));
                 //活动预计开始时间点之后，包含活动预计开始时间点，显示  已开始
                 inProgressActResultDTO.setStatus("in_progress");
                 continue;
@@ -596,6 +609,7 @@ public class WorkActServiceImpl implements WorkActService {
      * @Date 2020/7/26 17:26
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void cancelAct(CancelActFormDTO formDTO) {
         ActInfoDTO actInfoDTO=actInfoService.get(formDTO.getActId());
         if(null==actInfoDTO){
@@ -671,6 +685,7 @@ public class WorkActServiceImpl implements WorkActService {
      * @Date 2020/7/26 19:49
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void saveActualTime(SaveActualTimeFormDTO formDTO) {
         if(formDTO.getActualStartTime().compareTo(formDTO.getActualEndTime())!=-1){
             throw new RenException(EpmetErrorCode.ACT_ACTUAL_START_TIME_ERROR.getCode());
@@ -736,6 +751,7 @@ public class WorkActServiceImpl implements WorkActService {
      * @Date 2020/7/26 21:48
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void finishAct(String actId) {
         ActInfoDTO actInfoDTO=actInfoService.get(actId);
         if(null==actInfoDTO){
@@ -862,10 +878,13 @@ public class WorkActServiceImpl implements WorkActService {
         if(!actInfoDTO.getCreatedBy().equals(loginUserUtil.getLoginUserId())){
             throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode());
         }
+        //如果活动设置的分支大于0，需要判断是否已经处理完毕
         //待处理事项为空时才可以结束活动
-        List<ActUserRelationDTO> list=actUserRelationDao.selectInProgress(actInfoDTO.getId());
-        if(null!=list&&list.size()>0){
-            throw new RenException(EpmetErrorCode.HAVE_HANDLE.getCode());
+        if(actInfoDTO.getReward()>0){
+            List<ActUserRelationDTO> list=actUserRelationDao.selectInProgress(actInfoDTO.getId());
+            if(null!=list&&list.size()>0){
+                throw new RenException(EpmetErrorCode.HAVE_HANDLE.getCode());
+            }
         }
         //先填写实际开始时间、实际结束时间
         if(null==actInfoDTO.getActualStartTime()||null==actInfoDTO.getActualEndTime()){
@@ -882,6 +901,7 @@ public class WorkActServiceImpl implements WorkActService {
      * @Date 2020/7/27 10:45
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void summaryAct(SummaryActFormDTO formDTO) {
         ActInfoDTO actInfoDTO=actInfoService.get(formDTO.getActId());
         if(null==actInfoDTO){
@@ -958,6 +978,7 @@ public class WorkActServiceImpl implements WorkActService {
      * @Date 2020/7/27 13:55
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public PublishActResultDTO rePublish(RePublishFormDTO rePublishFormDTO) {
         ActInfoDTO originalActInfo=actInfoService.get(rePublishFormDTO.getActId());
         if(null==originalActInfo){

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java

@@ -13,11 +13,15 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dao.ActInfoDao;
 import com.epmet.dao.ActUserLogDao;
 import com.epmet.dao.ActUserRelationDao;
+import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.ActUserLogDTO;
 import com.epmet.dto.ActUserRelationDTO;
 import com.epmet.dto.HeartUserInfoDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.dto.form.work.*;
+import com.epmet.dto.form.work.AactUserDetailFormDTO;
+import com.epmet.dto.form.work.ActIdFormDTO;
+import com.epmet.dto.form.work.AuditUserFormDTO;
+import com.epmet.dto.form.work.UserHistoricalActFormDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.work.*;
 import com.epmet.entity.ActInfoEntity;
@@ -25,6 +29,7 @@ import com.epmet.entity.ActUserLogEntity;
 import com.epmet.entity.ActUserRelationEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.service.ActInfoService;
 import com.epmet.service.ActUserRelationService;
 import com.epmet.service.HeartUserInfoService;
 import com.epmet.service.WorkActUserService;
@@ -32,6 +37,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -62,6 +68,8 @@ public class WorkActUserServiceImpl implements WorkActUserService {
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
     @Autowired
     private LoginUserUtil loginUserUtil;
+    @Autowired
+    private ActInfoService actInfoService;
     /**
      * @param formDTO
      * @return java.util.List<com.epmet.dto.result.work.AuditingActUserResultDTO>
@@ -358,6 +366,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
      * @Date 2020/7/23 17:30
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void auditPass(String actUserRelationId) {
         ActUserRelationEntity actUserRelationEntity=actUserRelationDao.selectById(actUserRelationId);
         if(null==actUserRelationEntity||!ActConstant.ACT_USER_STATUS_AUDITING.equals(actUserRelationEntity.getStatus())){
@@ -404,6 +413,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
      * @Date 2020/7/23 18:14
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void auditRefuse(AuditUserFormDTO formDTO) {
         ActUserRelationEntity actUserRelationEntity=actUserRelationDao.selectById(formDTO.getActUserRelationId());
         if(null==actUserRelationEntity||!ActConstant.ACT_USER_STATUS_AUDITING.equals(actUserRelationEntity.getStatus())){
@@ -451,6 +461,11 @@ public class WorkActUserServiceImpl implements WorkActUserService {
      **/
     @Override
     public List<JoinedUserResultDTO> queryJoinUserList(ActIdFormDTO formDTO) {
+        ActInfoDTO actInfoDTO=actInfoService.get(formDTO.getActId());
+        if(null==actInfoDTO){
+            logger.error("act_info is null");
+            return new ArrayList<>();
+        }
         List<JoinedUserResultDTO> list=actInfoDao.queryJoinUserList(formDTO.getActId());
         if(null!=list&&list.size()>0){
             //查询已通过审核的人员id集合
@@ -458,11 +473,21 @@ public class WorkActUserServiceImpl implements WorkActUserService {
             //根据已通过的人员集合，查询出用户基本信息
             List<UserBaseInfoResultDTO> userInfoList=this.queryUserBaseInfoList(userIdList);
             for(JoinedUserResultDTO joinedUserResultDTO:list){
-                //积分描述赋值
-                if(ActConstant.ACT_USER_STATUS_AGREE.equals(joinedUserResultDTO.getRewardFlag())){
-                    joinedUserResultDTO.setPointsDes(String.format("积分+%s",joinedUserResultDTO.getReward()));
-                }else if(ActConstant.ACT_USER_STATUS_DENY.equals(joinedUserResultDTO.getRewardFlag())){
-                    joinedUserResultDTO.setPointsDes("积分+0");
+                if(actInfoDTO.getActStatus().equals(ActConstant.ACT_STATUS_FINISHED)){
+                    //积分描述赋值
+                    if(ActConstant.ACT_USER_STATUS_AGREE.equals(joinedUserResultDTO.getRewardFlag())){
+                        joinedUserResultDTO.setPointsDes(String.format("积分+%s",joinedUserResultDTO.getReward()));
+                    }else if(ActConstant.ACT_USER_STATUS_DENY.equals(joinedUserResultDTO.getRewardFlag())){
+                        joinedUserResultDTO.setPointsDes("积分+0");
+                    }
+                }else{
+                    logger.info("当前活动未结束，活动状态:"+actInfoDTO.getActStatus());
+                    joinedUserResultDTO.setPointsDes(StrConstant.EPMETY_STR);
+                }
+                if(ActConstant.ACT_USER_STATUS_SIGNED_IN.equals(joinedUserResultDTO.getSignInFlagStr())){
+                    joinedUserResultDTO.setSignInFlag(true);
+                }else{
+                    joinedUserResultDTO.setSignInFlag(false);
                 }
                 //志愿者标识赋值
                 joinedUserResultDTO.setVolunteerFlag(this.getVolunteerFlag(joinedUserResultDTO.getUserId()));

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql

@@ -0,0 +1,423 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 外网192.168.1.130
+ Source Server Type    : MySQL
+ Source Server Version : 50728
+ Source Host           : 118.190.150.119:47306
+ Source Schema         : epmet_heart
+
+ Target Server Type    : MySQL
+ Target Server Version : 50728
+ File Encoding         : 65001
+
+ Date: 28/07/2020 15:17:47
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for act_content
+-- ----------------------------
+DROP TABLE IF EXISTS `act_content`;
+CREATE TABLE `act_content`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id:act_info.id',
+  `CONTENT` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容',
+  `CONTENT_TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容类型 图片：img；文字：text',
+  `ORDER_NUM` int(11) NOT NULL COMMENT '内容顺序 从1开始',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动内容' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_customized
+-- ----------------------------
+DROP TABLE IF EXISTS `act_customized`;
+CREATE TABLE `act_customized`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键（客户如果没配置，默认的值写在代码里）',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `TITLE_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题：eg: 志愿者去哪儿',
+  `HOTLINE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '咨询热线',
+  `ACT_LIST_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动列表',
+  `HEART_RANK_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '爱心榜',
+  `ACT_REVIEW_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动回顾',
+  `MY_ACT_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '我的活动',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '爱心互助首页自定义配置' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_info
+-- ----------------------------
+DROP TABLE IF EXISTS `act_info`;
+CREATE TABLE `act_info`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `TITLE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动标题',
+  `COVER_PIC` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动封面',
+  `SIGN_UP_START_TIME` datetime(0) NOT NULL COMMENT '报名开始时间',
+  `SIGN_UP_END_TIME` datetime(0) NOT NULL COMMENT '报名截止时间',
+  `REQUIREMENT` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '招募要求',
+  `ACT_START_TIME` datetime(0) NOT NULL COMMENT '活动开始时间',
+  `ACT_END_TIME` datetime(0) NOT NULL COMMENT '活动结束时间',
+  `ACT_ADDRESS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动地点',
+  `ACT_LONGITUDE` decimal(32, 10) NOT NULL COMMENT '活动位置经度',
+  `ACT_LATITUDE` decimal(32, 10) NOT NULL COMMENT '活动位置纬度',
+  `SIGN_IN_START_TIME` datetime(0) NOT NULL COMMENT '打卡开始时间',
+  `SIGN_IN_END_TIME` datetime(0) NOT NULL COMMENT '打卡截止时间',
+  `SIGN_IN_ADDRESS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动签到打卡地点',
+  `SIGN_IN_LONGITUDE` decimal(32, 10) NOT NULL COMMENT '活动签到打卡位置经度',
+  `SIGN_IN_LATITUDE` decimal(32, 10) NOT NULL COMMENT '活动签到打卡位置纬度',
+  `SIGN_IN_RADIUS` int(11) NOT NULL COMMENT '活动签到打卡半径(单位：米)',
+  `ACT_QUOTA_CATEGORY` tinyint(1) NOT NULL DEFAULT 0 COMMENT '活动名额类型(0-不限名额，1-固定名额)',
+  `ACT_QUOTA` int(11) NULL DEFAULT 0 COMMENT '活动名额',
+  `ACT_STATUS` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '活动状态（\r\n已发布/报名中：published；\r\n已取消：canceled;\r\n已结束：finished）',
+  `CANCEL_REASON` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '活动取消的原因',
+  `CANCEL_TIME` datetime(0) NULL DEFAULT NULL COMMENT '取消活动的时间',
+  `SPONSOR_CONTACTS` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '联系人',
+  `SPONSOR_TEL` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '联系电话',
+  `SPONSOR_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '发布名义：网格主办：grid；组织主办：agency',
+  `SPONSOR_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主办方id（机关或网格的id）',
+  `SPONSOR_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动主办方名称（机关或网格的名称）',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '发布单位的上一级组织id，如果是以网格发布，此列存储的是网格所属机关的上一级机关',
+  `REWARD` int(11) NOT NULL DEFAULT 0 COMMENT '活动奖励积分',
+  `VOLUNTEER_LIMIT` tinyint(1) NOT NULL COMMENT '身份限制:1只有志愿者才可以参加活动0不限制志愿者身份',
+  `AUDIT_SWITCH` tinyint(1) NOT NULL COMMENT '审核开关：1报名人员需要人工审核0不需要',
+  `ACTUAL_START_TIME` datetime(0) NULL DEFAULT NULL COMMENT '活动实际开始时间',
+  `ACTUAL_END_TIME` datetime(0) NULL DEFAULT NULL COMMENT '活动实际结束时间',
+  `SERVICE_MIN` int(11) NULL DEFAULT NULL COMMENT '活动共计时长（服务时间）单位：分钟',
+  `SUMMARY_FLAG` tinyint(1) NOT NULL DEFAULT 0 COMMENT '1已经总结0未总结',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间（活动发布时间）',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动信息' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for act_live_pic
+-- ----------------------------
+DROP TABLE IF EXISTS `act_live_pic`;
+CREATE TABLE `act_live_pic`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `LIVE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '实况ID：act_live.id',
+  `PIC_URL` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '图片地址',
+  `SORT` int(11) NOT NULL COMMENT '排序从1开始',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标志',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动实况图片表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for act_live_rec
+-- ----------------------------
+DROP TABLE IF EXISTS `act_live_rec`;
+CREATE TABLE `act_live_rec`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id: act_info.id',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
+  `LONGITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '实况打卡位置经度',
+  `LATITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '实况打卡位置纬度',
+  `ADDRESS` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实况打卡地址',
+  `DESC` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实况打卡描述',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE,
+  INDEX `epmet_act_user_clock_log_ACT_USER_ID_IDX`(`ACT_ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动实况记录' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for act_operation_rec
+-- ----------------------------
+DROP TABLE IF EXISTS `act_operation_rec`;
+CREATE TABLE `act_operation_rec`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id',
+  `TYPE` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '发布：publish；\r\n取消活动：cancel;\r\n结束活动：finish\r\n重新编辑：update',
+  `NOTICE_USER` tinyint(1) NOT NULL DEFAULT 0 COMMENT '1通知用户0不通知，取消活动时默认true',
+  `REMARK` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注，取消活动时此列有值',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动操作日志表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_point_log
+-- ----------------------------
+DROP TABLE IF EXISTS `act_point_log`;
+CREATE TABLE `act_point_log`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键(给分或者不给分，以及重新处理插入本表)',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
+  `POINTS` int(11) NOT NULL COMMENT '积分值',
+  `OPERATE_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作类型：\r\n同意给分agree； 不给分：deny；重新处理: reset',
+  `REMARK` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注:拒绝给分和重新处理时录入的理由',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标识 0-否，1-是',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人（工作人员id）',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动发放积分日志表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_sign_in_pic
+-- ----------------------------
+DROP TABLE IF EXISTS `act_sign_in_pic`;
+CREATE TABLE `act_sign_in_pic`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `SIGN_IN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '签到记录ID：act_sign_in_record.id',
+  `PIC_URL` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '图片地址',
+  `SORT` int(11) NOT NULL COMMENT '排序从1开始',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标志',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动签到图片表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for act_sign_in_rec
+-- ----------------------------
+DROP TABLE IF EXISTS `act_sign_in_rec`;
+CREATE TABLE `act_sign_in_rec`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id：act_info.id',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
+  `LONGITUDE` decimal(32, 10) NOT NULL COMMENT '签到位置经度',
+  `LATITUDE` decimal(32, 10) NOT NULL COMMENT '签到位置纬度',
+  `ADDRESS` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '签到地址',
+  `DESC` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '签到描述',
+  `SYNC_LIVE` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0不同步实况1同步到实况记录',
+  `LIVE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实况id,党sync_live=1时此列有值',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动签到记录' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_statistical
+-- ----------------------------
+DROP TABLE IF EXISTS `act_statistical`;
+CREATE TABLE `act_statistical`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键（活动结束后插入本表）',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id',
+  `SIGNUP_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '已报名总人数（已报名/待审核auditing，审核通过passed，审核不通过refused取消报名canceld总人数）',
+  `AUDITING_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '待审核',
+  `PASSED_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '审核通过',
+  `REFUSED_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '审核不通过总人数',
+  `CANCELD_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '取消报名的人数',
+  `SIGNED_IN_USER_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '活动已签到人数',
+  `REWARD_USER_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '发放积分总人数',
+  `DENY_REWARD_USER_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '拒绝发放积分总人数',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动统计信息' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_summary
+-- ----------------------------
+DROP TABLE IF EXISTS `act_summary`;
+CREATE TABLE `act_summary`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动ID：act_info.id',
+  `CONTENT` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容',
+  `CONTENT_TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容类型 图片：img；文字：text',
+  `ORDER_NUM` int(11) NOT NULL COMMENT '内容顺序 从1开始',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动回顾表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_user_log
+-- ----------------------------
+DROP TABLE IF EXISTS `act_user_log`;
+CREATE TABLE `act_user_log`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动ID',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID',
+  `OPERATION_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作类型（已报名/待审核auditing，\r\n审核通过passed，\r\n审核不通过refused\r\n取消报名canceled，\r\n）',
+  `REASON` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作备注：（1）审核不通过的原因\r\n（2）取消报名的原因|\r\n（3）拒绝发放积分的理由\r\n(4)重新处理的理由',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间（操作的时间）',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户活动关系日志表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for act_user_relation
+-- ----------------------------
+DROP TABLE IF EXISTS `act_user_relation`;
+CREATE TABLE `act_user_relation`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键（用户-活动一对一，报名取消再报名也只有一条记录）',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动ID',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID',
+  `STATUS` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '当前状态（已报名/待审核auditing，\r\n审核通过passed，\r\n审核不通过refused\r\n取消报名canceled，\r\n）',
+  `PASSED_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '审核通过类型：auto, manual',
+  `AUDIT_TIME` datetime(0) NULL DEFAULT NULL COMMENT '审核时间（同意、拒绝的时间）',
+  `FAILURE_REASON` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '未通过原因',
+  `CANCEL_TIME` datetime(0) NULL DEFAULT NULL COMMENT '取消报名的时间',
+  `CANCEL_REASON` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户取消报名的原因',
+  `PROCESS_FLAG` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '已处理: handled;  默认\"\",重新处理时reward_flag置为空字符串',
+  `SIGN_IN_FLAG` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '已签到:signed_in; 默认\"\"',
+  `REWARD_FLAG` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '已给分：agree, 不给分：deny  默认\"\"',
+  `DENY_REWARD_REASON` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '拒绝发放积分备注',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间（报名时间）',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE,
+  INDEX `epmet_act_user_relation_ACT_ID_IDX`(`ACT_ID`, `USER_ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户活动关系表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for heart_user_info
+-- ----------------------------
+DROP TABLE IF EXISTS `heart_user_info`;
+CREATE TABLE `heart_user_info`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键（用户提交报名成功后，插入本表）',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
+  `VOLUNTEER_FLAG` tinyint(1) NOT NULL COMMENT '1是志愿者，0不是志愿者（志愿者注册成功后需要来更新值）',
+  `KINDNESS_TIME` int(11) NOT NULL DEFAULT 0 COMMENT '爱心时长(单位：分钟)（参与并签到了的活动，实际结束-实际开始）签到的。未签到但是有积分的\r\n',
+  `PARTICIPATION_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '实际参与活动个数（签到+1）',
+  `OBTAIN_POINT_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '参与活动并获得积分的次数（结束活动时，如果给用户发放积分则该数值+1）',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for latest_act_content
+-- ----------------------------
+DROP TABLE IF EXISTS `latest_act_content`;
+CREATE TABLE `latest_act_content`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id:latest_act_info.id',
+  `CONTENT` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容',
+  `CONTENT_TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容类型 图片：img；文字：text',
+  `ORDER_NUM` int(11) NOT NULL COMMENT '内容顺序 从1开始',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '最近一次编辑的活动内容' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for latest_act_info
+-- ----------------------------
+DROP TABLE IF EXISTS `latest_act_info`;
+CREATE TABLE `latest_act_info`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `TITLE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '活动标题',
+  `COVER_PIC` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '活动封面',
+  `SIGN_UP_START_TIME` datetime(0) NULL DEFAULT NULL COMMENT '报名开始时间',
+  `SIGN_UP_END_TIME` datetime(0) NULL DEFAULT NULL COMMENT '报名截止时间',
+  `REQUIREMENT` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '招募要求',
+  `ACT_START_TIME` datetime(0) NULL DEFAULT NULL COMMENT '活动开始时间',
+  `ACT_END_TIME` datetime(0) NULL DEFAULT NULL COMMENT '活动结束时间',
+  `ACT_ADDRESS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '活动地点',
+  `ACT_LONGITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '活动位置经度',
+  `ACT_LATITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '活动位置纬度',
+  `SIGN_IN_START_TIME` datetime(0) NULL DEFAULT NULL COMMENT '打卡开始时间',
+  `SIGN_IN_END_TIME` datetime(0) NULL DEFAULT NULL COMMENT '打卡截止时间',
+  `SIGN_IN_ADDRESS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '活动签到打卡地点',
+  `SIGN_IN_LONGITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '活动签到打卡位置经度',
+  `SIGN_IN_LATITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '活动签到打卡位置纬度',
+  `SIGN_IN_RADIUS` int(11) NULL DEFAULT NULL COMMENT '活动签到打卡半径(单位：米)',
+  `ACT_QUOTA_CATEGORY` tinyint(1) NULL DEFAULT NULL COMMENT '活动名额类型(0-不限名额，1-固定名额)',
+  `ACT_QUOTA` int(11) NULL DEFAULT 0 COMMENT '活动名额',
+  `SPONSOR_CONTACTS` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '联系人',
+  `SPONSOR_TEL` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '联系电话',
+  `SPONSOR_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '主办方类型：网格主办：grid；组织主办：agency',
+  `SPONSOR_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '主办方id（机关或网格的id）',
+  `SPONSOR_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '活动主办方名称（机关或网格的名称）',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '如果以网格名义发布，存储空字符串\"\"',
+  `REWARD` int(11) NULL DEFAULT 0 COMMENT '活动奖励积分',
+  `VOLUNTEER_LIMIT` tinyint(1) NULL DEFAULT NULL COMMENT '身份限制:1只有志愿者才可以参加活动0不限制志愿者身份',
+  `AUDIT_SWITCH` tinyint(1) NULL DEFAULT NULL COMMENT '审核开关：1报名人员需要人工审核0不需要',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '最近一次编辑的活动信息' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for volunteer_info
+-- ----------------------------
+DROP TABLE IF EXISTS `volunteer_info`;
+CREATE TABLE `volunteer_info`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键（志愿者注册后插入本表）',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `VOLUNTEER_INTRODUCE` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '志愿者自我介绍',
+  `VOLUNTEER_SIGNATURE` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '志愿者签名',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间(认证志愿者时间)',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '志愿者信息' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -483,7 +483,8 @@
                 AND ( aur.`STATUS` = 'auditing' OR aur.`STATUS` = 'passed' )
             ) AS signedUp,
         ai.SIGN_UP_END_TIME as signUpEndTime,
-        ai.SIGN_UP_START_TIME as signUpStartTime
+        ai.SIGN_UP_START_TIME as signUpStartTime,
+        ai.ACT_ADDRESS as actAddress
         FROM
             act_info ai
         WHERE
@@ -502,7 +503,8 @@
             ai.ACT_START_TIME AS actStartTime,
             ai.ACT_END_TIME AS actEndTime,
             ai.CANCEL_TIME AS cancelTime,
-            ai.CANCEL_REASON AS cancelReason
+            ai.CANCEL_REASON AS cancelReason,
+            ai.ACT_ADDRESS as actAddress
         FROM
             act_info ai
         WHERE
@@ -522,7 +524,8 @@
             ai.ACT_START_TIME AS actStartTime,
             ai.ACT_END_TIME AS actEndTime,
             ai.ACTUAL_START_TIME as actualStartTime,
-            ai.ACTUAL_END_TIME as actualEndTime
+            ai.ACTUAL_END_TIME as actualEndTime,
+            ai.ACT_ADDRESS as actAddress
         FROM
             act_info ai
         WHERE
@@ -539,7 +542,7 @@
             aur.id as actUserRelationId,
             aur.ACT_ID ,
             aur.USER_ID ,
-            aur.SIGN_IN_FLAG,
+            aur.SIGN_IN_FLAG as signInFlagStr,
             aur.CREATED_TIME as signUpTime,
             ai.REWARD,
             aur.REWARD_FLAG,

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserBaseInfoResultDTO.java

@@ -0,0 +1,66 @@
+package com.epmet.dto.result;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户基础信息 返回值
+ * @Auther: zhangyong
+ * @Date: 2020-07-28 14:40
+ */
+
+@Data
+public class ResiUserBaseInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 手机号(注册手机号)
+     */
+    private String mobile;
+
+    /**
+     * 姓氏
+     */
+    private String surname;
+
+    /**
+     * 名
+     */
+    private String name;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证号
+     */
+    private String idNum;
+
+    /**
+     * 性别（1男2女0未知）
+     */
+    private String gender;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 小区名称
+     */
+    private String district;
+
+    /**
+     * 楼栋单元
+     */
+    private String buildingAddress;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @Data
 public class UserBaseInfoResultDTO implements Serializable {
     private static final long serialVersionUID = 3124057264557384333L;
-    @JsonIgnore
+
     private String id;
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -24,8 +24,8 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:09
  */
-//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087")
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
 public interface EpmetUserOpenFeignClient {
 
     /**

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.83
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.84
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.83</version>
+    <version>0.3.84</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java

@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -28,6 +30,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.excel.UserBaseInfoExcel;
@@ -50,7 +53,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("userbaseinfo")
 public class UserBaseInfoController {
-    
+
     @Autowired
     private UserBaseInfoService userBaseInfoService;
 
@@ -146,4 +149,17 @@ public class UserBaseInfoController {
     public Result<CustomerUserDetailResultDTO> customerUserDetail(@RequestBody IssueInitiatorFormDTO param){
        return new Result<CustomerUserDetailResultDTO>().ok(userBaseInfoService.customerUserDetail(param.getUserId()));
     }
+
+    /**
+     * 获取用户基础信息
+     *
+     * @param tokenDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ResiUserBaseInfoResultDTO>
+     * @Author zhangyong
+     * @Date 15:20 2020-07-28
+     **/
+    @PostMapping("selecuserbaseinfo")
+    public Result<ResiUserBaseInfoResultDTO> selecUserBaseInfo(@LoginUser TokenDto tokenDTO){
+        return userBaseInfoService.selecUserBaseInfoByUserId(tokenDTO.getUserId());
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java

@@ -139,7 +139,7 @@ public class UserController {
 	 * @Date 14:51 2020-07-23
 	 **/
 	@PostMapping("updateUserBaseAndWxUserInfo")
-	public Result updateUserBaseAndWxUserInfo(@RequestBody WxUserInfoFormDTO wxUserInfoFormDTO) { ;
+	public Result updateUserBaseAndWxUserInfo(@RequestBody WxUserInfoFormDTO wxUserInfoFormDTO) {
 		ValidatorUtils.validateEntity(wxUserInfoFormDTO);
 		return userService.updateWxUserInfo(wxUserInfoFormDTO);
 	}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java

@@ -18,10 +18,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserWechatResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户基础信息
@@ -49,4 +52,14 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
      * @Date 2020/7/22 9:46
      **/
     UserWechatResultDTO selectUserWechatByUserId(String userId);
-}
+
+    /**
+     * 获取用户基础信息
+     *
+     * @param userId
+     * @return com.epmet.dto.result.ResiUserBaseInfoResultDTO
+     * @Author zhangyong
+     * @Date 15:20 2020-07-28
+     **/
+    ResiUserBaseInfoResultDTO selecUserBaseInfoByUserId(@Param("userId") String userId);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java

@@ -19,8 +19,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 
@@ -130,4 +132,14 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
      * @date 2020.07.27 01:34
     **/
     CustomerUserDetailResultDTO customerUserDetail(String userId);
-}
+
+    /**
+     * 获取用户基础信息
+     *
+     * @param userId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ResiUserBaseInfoResultDTO>
+     * @Author zhangyong
+     * @Date 15:20 2020-07-28
+     **/
+    Result<ResiUserBaseInfoResultDTO> selecUserBaseInfoByUserId(String userId);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -32,6 +32,7 @@ import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.redis.UserBaseInfoRedis;
@@ -218,8 +219,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             return ;
         }
         UserBaseInfoResultDTO userBaseInfoResultDTO = baseDao.selectListByUserIdList(baseInfo.getUserId());
-        baseInfo.setRealName(new StringBuilder(baseInfo.getSurname()).append(baseInfo.getName()).toString());
-        if(null == userBaseInfoResultDTO || StringUtils.isBlank(userBaseInfoResultDTO.getId())){
+        if(StringUtils.isNotBlank(baseInfo.getSurname())) {
+            baseInfo.setRealName(new StringBuilder(baseInfo.getSurname()).append(baseInfo.getName()).toString());
+        }
+        if(null != userBaseInfoResultDTO && StringUtils.isNotBlank(userBaseInfoResultDTO.getId())){
             //更新
             baseInfo.setId(userBaseInfoResultDTO.getId());
             updateById(baseInfo);
@@ -252,5 +255,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         return null;
     }
 
-
-}
+    @Override
+    public Result<ResiUserBaseInfoResultDTO> selecUserBaseInfoByUserId(String userId) {
+        return new Result<ResiUserBaseInfoResultDTO>().ok(baseDao.selecUserBaseInfoByUserId(userId));
+    }
+}

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__create_userbaseinfo.sql

@@ -0,0 +1,22 @@
+CREATE TABLE `user_base_info` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `USER_ID` varchar(64) NOT NULL COMMENT '用户id',
+  `MOBILE` varchar(20) DEFAULT NULL COMMENT '手机号(注册手机号)',
+  `SURNAME` varchar(32) DEFAULT NULL COMMENT '姓氏',
+  `NAME` varchar(32) DEFAULT NULL COMMENT '名',
+  `REAL_NAME` varchar(50) DEFAULT NULL COMMENT '姓+名',
+  `ID_NUM` varchar(50) DEFAULT '' COMMENT '身份证号',
+  `GENDER` varchar(1) DEFAULT NULL COMMENT '性别（1男2女0未知）',
+  `STREET` varchar(128) DEFAULT '' COMMENT '街道',
+  `DISTRICT` varchar(128) DEFAULT '' COMMENT '小区名称',
+  `BUILDING_ADDRESS` varchar(128) DEFAULT '' COMMENT '楼栋单元',
+  `NICKNAME` varchar(64) DEFAULT '' COMMENT '昵称(目前来源于微信昵称，后续系统可支持用户有昵称)',
+  `HEAD_IMG_URL` varchar(1024) DEFAULT '' COMMENT '头像（目前来源于微信，后续系统顾客支持上传头像）',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户基础信息';

epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml

@@ -68,4 +68,22 @@
             uw.DEL_FLAG = '0'
             AND uw.USER_ID = #{userId}
     </select>
-</mapper>
+
+    <!-- 根据用户id，查询用户基础信息-->
+    <select id="selecUserBaseInfoByUserId" resultType="com.epmet.dto.result.ResiUserBaseInfoResultDTO">
+       SELECT
+            USER_ID userId,
+            SURNAME surname,
+            `NAME` `name`,
+            REAL_NAME realName,
+            ID_NUM idNum,
+            GENDER gender,
+            MOBILE mobile,
+            STREET street,
+            DISTRICT district,
+            BUILDING_ADDRESS buildingAddress
+        FROM user_base_info
+        WHERE DEL_FLAG = '0'
+        AND USER_ID = #{userId}
+    </select>
+</mapper>