暂存

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

@@ -56,8 +56,12 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "活动报名接口", notes = "活动报名接口")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "remark", value = "活动备注"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
-    public ResponseBean SignActivity(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
+    public ResponseBean SignActivity(@PathVariable(value = "communityId") Integer communityId,
+                                     @RequestParam(value = "remark", required = false) String remark,
+                                     @RequestParam("activityId") Integer activityId,
+                                     HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
 
@@ -68,9 +72,54 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
-        responseBean = socialServiceI.findTaUserInfo(activityId, communityId, userId);
+        responseBean = socialServiceI.findTaUserInfo(activityId, communityId, userId,remark);
         return responseBean;
     }
+    
+    @RequestMapping(value = "/sign/cancel/{communityId}", method = RequestMethod.POST)
+    @ApiOperation(value = "取消活动报名接口", notes = "取消活动报名接口")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    public ResponseBean cancelSignActivity(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        
+        ResponseBean responseBean = new ResponseBean();
+        
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+        //取消报名
+        responseBean = socialServiceI.cancelSignActivity(activityId, communityId, userId);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "修改活动报名接口", notes = "修改活动报名接口")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "remark", value = "活动备注"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    public ResponseBean updateSignActivity(@PathVariable(value = "communityId") Integer communityId,
+                                     @RequestParam(value = "remark", required = false) String remark,
+                                     @RequestParam("activityId") Integer activityId,
+                                     HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+
+        ResponseBean responseBean = new ResponseBean();
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.updateActivtiySignUp(activityId, communityId, userId,remark);
+        return responseBean;
+    }
+
 
     @ApiOperation(value = "按小区获取分页公告列表", notes = "按小区获取分页公告列表,公告标题模糊查询")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
@@ -240,7 +289,7 @@ public class SocialController extends BaseController {
     })
     @RequestMapping(value = "/selectAllTransaction", method = RequestMethod.GET)
     public ResponseBean selectAllTransaction(HttpSession session,
-                                             @RequestParam("type") Integer type,
+                                             @RequestParam(value = "type",required = false) Integer type,
                                              @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                              @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();

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

@@ -22,4 +22,21 @@ public interface TpActivitySignupMapper {
     Integer sumActivitySignUpNum(@Param("id")Integer id, @Param("communityId")Integer communityId);
 
     Integer findTpActivetitySignByUserId(@Param("activityId") Integer activityId, @Param("communityId")Integer communityId, @Param("userId")Integer userId);
+
+    /**
+     * 获取报名总人数
+     * @param tpActivitySignup
+     * @return
+     */
+    Integer selectSignNum(TpActivitySignup tpActivitySignup);
+    
+    /**
+     * 删除报名
+     * @param tpActivitySignup
+     * @return
+     */
+    Integer deleteSignUp(TpActivitySignup tpActivitySignup);
+    
+    TpActivitySignup selectTpActivetitySignByUserId(@Param("activityId") Integer activityId, @Param("communityId")Integer communityId, @Param("userId")Integer userId);
+
 }

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

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpUser;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpUserMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpUser record);
+
+    int insertSelective(TpUser record);
+
+    TpUser selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpUser record);
+
+    int updateByPrimaryKey(TpUser record);
+}

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpActivity {
     private Integer id;
@@ -40,6 +41,13 @@ public class TpActivity {
     private Date updateDate;
     
     private String userName;
+    
+    /**
+     * 报名状态
+     */
+    private String signStatus;
+
+    private List<String> imgList;
 
     public Integer getId() {
         return id;
@@ -192,4 +200,20 @@ public class TpActivity {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+    
+    public String getSignStatus() {
+        return signStatus;
+    }
+    
+    public void setSignStatus(String signStatus) {
+        this.signStatus = signStatus;
+    }
+    
+    public List<String> getImgList() {
+        return imgList;
+    }
+
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpAnnouncement {
     private Integer id;
@@ -31,6 +32,8 @@ public class TpAnnouncement {
 
     private Date updateDate;
 
+    private List<String> imgList;
+
     public Integer getId() {
         return id;
     }
@@ -142,4 +145,12 @@ public class TpAnnouncement {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    public List<String> getImgList() {
+        return imgList;
+    }
+
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpTransaction {
     private Integer id;
@@ -27,6 +28,8 @@ public class TpTransaction {
 
     private Date updateDate;
 
+    private List<String> imgList;
+
     private  Integer roleId;
 
     private  String roleName;
@@ -139,4 +142,12 @@ public class TpTransaction {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public List<String> getImgList() {
+        return imgList;
+    }
+
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
+    }
 }

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

@@ -0,0 +1,135 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpUser {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String userName;
+
+    private String loginName;
+
+    private String loginPassword;
+
+    private String status;
+
+    private String remark;
+
+    private String email;
+
+    private String headPortrait;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    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 String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName == null ? null : loginName.trim();
+    }
+
+    public String getLoginPassword() {
+        return loginPassword;
+    }
+
+    public void setLoginPassword(String loginPassword) {
+        this.loginPassword = loginPassword == null ? null : loginPassword.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email == null ? null : email.trim();
+    }
+
+    public String getHeadPortrait() {
+        return headPortrait;
+    }
+
+    public void setHeadPortrait(String headPortrait) {
+        this.headPortrait = headPortrait == null ? null : headPortrait.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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

@@ -12,6 +12,14 @@ import java.util.List;
  * @date 2018/10/23
  */
 public interface SocialServiceI {
+
+	/**
+	 * 查看公告详情
+	 * @param id
+	 * @param communityId
+	 * @param userId
+	 * @return
+	 */
     TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId);
 
 
@@ -50,7 +58,25 @@ public interface SocialServiceI {
 	 */
 	TpActivity findActivityDetail(Integer activityId, Integer communityId, Integer userId);
 
-	ResponseBean findTaUserInfo(Integer id, Integer communityId, Integer userId);
+	/**
+	 * 活动报名
+	 * @param activityId
+	 * @param communityId
+	 * @param userId
+	 * @param remark
+	 * @return
+	 */
+	ResponseBean findTaUserInfo(Integer activityId, Integer communityId, Integer userId, String remark);
+
+	/**
+	 * 修改活动报名
+	 * @param activityId
+	 * @param communityId
+	 * @param userId
+	 * @param remark
+	 * @return
+	 */
+	ResponseBean updateActivtiySignUp(Integer activityId, Integer communityId, Integer userId, String remark);
 
 	/**
 	 * 获取二手租赁详情
@@ -100,4 +126,13 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	List<TpActivity> getActivity(Integer communityId);
+	
+	/**
+	 * 取消报名接口
+	 * @param activityId
+	 * @param communityId
+	 * @param userId
+	 * @return
+	 */
+	ResponseBean cancelSignActivity(Integer activityId, Integer communityId, Integer userId);
 }

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

@@ -10,15 +10,14 @@ import com.community.huiju.service.SocialServiceI;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author weichaochao
@@ -65,7 +64,8 @@ public class SocialServiceImpl implements SocialServiceI {
     private TdImagesMapper tdImagesMapper;
 
     @Autowired
-    private ImageServiceI imageServiceI;
+    private TpUserMapper tpUserMapper;
+
 
     @Override
     @Transactional
@@ -76,6 +76,15 @@ public class SocialServiceImpl implements SocialServiceI {
             tpAnnouncementMapper.updateByPrimaryKeySelective(id, allViewNum);
         }
         TpAnnouncement tpAnnouncement = tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
+        tpAnnouncement.setUserName(tpUserMapper.selectByPrimaryKey(tpAnnouncement.getCreateUser()).getUserName());
+
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("uuid",tpAnnouncement.getId());
+        map.put("type",Constant.ANNOUNCEMENT);
+        // 查询图片
+        List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+        List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
+        tpAnnouncement.setImgList(imgList);
         return tpAnnouncement;
     }
 
@@ -151,7 +160,22 @@ public class SocialServiceImpl implements SocialServiceI {
             activity.setViewCount(allViewNum);
             tpActivityMapper.updateByPrimaryKeySelective(activity);
         }
-        return tpActivityMapper.selectByPrimaryKey(activityId,communityId);
+
+        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId,communityId);
+        //返回报名状态
+        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
+        String signStatus = signNum != 0 ? Constant.STATUS_SIGNED : Constant.STATUS_UNSIGN;
+        tpActivity.setSignStatus(signStatus);
+        
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("uuid",tpActivity.getId());
+        map.put("type",Constant.ACTIVITY);
+        // 查询图片
+        List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+        List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
+        tpActivity.setImgList(imgList);
+
+        return tpActivity;
     }
     
     /**
@@ -182,7 +206,7 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean findTaUserInfo(Integer activityId, Integer communityId, Integer userId) {
+    public ResponseBean findTaUserInfo(Integer activityId, Integer communityId, Integer userId,String remark) {
         ResponseBean responseBean = new ResponseBean();
         TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
         //判断是否已经过了报名截至时间
@@ -227,7 +251,7 @@ public class SocialServiceImpl implements SocialServiceI {
                 || Constant.TENANT.equals(sysRole.getRoleName())
                 || Constant.OWNER.equals(sysRole.getRoleName()))){
 
-            return insertActivitySignUp(tpActivity, communityId, userId);
+            return insertActivitySignUp(tpActivity, communityId, userId, remark);
         }
         responseBean.addError("9995", "无法确认您的身份，请联系物业");
         return responseBean;
@@ -390,11 +414,32 @@ public class SocialServiceImpl implements SocialServiceI {
         List<TpActivity> listActivity=tpActivityMapper.getActivity(communityId,Num);
         return listActivity;
     }
-
-    public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId, Integer userId){
+    
+    /**
+     * 取消报名接口
+     *
+     * @param activityId
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @Override
+    public ResponseBean cancelSignActivity(Integer activityId, Integer communityId, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+        TpActivitySignup tpActivitySignup = new TpActivitySignup();
+        tpActivitySignup.setActivityId(activityId);
+        tpActivitySignup.setCommunityId(communityId);
+        tpActivitySignup.setTaUserId(userId);
+        tpActivitySignupMapper.deleteSignUp(tpActivitySignup);
+        //更新报名人数
+        updateActivitySignUpNum(communityId,activityId);
+        responseBean.addSuccess("取消报名成功");
+        return responseBean;
+    }
+    
+    public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId, Integer userId,String remark){
         ResponseBean responseBean = new ResponseBean();
         //判断是否已经报名
-        //todo
         Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
         if (signNum != 0){
             responseBean.addError("9996", "您已报名，请勿重复报名");
@@ -406,10 +451,31 @@ public class SocialServiceImpl implements SocialServiceI {
         tpActivitySignup.setCommunityId(communityId);
         tpActivitySignup.setTaUserId(userId);
         tpActivitySignup.setSignUpTime(new Date());
+        tpActivitySignup.setRemark(remark);
         tpActivitySignupMapper.insertSelective(tpActivitySignup);
+        //更新报名人数
+        updateActivitySignUpNum(communityId,tpActivity.getId());
         responseBean.addSuccess("报名成功");
         return responseBean;
     }
+    
+    /**
+     * 更新报名人数
+     * @param communityId
+     * @param activityId
+     * @return
+     */
+    private Integer updateActivitySignUpNum(Integer communityId,Integer activityId) {
+        TpActivitySignup tpActivitySignup = new TpActivitySignup();
+        tpActivitySignup.setActivityId(activityId);
+        tpActivitySignup.setCommunityId(communityId);
+        Integer signNum = tpActivitySignupMapper.selectSignNum(tpActivitySignup);
+        TpActivity updateActivity = new TpActivity();
+        updateActivity.setId(activityId);
+        updateActivity.setSignUpCount(signNum);
+        tpActivityMapper.updateByPrimaryKeySelective(updateActivity);
+        return signNum;
+    }
 
     @Transactional
     @Override
@@ -421,7 +487,36 @@ public class SocialServiceImpl implements SocialServiceI {
             transaction.setViewCount(num);
             tpTransactionMapper.updateByPrimaryKeySelective(transaction);
         }
-        return tpTransactionMapper.selectByPrimaryKey(activityId,communityId);
 
+        TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(activityId,communityId);
+
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("uuid",tpTransaction.getId());
+        map.put("type",Constant.TRANSACTION);
+        // 查询图片
+        List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+        List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
+        tpTransaction.setImgList(imgList);
+
+        return tpTransaction;
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public ResponseBean updateActivtiySignUp(Integer activityId, Integer communityId, Integer userId, String remark) {
+        ResponseBean responseBean = new ResponseBean();
+        TpActivitySignup tpActivitySignup = tpActivitySignupMapper.selectTpActivetitySignByUserId(activityId, communityId, userId);
+        if (null == tpActivitySignup){
+            responseBean.addError("9996", "您未报名!");
+            return responseBean;
+        }
+
+        tpActivitySignup.setCommunityId(communityId);
+        tpActivitySignup.setTaUserId(userId);
+        tpActivitySignup.setRemark(remark);
+        tpActivitySignupMapper.updateByPrimaryKey(tpActivitySignup);
+        responseBean.addSuccess("操作成功!");
+        return responseBean;
     }
 }

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

@@ -117,4 +117,24 @@
     from tp_activity_sign_up
     where activity_id = #{activityId} and community_id = #{communityId} and ta_user_id = #{userId}
   </select>
+
+
+  <select id="selectSignNum" resultType="java.lang.Integer">
+    select
+    count(*)
+    from tp_activity_sign_up
+    where activity_id = #{activityId} and community_id = #{communityId}
+  </select>
+
+  <delete id="deleteSignUp" parameterType="com.community.huiju.model.TpActivitySignup" >
+    delete from tp_activity_sign_up
+    where activity_id = #{activityId} and community_id = #{communityId} and ta_user_id = #{taUserId}
+  </delete>
+
+  <select id="selectTpActivetitySignByUserId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from tp_activity_sign_up
+    where activity_id = #{activityId} and community_id = #{communityId} and ta_user_id = #{userId}
+  </select>
 </mapper>

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

@@ -210,7 +210,12 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     select
     <include refid="Base_Column_List" />
     from tp_transaction
-    where community_id = #{communityId,jdbcType=INTEGER} and ta_user_id = #{userId,jdbcType=INTEGER} and type = #{type,jdbcType=INTEGER}
+    where community_id = #{communityId,jdbcType=INTEGER}
+    and ta_user_id = #{userId,jdbcType=INTEGER}
+    <if test="type != null and type != ''">
+      and type = #{type,jdbcType=INTEGER}
+    </if>
+
   </select>
 
   <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction" >

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

@@ -0,0 +1,188 @@
+<?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.TpUserMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpUser" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="login_name" property="loginName" jdbcType="VARCHAR" />
+    <result column="login_password" property="loginPassword" jdbcType="VARCHAR" />
+    <result column="status" property="status" jdbcType="CHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="email" property="email" jdbcType="VARCHAR" />
+    <result column="head_portrait" property="headPortrait" jdbcType="VARCHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, user_name, login_name, login_password, status, remark, email, head_portrait, 
+    create_user, create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_user
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_user
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpUser" >
+    insert into tp_user (id, community_id, user_name, 
+      login_name, login_password, status, 
+      remark, email, head_portrait, 
+      create_user, create_date, update_user, 
+      update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, 
+      #{loginName,jdbcType=VARCHAR}, #{loginPassword,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{headPortrait,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, 
+      #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpUser" >
+    insert into tp_user
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="userName != null" >
+        user_name,
+      </if>
+      <if test="loginName != null" >
+        login_name,
+      </if>
+      <if test="loginPassword != null" >
+        login_password,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="email != null" >
+        email,
+      </if>
+      <if test="headPortrait != null" >
+        head_portrait,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </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="userName != null" >
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginName != null" >
+        #{loginName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginPassword != null" >
+        #{loginPassword,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="headPortrait != null" >
+        #{headPortrait,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpUser" >
+    update tp_user
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="userName != null" >
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginName != null" >
+        login_name = #{loginName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginPassword != null" >
+        login_password = #{loginPassword,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=CHAR},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="headPortrait != null" >
+        head_portrait = #{headPortrait,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpUser" >
+    update tp_user
+    set community_id = #{communityId,jdbcType=INTEGER},
+      user_name = #{userName,jdbcType=VARCHAR},
+      login_name = #{loginName,jdbcType=VARCHAR},
+      login_password = #{loginPassword,jdbcType=VARCHAR},
+      status = #{status,jdbcType=CHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      head_portrait = #{headPortrait,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -107,4 +107,14 @@ public class Constant {
 
     /** 添加用户所对应的部门 住户 **/
     public static final String DEPT_RESIDENTS = "测试";
+    
+    /**
+     * 报名状态 已报名
+     */
+    public static final String STATUS_SIGNED = "signed";
+    
+    /**
+     * 报名状态 未报名
+     */
+    public static final String STATUS_UNSIGN = "unsigned";
 }