活动管理

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

@@ -64,6 +64,17 @@ public class ActInfoDTO implements Serializable {
      */
 	private Date actStartTime;
 
+    /**
+     * 打卡开始时间
+     */
+    private Date signinStartTime;
+
+    /**
+     * 打卡截止时间
+     */
+    private Date signinEndTime;
+
+
     /**
      * 活动结束时间
      */
@@ -179,29 +190,5 @@ public class ActInfoDTO implements Serializable {
      */
 	private Integer reward;
 
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
 
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoFormDTO.java

@@ -0,0 +1,193 @@
+/**
+ * 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.elink.esua.epdc.activity.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 活动信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-11
+ */
+@Data
+public class ActInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 标题
+     */
+	private String title;
+
+    /**
+     * 活动头图
+     */
+	private String headPic;
+
+    /**
+     * 报名开始时间
+     */
+	private Date signupStartTime;
+
+    /**
+     * 报名截止时间
+     */
+	private Date signupEndTime;
+
+    /**
+     * 活动开始时间
+     */
+	private Date actStartTime;
+
+    /**
+     * 活动结束时间
+     */
+	private Date actEndTime;
+    /**
+     * 打卡开始时间
+     */
+    private Date signinStartTime;
+
+    /**
+     * 打卡截止时间
+     */
+    private Date signinEndTime;
+
+
+    /**
+     * 活动地点
+     */
+	private String actAddress;
+
+    /**
+     * 活动位置经度
+     */
+	private BigDecimal actLongitude;
+
+    /**
+     * 活动位置纬度
+     */
+	private BigDecimal actLatitude;
+
+    /**
+     * 活动签到打卡地点
+     */
+	private String signinAddress;
+
+    /**
+     * 活动签到打卡位置经度
+     */
+	private BigDecimal signinLongitude;
+
+    /**
+     * 活动签到打卡位置纬度
+     */
+	private BigDecimal signinLatitude;
+
+    /**
+     * 活动签到打卡半径(单位：米)
+     */
+	private Integer clockRadius;
+
+    /**
+     * 活动名额
+     */
+	private Integer actQuota;
+
+    /**
+     * 已报名人数
+     */
+	private Integer signupNum;
+
+    /**
+     * 活动打卡人数
+     */
+	private Integer clockNum;
+
+    /**
+     * 活动分享数
+     */
+	private Integer actShareNum;
+
+    /**
+     * 活动浏览数
+     */
+	private Integer actBrowseNum;
+
+    /**
+     * 联系人
+     */
+	private String contacts;
+
+    /**
+     * 联系电话
+     */
+	private String tel;
+
+    /**
+     * 招募要求
+     */
+	private String requirement;
+
+    /**
+     * 活动内容
+     */
+	private String actContent;
+
+    /**
+     * 活动发布状态（0-下架，1上架）
+     */
+	private String actStatus;
+
+    /**
+     * 活动发布时间
+     */
+	private Date publishTime;
+
+    /**
+     * 活动主办方
+     */
+	private String sponsor;
+
+    /**
+     * 创建部门ID
+     */
+	private Long deptId;
+
+    /**
+     * 活动惩罚积分
+     */
+	private Integer punishmentPoints;
+
+    /**
+     * 活动奖励积分
+     */
+	private Integer reward;
+
+
+}

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

@@ -0,0 +1,194 @@
+/**
+ * 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.elink.esua.epdc.activity.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 活动信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-11
+ */
+@Data
+public class ActInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 标题
+     */
+	private String title;
+
+    /**
+     * 活动头图
+     */
+	private String headPic;
+
+    /**
+     * 报名开始时间
+     */
+	private Date signupStartTime;
+
+    /**
+     * 报名截止时间
+     */
+	private Date signupEndTime;
+
+    /**
+     * 活动开始时间
+     */
+	private Date actStartTime;
+
+    /**
+     * 活动结束时间
+     */
+	private Date actEndTime;
+
+    /**
+     * 打卡开始时间
+     */
+    private Date signinStartTime;
+
+    /**
+     * 打卡截止时间
+     */
+    private Date signinEndTime;
+
+
+    /**
+     * 活动地点
+     */
+	private String actAddress;
+
+    /**
+     * 活动位置经度
+     */
+	private BigDecimal actLongitude;
+
+    /**
+     * 活动位置纬度
+     */
+	private BigDecimal actLatitude;
+
+    /**
+     * 活动签到打卡地点
+     */
+	private String signinAddress;
+
+    /**
+     * 活动签到打卡位置经度
+     */
+	private BigDecimal signinLongitude;
+
+    /**
+     * 活动签到打卡位置纬度
+     */
+	private BigDecimal signinLatitude;
+
+    /**
+     * 活动签到打卡半径(单位：米)
+     */
+	private Integer clockRadius;
+
+    /**
+     * 活动名额
+     */
+	private Integer actQuota;
+
+    /**
+     * 已报名人数
+     */
+	private Integer signupNum;
+
+    /**
+     * 活动打卡人数
+     */
+	private Integer clockNum;
+
+    /**
+     * 活动分享数
+     */
+	private Integer actShareNum;
+
+    /**
+     * 活动浏览数
+     */
+	private Integer actBrowseNum;
+
+    /**
+     * 联系人
+     */
+	private String contacts;
+
+    /**
+     * 联系电话
+     */
+	private String tel;
+
+    /**
+     * 招募要求
+     */
+	private String requirement;
+
+    /**
+     * 活动内容
+     */
+	private String actContent;
+
+    /**
+     * 活动发布状态（0-下架，1上架）
+     */
+	private String actStatus;
+
+    /**
+     * 活动发布时间
+     */
+	private Date publishTime;
+
+    /**
+     * 活动主办方
+     */
+	private String sponsor;
+
+    /**
+     * 创建部门ID
+     */
+	private Long deptId;
+
+    /**
+     * 活动惩罚积分
+     */
+	private Integer punishmentPoints;
+
+    /**
+     * 活动奖励积分
+     */
+	private Integer reward;
+
+
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java

@@ -64,6 +64,7 @@ public class ActInfoController {
     @PostMapping
     public Result save(@RequestBody ActInfoDTO dto){
         //效验数据
+        System.out.println(dto);
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         actInfoService.save(dto);
         return new Result();

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java

@@ -68,8 +68,18 @@ public class ActInfoEntity extends BaseEpdcEntity {
      * 活动结束时间
      */
 	private Date actEndTime;
+	/**
+	 * 打卡开始时间
+	 */
+	private Date signinStartTime;
 
-    /**
+	/**
+	 * 打卡截止时间
+	 */
+	private Date signinEndTime;
+
+
+	/**
      * 活动地点
      */
 	private String actAddress;

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

@@ -9,6 +9,8 @@
         <result property="headPic" column="HEAD_PIC"/>
         <result property="signupStartTime" column="SIGNUP_START_TIME"/>
         <result property="signupEndTime" column="SIGNUP_END_TIME"/>
+        <result property="signinStartTime" column="SIGNIN_START_TIME"/>
+        <result property="signinEndTime" column="SIGNIN_END_TIME"/>
         <result property="actStartTime" column="ACT_START_TIME"/>
         <result property="actEndTime" column="ACT_END_TIME"/>
         <result property="actAddress" column="ACT_ADDRESS"/>
@@ -39,6 +41,39 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <resultMap type="com.elink.esua.epdc.activity.result.ActInfoResultDTO" id="actResultMap">
+        <result property="id" column="ID"/>
+        <result property="title" column="TITLE"/>
+        <result property="headPic" column="HEAD_PIC"/>
+        <result property="signupStartTime" column="SIGNUP_START_TIME"/>
+        <result property="signupEndTime" column="SIGNUP_END_TIME"/>
+        <result property="signinStartTime" column="SIGNIN_START_TIME"/>
+        <result property="signinEndTime" column="SIGNIN_END_TIME"/>
+        <result property="actStartTime" column="ACT_START_TIME"/>
+        <result property="actEndTime" column="ACT_END_TIME"/>
+        <result property="actAddress" column="ACT_ADDRESS"/>
+        <result property="actLongitude" column="ACT_LONGITUDE"/>
+        <result property="actLatitude" column="ACT_LATITUDE"/>
+        <result property="signinAddress" column="SIGNIN_ADDRESS"/>
+        <result property="signinLongitude" column="SIGNIN_LONGITUDE"/>
+        <result property="signinLatitude" column="SIGNIN_LATITUDE"/>
+        <result property="clockRadius" column="CLOCK_RADIUS"/>
+        <result property="actQuota" column="ACT_QUOTA"/>
+        <result property="signupNum" column="SIGNUP_NUM"/>
+        <result property="clockNum" column="CLOCK_NUM"/>
+        <result property="actShareNum" column="ACT_SHARE_NUM"/>
+        <result property="actBrowseNum" column="ACT_BROWSE_NUM"/>
+        <result property="contacts" column="CONTACTS"/>
+        <result property="tel" column="TEL"/>
+        <result property="requirement" column="REQUIREMENT"/>
+        <result property="actContent" column="ACT_CONTENT"/>
+        <result property="actStatus" column="ACT_STATUS"/>
+        <result property="publishTime" column="PUBLISH_TIME"/>
+        <result property="sponsor" column="SPONSOR"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="punishmentPoints" column="PUNISHMENT_POINTS"/>
+        <result property="reward" column="REWARD"/>
+    </resultMap>
 
 
 </mapper>