活动列表时间格式处理；志愿者认证接口修改

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1294,6 +1294,10 @@ public class AppUserServiceImpl implements AppUserService {
     public Result volunteerAuthenticate(TokenDto tokenDto, EpdcCompleteVolunteerInfoFormDTO formDto) {
         logger.info("志愿者认证wxCode=" + formDto.getWxCode() + ";userId=" + tokenDto.getUserId());
 
+        if (StringUtils.isNotBlank(formDto.getSmsCode())) {
+            this.checkSmsCode(formDto.getMobile(), formDto.getSmsCode());
+        }
+
         // 验证是否为志愿者
         Result<Integer> volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId());
         if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) {

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoAppResultDTO.java

@@ -17,12 +17,9 @@
 
 package com.elink.esua.epdc.activity.result;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 活动信息表
@@ -38,57 +35,54 @@ public class ActInfoAppResultDTO implements Serializable {
     /**
      * 主键
      */
-	private String id;
+    private String id;
 
     /**
      * 标题
      */
-	private String title;
-
-
+    private String title;
 
     /**
      * 活动开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-	private Date actStartTime;
-
-    private String headPic;
+    private String actStartTime;
 
     /**
      * 活动结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-	private Date actEndTime;
+    private String actEndTime;
+
+    private String headPic;
 
     /**
      * 活动地点
      */
-	private String actAddress;
-
+    private String actAddress;
 
     /**
      * 活动名额
      */
-	private Integer actQuota;
+    private Integer actQuota;
 
     /**
      * 已报名人数
      */
-	private Integer signupNum;
+    private Integer signupNum;
 
     /**
      * 活动打卡人数
      */
-	private Integer clockNum;
+    private Integer clockNum;
+
     /**
-     *活动报名默认状态
+     * 活动报名默认状态
      */
     private String actUserDefaultState;
+
     /**
      * 活动当前状态（0-报名中，1-已报满，2-未开始，3-进行中，4-已结束）
      */
-	private String actCurrentState;
+    private String actCurrentState;
 
     /**
      * 用户报名状态（0-未报名，1已报名）
@@ -99,6 +93,7 @@ public class ActInfoAppResultDTO implements Serializable {
      * 用户打卡状态（0-未打卡，1-已打卡）
      */
     private String clockFlag;
+
     /**
      * 活动用户关联表ID
      */
@@ -107,5 +102,4 @@ public class ActInfoAppResultDTO implements Serializable {
     private String actQuotaCategory;
 
 
-
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -144,8 +144,10 @@
     <select id="listItemsByApp" resultMap="actAppResultMap">
         select * from (
             SELECT
-                actInfo.ID, actInfo.TITLE, actInfo.HEAD_PIC, actInfo.ACT_START_TIME,actInfo.PUBLISH_TIME,
-                actInfo.ACT_END_TIME, actInfo.ACT_ADDRESS, actInfo.ACT_QUOTA_CATEGORY, actInfo.ACT_QUOTA,
+                actInfo.ID, actInfo.TITLE, actInfo.HEAD_PIC,
+                DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i') ACT_START_TIME,
+                DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i') ACT_END_TIME,
+                actInfo.PUBLISH_TIME,actInfo.ACT_ADDRESS, actInfo.ACT_QUOTA_CATEGORY, actInfo.ACT_QUOTA,
                 actInfo.SIGNUP_NUM, actInfo.CLOCK_NUM,
                 case
                 when <![CDATA[ DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
@@ -192,8 +194,8 @@
         actInfo.ID,
         actInfo.TITLE,
         actInfo.HEAD_PIC,
-        actInfo.ACT_START_TIME,
-        actInfo.ACT_END_TIME,
+        DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i') ACT_START_TIME,
+        DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i') ACT_END_TIME,
         actInfo.ACT_ADDRESS,
         actInfo.ACT_QUOTA_CATEGORY,
         actInfo.ACT_QUOTA,