提交分支

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -46,7 +46,6 @@ public class SocialController {
     @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "communityId", value = "小区Id") })
     public ResponseBean SignActivity(@PathVariable(value = "communityId")Integer communityId){
         ResponseBean responseBean = new ResponseBean();
-
         return responseBean;
     }
     

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java

@@ -0,0 +1,21 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TpActivitySignup;
+import org.apache.ibatis.annotations.Param;
+
+public interface TpActivitySignupMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpActivitySignup record);
+
+    int insertSelective(TpActivitySignup record);
+
+    TpActivitySignup selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpActivitySignup record);
+
+    int updateByPrimaryKey(TpActivitySignup record);
+
+    Integer sumActivitySignUpNum(@Param("id")Integer id, @Param("communityId")Integer communityId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpActivitySignup.java

@@ -0,0 +1,65 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpActivitySignup {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer activityId;
+
+    private Integer taUserId;
+
+    private Date signUpTime;
+
+    private String remark;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public Date getSignUpTime() {
+        return signUpTime;
+    }
+
+    public void setSignUpTime(Date signUpTime) {
+        this.signUpTime = signUpTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

@@ -1,5 +1,7 @@
 package com.community.huiju.service;
 
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpSocialView;
@@ -49,4 +51,6 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	TpActivity findActivityDetail(Integer activityId, Integer communityId);
+
+	ResponseBean findTaUserInfo(Integer id, Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -1,11 +1,13 @@
 package com.community.huiju.service.impl;
 
 import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.DateUtils;
 import com.community.huiju.dao.*;
-import com.community.huiju.model.*;
-import com.community.huiju.service.SocialServiceI;
-import com.community.huiju.dao.TpAnnouncementMapper;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpSocialView;
 import com.community.huiju.service.SocialServiceI;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +15,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
-
 import java.util.List;
 
 /**
@@ -36,7 +37,8 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private TpCarouselSettingMapper tpCarouselSettingMapper;
 
-
+    @Autowired
+    private TpActivitySignupMapper tpActivitySignupMapper;
     
     @Override
     @Transactional
@@ -115,4 +117,26 @@ public class SocialServiceImpl implements SocialServiceI {
     public TpActivity findActivityDetail(Integer activityId, Integer communityId) {
         return null;
     }
+
+    @Override
+    public ResponseBean findTaUserInfo(Integer id, Integer communityId) {
+//        ResponseBean responseBean = new ResponseBean();
+//        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(id);
+//        //判断是否已经过了报名截至时间
+//        Date registrEndTime = tpActivity.getRegistrationEndTime();
+//        if (registrEndTime.compareTo(new Date()) < 0){
+//            return responseBean.addError("9999", "已过报名截止时间");
+//        }
+//
+//        //报名是否超过人数上限
+//        Integer signUpNum = tpActivitySignupMapper.sumActivitySignUpNum(id, communityId);
+//        if (signUpNum > tpActivity.getSignUpMax()){
+//            return responseBean.addError("9998", "报名人数已满");
+//        }
+//
+//        //已登陆，身份未知，状态未知
+//
+//        //身份为业主，状态为已停用
+        return null;
+    }
 }

CODE/smart-community/app-api/src/main/resources/mapper/TpActivitySignupMapper.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpActivitySignupMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpActivitySignup" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="activity_id" property="activityId" jdbcType="INTEGER" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="sign_up_time" property="signUpTime" jdbcType="TIMESTAMP" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, activity_id, ta_user_id, sign_up_time, remark
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_activity_sign_up
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_activity_sign_up
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpActivitySignup" >
+    insert into tp_activity_sign_up (id, community_id, activity_id, 
+      ta_user_id, sign_up_time, remark
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{activityId,jdbcType=INTEGER}, 
+      #{taUserId,jdbcType=INTEGER}, #{signUpTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpActivitySignup" >
+    insert into tp_activity_sign_up
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="activityId != null" >
+        activity_id,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="signUpTime != null" >
+        sign_up_time,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="activityId != null" >
+        #{activityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="signUpTime != null" >
+        #{signUpTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpActivitySignup" >
+    update tp_activity_sign_up
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="activityId != null" >
+        activity_id = #{activityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="signUpTime != null" >
+        sign_up_time = #{signUpTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpActivitySignup" >
+    update tp_activity_sign_up
+    set community_id = #{communityId,jdbcType=INTEGER},
+      activity_id = #{activityId,jdbcType=INTEGER},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      sign_up_time = #{signUpTime,jdbcType=TIMESTAMP},
+      remark = #{remark,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="sumActivitySignUpNum" resultMap="java.lang.Integer">
+    select
+    count(*)
+    from tp_activity_sign_up
+    where activity_id = #{id,jdbcType=INTEGER} and community_id = #{communityId}
+  </select>
+
+</mapper>