合并

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

@@ -9,6 +9,9 @@ public class TpBuildingOwnerInfo {
 
     private String idCard;
 
+    // 期
+    private String phase;
+
     private String building;
 
     private String unit;
@@ -59,6 +62,14 @@ public class TpBuildingOwnerInfo {
         this.idCard = idCard == null ? null : idCard.trim();
     }
 
+    public String getPhase() {
+        return phase;
+    }
+
+    public void setPhase(String phase) {
+        this.phase = phase;
+    }
+
     public String getBuilding() {
         return building;
     }

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

@@ -847,7 +847,7 @@ public class TaUserServiceImpl implements ITaUserService {
         TaUserVO userVO = new TaUserVO();
         BeanUtils.copyProperties(user,userVO);
         userVO.setAddressProvince(province.getProvince()+""+city.getCity()+""+district.getDistrict());
-        userVO.setAddressBuilding(tpBuildingOwnerInfo.getBuilding()
+        userVO.setAddressBuilding(tpBuildingOwnerInfo.getPhase() + tpBuildingOwnerInfo.getBuilding()
                 +tpBuildingOwnerInfo.getUnit()
                 +tpBuildingOwnerInfo.getLevel()
                 +tpBuildingOwnerInfo.getRoomNo());

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

@@ -5,6 +5,7 @@
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="id_card" property="idCard" jdbcType="VARCHAR" />
+    <result column="phase" property="phase" jdbcType="VARCHAR" />
     <result column="building" property="building" jdbcType="VARCHAR" />
     <result column="unit" property="unit" jdbcType="VARCHAR" />
     <result column="level" property="level" jdbcType="VARCHAR" />
@@ -20,7 +21,7 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, id_card, building, unit, level, room_no, owner_name, owner_tel, 
+    id, community_id, id_card, phase, building, unit, level, room_no, owner_name, owner_tel,
     gender, pair_status, verify_status, create_user, create_date, update_user, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -34,14 +35,14 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
-    insert into tp_building_owner_info (id, community_id, id_card, 
+    insert into tp_building_owner_info (id, community_id, id_card, phase,
       building, unit, level, 
       room_no, owner_name, owner_tel, 
       gender, pair_status, verify_status, 
       create_user, create_date, update_user, 
       update_date)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{idCard,jdbcType=VARCHAR}, 
-      #{building,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR}, 
+      #{phase,jdbcType=VARCHAR}, #{building,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR},
       #{roomNo,jdbcType=VARCHAR}, #{ownerName,jdbcType=VARCHAR}, #{ownerTel,jdbcType=VARCHAR}, 
       #{gender,jdbcType=CHAR}, #{pairStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, 
       #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, 
@@ -59,6 +60,9 @@
       <if test="idCard != null" >
         id_card,
       </if>
+      <if test="phase != null">
+        phase,
+      </if>
       <if test="building != null" >
         building,
       </if>
@@ -109,6 +113,9 @@
       <if test="idCard != null" >
         #{idCard,jdbcType=VARCHAR},
       </if>
+      <if test="phase != null">
+        #{phase,jdbcType=VARCHAR},
+      </if>
       <if test="building != null" >
         #{building,jdbcType=VARCHAR},
       </if>
@@ -159,6 +166,9 @@
       <if test="idCard != null" >
         id_card = #{idCard,jdbcType=VARCHAR},
       </if>
+      <if test="phase != null">
+        phase = #{phase,jdbcType=VARCHAR},
+      </if>
       <if test="building != null" >
         building = #{building,jdbcType=VARCHAR},
       </if>
@@ -205,6 +215,7 @@
     update tp_building_owner_info
     set community_id = #{communityId,jdbcType=INTEGER},
       id_card = #{idCard,jdbcType=VARCHAR},
+      phase = #{phase,jdbcType=VARCHAR},
       building = #{building,jdbcType=VARCHAR},
       unit = #{unit,jdbcType=VARCHAR},
       level = #{level,jdbcType=VARCHAR},

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/CommunityServiceImpl.java

@@ -62,29 +62,19 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		if (size < 1){
 			return 0;
 		}
-		//查询这个用户是否包含多个小区
-		TpUser tpUserAlread = tpUserMapper.selectByLoginName(toCommunities.getLoginName());
-		if (null == tpUserAlread){
-			//构建用户信息
-			TpUser tpUser = new TpUser();
-			tpUser.setUserName(toCommunities.getUserName());
-			tpUser.setLoginName(toCommunities.getLoginName());
-			tpUser.setCreateDate(new Date());
-			tpUser.setCreateUser(1);
-			tpUser.setStatus(Constant.EFFECTIVE);
-			//插入用户信息
-			tpUserMapper.insertSelective(tpUser);
-			//维护此用户的角色
-			addUserAndRole(tpUser.getId(), 1);
-			//维护住户端用户与社区关系表
-			addUserAndCommunity(tpUser.getId(), toCommunities.getId());
-		}else {
-			//维护此用户的角色
-			addUserAndRole(tpUserAlread.getId(), 1);
-			//维护住户端用户与社区关系表
-			addUserAndCommunity(tpUserAlread.getId(), toCommunities.getId());
-		}
-		
+	 
+		//构建用户信息
+		TpUser tpUser = new TpUser();
+		tpUser.setUserName(toCommunities.getUserName());
+		tpUser.setLoginName(toCommunities.getLoginName());
+		tpUser.setCreateDate(new Date());
+		tpUser.setCreateUser(1);
+		tpUser.setCommunityId(toCommunities.getId());
+		tpUser.setStatus(Constant.EFFECTIVE);
+		//插入用户信息
+		tpUserMapper.insertSelective(tpUser);
+		//维护此用户的角色
+		addUserAndRole(tpUser.getId(), 1);
 		return size;
 	}
 
@@ -135,11 +125,7 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		ToCommunities oldCommunities = toCommunitiesMapper.selectByPrimaryKey(toCommunities.getId());
 		//未修改前的电话号码
 		String oldTel = oldCommunities.getLoginName();
-		//判断电话号码是否重复
-		TpUser tpUser = tpUserMapper.selectByTel(toCommunities.getId(),toCommunities.getLoginName());
-		if (null != tpUser && !tpUser.getLoginName().equals(oldTel)){
-			return Constant.ADMIN_IS_EXIST;
-		}
+		//修改手机号码
 		tpUserMapper.updateByTel(toCommunities.getId(),toCommunities.getLoginName(),toCommunities.getUserName(),oldTel);
 		toCommunitiesMapper.updateByPrimaryKeySelective(toCommunities);
 		return Constant.SUCCESS;

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

@@ -203,6 +203,7 @@
       </if>
     </set>
     where login_name = #{oldTel,jdbcType=VARCHAR}
+    and community_id = #{id}
     and status = 1
   </update>
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/ActivityController.java

@@ -5,6 +5,7 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
 import com.community.huiju.service.ITpActivityService;
+import com.community.huiju.service.ITpActivitySignUpService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -33,6 +34,9 @@ public class ActivityController extends BaseController {
     @Autowired
     private ITpActivityService iTpActivityService;
 
+    @Autowired
+    private ITpActivitySignUpService iTpActivitySignUpService;
+
     @ApiOperation(value = "查询活动列表数据", notes = "根据条件查询活动列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
@@ -109,4 +113,19 @@ public class ActivityController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "查询 活动报名人", notes = "查询 活动报名人")
+    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = Integer.class, name = "parameter", value = "userName用户名;phone手机号;pageNum第一页;pageSize一页多少行"),
+    })
+    @RequestMapping(value = "/signUp", method = RequestMethod.POST)
+    public ResponseBean getSignUp(@RequestBody String parameter,
+                                  HttpSession session) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTpActivitySignUpService.getSignUpUser(parameter);
+        return responseBean;
+    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java

@@ -19,11 +19,11 @@ import java.util.List;
 public interface ToCommunitiesMapper extends BaseMapper<ToCommunities> {
 
     /**
-     * 根据 用户Id 查询出
-     * @param userId
+     * 根据 电话号码 查询出
+     * @param phone
      * @return
      */
-    @Select("SELECT tc.* FROM tp_user_community tuc LEFT JOIN to_communities tc on tuc.community_id = tc.id WHERE tuc.tp_user_id=#{userId}")
-    List<ToCommunities> selectUserById(Integer userId);
+    @Select("SELECT tc.* FROM tp_user tu LEFT JOIN to_communities tc ON tu.community_id = tc.id WHERE tu.login_name = #{phone}")
+    List<ToCommunities> selectUserById(String phone);
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpActivitySignUpMapper.java

@@ -0,0 +1,27 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.TpActivitySignUp;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业web端活动报名表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-01-03
+ */
+@Mapper
+public interface TpActivitySignUpMapper extends BaseMapper<TpActivitySignUp> {
+
+    @Select("SELECT tas.* FROM tp_activity_sign_up tas LEFT JOIN ta_user tau on tas.ta_user_id = tau.id where tau.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%') and tau.login_name LIKE concat('%',#{phone,jdbcType=VARCHAR},'%')")
+    IPage<TpActivitySignUp> listQuery(Page page, @Param("userName") String userName, @Param("phone") String phone);
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpActivitySignUp.java

@@ -0,0 +1,55 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 物业web端活动报名表
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-01-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_activity_sign_up")
+public class TpActivitySignUp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 活动id
+     */
+    private Integer activityId;
+
+    /**
+     * 住户用户id
+     */
+    private Integer taUserId;
+
+    /**
+     * 报名时间
+     */
+    private LocalDateTime signUpTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpActivitySignUpService.java

@@ -0,0 +1,24 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TpActivitySignUp;
+
+/**
+ * <p>
+ * 物业web端活动报名表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-01-03
+ */
+public interface ITpActivitySignUpService extends IService<TpActivitySignUp> {
+
+    /**
+     * 查询 活动的报名人员
+     * @param parameter 参数
+     * @return
+     */
+    ResponseBean getSignUpUser(String parameter);
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -97,6 +97,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Map<String, Object> map = Maps.newHashMap();
         // 小区Id
         map.put("community_id", userElement.getCommunityId());
+        // 期
+        map.put("phase", tpBuildingOwnerInfo.getPhase());
         // 栋
         map.put("building", tpBuildingOwnerInfo.getBuilding());
         // 单元
@@ -360,6 +362,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 小区
         map.put("community_id", communityId);
+        // 期
+        map.put("phase", tpBuildingOwnerInfo.getPhase());
         // 栋
         map.put("building", tpBuildingOwnerInfo.getBuilding());
         // 单元
@@ -373,12 +377,15 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         /**
          * 通过分组来去重
          *
-         * 1. building 为空表示为 building 字段进行分组
-         * 2. unit 为空表示为 unit 字段进行分组
-         * 3. level 为空表示为 level 字段进行分组
-         * 4. room_no 为空表示为 room_no 字段进行分组
+         * 1. phase 为空表示为 phase 字段进行分组
+         * 2. building 为空表示为 building 字段进行分组
+         * 3. unit 为空表示为 unit 字段进行分组
+         * 4. level 为空表示为 level 字段进行分组
+         * 5. room_no 为空表示为 room_no 字段进行分组
          */
-        if (null == tpBuildingOwnerInfo.getBuilding() || "".equals(tpBuildingOwnerInfo.getBuilding())) {
+        if (null == tpBuildingOwnerInfo.getPhase() || "".equals(tpBuildingOwnerInfo.getPhase())) {
+            queryWrapper.groupBy("phase");
+        } else if (null == tpBuildingOwnerInfo.getBuilding() || "".equals(tpBuildingOwnerInfo.getBuilding())) {
             queryWrapper.groupBy("building");
         } else if (null == tpBuildingOwnerInfo.getUnit() || "".equals(tpBuildingOwnerInfo.getUnit())) {
             queryWrapper.groupBy("unit");
@@ -762,6 +769,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         // 小区ID
         queryWrapper.eq("community_id", communityId);
+        // 期
+        queryWrapper.eq("phase", tpBuildingOwnerInfo.getPhase());
         // 栋
         queryWrapper.eq("building", tpBuildingOwnerInfo.getBuilding());
         // 单元

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -114,6 +114,9 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             return responseBean;
         }
 
+        // 活动报名人数默认为 0
+        tpActivity.setSignUpCount(0);
+        tpActivity.setViewCount(0);
         tpActivity.setCommunityId(userElement.getCommunityId());
         tpActivity.setUpdateDate(LocalDateTime.now());
         tpActivity.setUpdateUser(userElement.getId());

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivitySignUpServiceImpl.java

@@ -0,0 +1,102 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.BeanTools;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
+import com.community.huiju.service.ITpActivitySignUpService;
+import com.community.huiju.vo.ActivitySignUpVO;
+import com.google.common.collect.Maps;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 物业web端活动报名表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-01-03
+ */
+@Service
+public class TpActivitySignUpServiceImpl extends ServiceImpl<TpActivitySignUpMapper, TpActivitySignUp> implements ITpActivitySignUpService {
+
+    @Autowired
+    private TpActivityMapper tpActivityMapper;
+
+    @Autowired
+    private TpActivitySignUpMapper tpActivitySignUpMapper;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
+    @Autowired
+    private TaSysRoleMapper taSysRoleMapper;
+
+
+
+    @Override
+    public ResponseBean getSignUpUser(String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        Integer activityId = jsonObject.getInteger("id");
+        Integer pageNum = jsonObject.getInteger("pageNum");
+        Integer pageSize = jsonObject.getInteger("pageSize");
+        String userName = jsonObject.getString("userName");
+        String phone = jsonObject.getString("userName");
+
+        TpActivity tpActivity = tpActivityMapper.selectById(activityId);
+        if (null == tpActivity) {
+            responseBean.addError("活动不存在!");
+            return responseBean;
+        }
+
+        Page<TpActivitySignUp> page = new Page<>();
+        page.setCurrent(null == pageNum ? 0 : pageNum);
+        page.setSize(null == pageSize ? 10 : pageSize);
+        page.setDesc("sign_up_time");
+
+        IPage<TpActivitySignUp> signUpIPage = tpActivitySignUpMapper.listQuery(page, userName, phone);
+
+        List<TpActivitySignUp> tpActivitySignUpList = signUpIPage.getRecords();
+        // 数据包装填充
+        List<ActivitySignUpVO> activitySignUpVOS = tpActivitySignUpList.stream().map(e->{
+            ActivitySignUpVO activitySignUpVO = new ActivitySignUpVO();
+            BeanTools.copyProperties(e, activitySignUpVO);
+
+            TaUser taUser = taUserMapper.selectByPrimaryKey(e.getTaUserId());
+            TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(e.getTaUserId());
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(taUser.getBuildingOwnerInfoId());
+
+            activitySignUpVO.setUserName(taUser.getUserName());
+            activitySignUpVO.setPhone(taUser.getLoginName());
+            activitySignUpVO.setRoleName(taSysRole.getRoleName());
+            activitySignUpVO.setAddress(tpBuildingOwnerInfo.getPhase() + tpBuildingOwnerInfo.getBuilding()
+                    + tpBuildingOwnerInfo.getUnit() + tpBuildingOwnerInfo.getLevel() + tpBuildingOwnerInfo.getRoomNo());
+
+            return activitySignUpVO;
+        }).collect(Collectors.toList());
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("list", activitySignUpVOS);
+        map.put("total", signUpIPage.getTotal());
+        map.put("pageNum", signUpIPage.getCurrent());
+        map.put("pageSize", signUpIPage.getSize());
+
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserServiceImpl.java

@@ -67,27 +67,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         // 查询用户
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("login_name", phone);
+        queryWrapper.eq("community_id", communityId);
         User user = userMapper.selectOne(queryWrapper) ;
         if (null == user) {
             responseBean.addError("当前手机号不存在, 请联系运营人员!");
             return responseBean;
         }
 
-        // 查询这个用户是否有这个小区的管理
-        QueryWrapper<TpUserCommunity> userCommunityQueryWrapper = new QueryWrapper<>();
-        userCommunityQueryWrapper.eq("tp_user_id", user.getId());
-        userCommunityQueryWrapper.eq("community_id", communityId);
-        TpUserCommunity tpUserCommunity = tpUserCommunityMapper.selectOne(userCommunityQueryWrapper);
-        if (null == tpUserCommunity) {
-            responseBean.addError("当前手机号未绑定该社区");
-            return responseBean;
-        }
-
         UserVO userVO = new UserVO();
-
-        // 设置为当前小区Id
-        user.setCommunityId(tpUserCommunity.getCommunityId());
-
         // 查询该用户的权限
         // 获取用户权限
         getUserRole(user,userVO);
@@ -104,18 +91,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         checkPhoneAndCode(phone, code);
 
         // 获取这个用户所管理的小区
-        // 查询用户
-        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("login_name", phone);
-        User user = userMapper.selectOne(queryWrapper);
-        if (null == user) {
+        List<ToCommunities> toCommunities = toCommunitiesMapper.selectUserById(phone);
+        if (toCommunities.size() < 1) {
             responseBean.addError("当前手机号不存在, 请联系运营人员!");
             return responseBean;
         }
-
-        List<ToCommunities> toCommunities = toCommunitiesMapper.selectUserById(user.getId());
+        
         responseBean.addSuccess(toCommunities);
-
         return responseBean;
     }
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/vo/ActivitySignUpVO.java

@@ -0,0 +1,21 @@
+package com.community.huiju.vo;
+
+import com.community.huiju.model.TpActivitySignUp;
+import lombok.Data;
+
+@Data
+public class ActivitySignUpVO extends TpActivitySignUp {
+
+    /** 用户姓名 **/
+    private String userName;
+
+    /** 角色名称 **/
+    private String roleName;
+
+    /** 住址 **/
+    private String address;
+
+    /** 联系方式 **/
+    private String phone;
+
+}

CODE/smart-community/property-api/src/main/resources/mapper/TpActivitySignUpMapper.xml

@@ -0,0 +1,5 @@
+<?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">
+
+</mapper>

CODE/smart-community/zuul/pom.xml

@@ -158,6 +158,25 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<!--服务化打包工具-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/main/assembly/assembly.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

CODE/smart-community/zuul/src/main/assembly/assembly.xml

@@ -0,0 +1,30 @@
+<assembly>
+    <id>assembly</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>src/main/assembly/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory>conf</outputDirectory>
+            <includes>
+                <include>META-INF/**</include>
+                <include>*.yml</include>
+                <include>conf/**</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </fileSet>
+    </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>true</useProjectArtifact>
+            <outputDirectory>lib</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+</assembly>

CODE/smart-community/zuul/src/main/assembly/bin/start.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+SERVER_NAME='zuul'
+# jar名称
+JAR_NAME='zuul-0.0.1.jar'
+cd `dirname $0`
+BIN_DIR=`pwd`
+cd ..
+DEPLOY_DIR=`pwd`
+CONF_DIR=$DEPLOY_DIR/conf
+# 获取应用的端口号
+SERVER_PORT=`sed -nr '/port: [0-9]+/ s/.*port: +([0-9]+).*/\1/p' conf/bootstrap.yml`
+
+PIDS=`ps -f | grep java | grep "$CONF_DIR" |awk '{print $2}'`
+if [ "$1" = "status" ]; then
+    if [ -n "$PIDS" ]; then
+        echo "The $SERVER_NAME is running...!"
+        echo "PID: $PIDS"
+        exit 0
+    else
+        echo "The $SERVER_NAME is stopped"
+        exit 0
+    fi
+fi
+
+if [ -n "$PIDS" ]; then
+    echo "ERROR: The $SERVER_NAME already started!"
+    echo "PID: $PIDS"
+    exit 1
+fi
+
+if [ -n "$SERVER_PORT" ]; then
+    SERVER_PORT_COUNT=`netstat -tln | grep $SERVER_PORT | wc -l`
+    if [ $SERVER_PORT_COUNT -gt 0 ]; then
+        echo "ERROR: The $SERVER_NAME port $SERVER_PORT already used!"
+        exit 1
+    fi
+fi
+
+LOGS_DIR=$DEPLOY_DIR/logs
+if [ ! -d $LOGS_DIR ]; then
+    mkdir $LOGS_DIR
+fi
+STDOUT_FILE=$LOGS_DIR/stdout.log
+
+JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
+JAVA_DEBUG_OPTS=""
+if [ "$1" = "debug" ]; then
+    JAVA_DEBUG_OPTS=" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n "
+fi
+
+JAVA_JMX_OPTS=""
+if [ "$1" = "jmx" ]; then
+    JAVA_JMX_OPTS=" -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false "
+fi
+
+JAVA_MEM_OPTS=""
+BITS=`java -version 2>&1 | grep -i 64-bit`
+if [ -n "$BITS" ]; then
+    JAVA_MEM_OPTS=" -server -Xmx512m -Xms512m -Xmn256m -XX:PermSize=128m -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
+else
+    JAVA_MEM_OPTS=" -server -Xms512m -Xmx512m -XX:PermSize=128m -XX:SurvivorRatio=2 -XX:+UseParallelGC "
+fi
+
+CONFIG_FILES=" -Dspring.config.location=$CONF_DIR/ "
+echo -e "Starting the $SERVER_NAME ..."
+nohup java $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS $CONFIG_FILES -jar $DEPLOY_DIR/lib/$JAR_NAME > $STDOUT_FILE 2>&1 &
+
+COUNT=0
+while [ $COUNT -lt 1 ]; do
+    echo -e ".\c"
+    sleep 1
+    if [ -n "$SERVER_PORT" ]; then
+        COUNT=`netstat -an | grep $SERVER_PORT | wc -l`
+    else
+        COUNT=`ps -f | grep java | grep "$DEPLOY_DIR" | awk '{print $2}' | wc -l`
+    fi
+    if [ $COUNT -gt 0 ]; then
+        break
+    fi
+done
+
+echo "OK!"
+PIDS=`ps -f | grep java | grep "$DEPLOY_DIR" | awk '{print $2}'`
+echo "PID: $PIDS"
+echo "STDOUT: $STDOUT_FILE"

VUECODE/smart-property-manage/src/api/activity.js

@@ -64,9 +64,21 @@ export function invalidActivity(data) {
   return request({
     url: '/activity/invalid',
     method: 'put',
+    data
+  })
+}
+
+// 查询活动报名人
+export function getSignUp(data) {
+  return request({
+    url: '/signUp',
+    method: 'post',
     data: {
-      ids: data
+      id: data.id,
+      userName: data.userName,
+      phone: data.phone,
+      pageNum: data.userName,
+      pageSize: data.pageSize
     }
   })
 }
-

VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js

@@ -6,6 +6,7 @@ export function buildingAddress(data) {
     url: '/building/address',
     method: 'post',
     data: {
+      phase: data.phase,
       building: data.building,
       unit: data.unit,
       level: data.level,
@@ -21,6 +22,7 @@ export function buildingList(data) {
     url: '/building/list',
     method: 'post',
     data: {
+      phase: data.phase,
       building: data.building,
       unit: data.unit,
       level: data.level,
@@ -73,6 +75,7 @@ export function addBuilding(data) {
     url: '/building/add',
     method: 'post',
     data: {
+      phase: data.phase,
       building: data.building,
       unit: data.unit,
       level: data.level,
@@ -90,6 +93,7 @@ export function updateBuilding(data) {
     method: 'put',
     data: {
       id: data.id,
+      phase: data.phase,
       building: data.building,
       unit: data.unit,
       level: data.level,

VUECODE/smart-property-manage/src/router/index.js

@@ -150,6 +150,13 @@ export const constantRouterMap = [
         name: 'announcement-edit',
         hidden: true,
         meta: { title: '编辑公告', icon: 'table' }
+      },
+      {
+        path: '/signUp/info',
+        component: () => import('@/views/social/signUp/index'),
+        name: 'signUp-info',
+        hidden: true,
+        meta: { title: '活动报名人', icon: 'table' }
       }
     ]
   },

VUECODE/smart-property-manage/src/store/modules/activity.js

@@ -1,4 +1,4 @@
-import { activityList, addActivity, updateActivity, activityById, invalidActivity  } from '@/api/activity'
+import { activityList, addActivity, updateActivity, activityById, invalidActivity, getSignUp } from '@/api/activity'
 
 const activityInfo = {
   state: {
@@ -50,6 +50,15 @@ const activityInfo = {
           reject(error)
         })
       })
+    },
+    GetSignUp({ commit, state }, data) { // 查询 活动报名人员
+      return new Promise((resolve, reject) => {
+        getSignUp(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
 
   }

VUECODE/smart-property-manage/src/views/building/add/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
+      <el-form-item label="期" prop="phase">
+        <el-input v-model="ruleForm.phase"/>
+      </el-form-item>
       <el-form-item label="栋" prop="building">
         <el-input v-model="ruleForm.building"/>
       </el-form-item>
@@ -32,6 +35,7 @@ export default {
   data() {
     return {
       ruleForm: {
+        phase: '',
         building: '',
         unit: '',
         level: '',
@@ -40,6 +44,9 @@ export default {
         ownerTel: ''
       },
       rules: {
+        phase: [
+          { required: true, message: '请输入期', trigger: 'blur' }
+        ],
         building: [
           { required: true, message: '请输入楼栋', trigger: 'blur' }
         ],

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -4,7 +4,7 @@
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
         <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
-          <el-button style="margin-left: 10px;" size="large" type="primary"><a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1547546690">下载模板</a></el-button>
+          <el-button style="margin-left: 10px;" size="large" type="primary"><a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771">下载模板</a></el-button>
           <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="dialogBuildingIndex">取消</el-button>

VUECODE/smart-property-manage/src/views/building/edi/index.vue

@@ -36,6 +36,7 @@ export default {
     return {
       ruleForm: {
         id: '',
+        phase: '',
         building: '',
         unit: '',
         level: '',
@@ -46,6 +47,9 @@ export default {
       isOwnerTel: false, // 手机号是否可以编辑 true 不可编辑  false 为可编辑
       listQuery: [], // 查询的参数
       rules: {
+        phase: [
+          { required: true, message: '请输入楼栋', trigger: 'blur' }
+        ],
         building: [
           { required: true, message: '请输入楼栋', trigger: 'blur' }
         ],
@@ -115,6 +119,7 @@ export default {
       this.$store.dispatch('GetByIdBuildingId', buildingId).then((res) => {
         const data = res.data
         this.ruleForm.id = data.id
+        this.ruleForm.phase = data.phase
         this.ruleForm.building = data.building
         this.ruleForm.unit = data.unit
         this.ruleForm.level = data.level

VUECODE/smart-property-manage/src/views/building/index.vue

@@ -3,6 +3,14 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item label="楼盘库">
+        <el-select v-model="listQuery.phase" placeholder="期" @change="buildSelectChange(0)">
+          <!--<el-option label="选择楼栋" value="-1" />-->
+          <el-option
+            v-for="item in phaseList"
+            :key="item.id"
+            :label="item.phase"
+            :value="item.phase"/>
+        </el-select>
         <el-select v-model="listQuery.building" placeholder="栋" @change="buildSelectChange(1)">
           <!--<el-option label="选择楼栋" value="-1" />-->
           <el-option
@@ -63,6 +71,7 @@
       style="width: 100%; margin-top: 20px;"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column prop="phase" label="期" align="center" />
       <el-table-column prop="building" label="栋" align="center" />
       <el-table-column prop="unit" label="单元" align="center" />
       <el-table-column prop="level" label="楼层" align="center" />
@@ -96,6 +105,7 @@ export default {
   data() {
     return {
       listQuery: {
+        phase: '',
         building: '',
         unit: '',
         level: '',
@@ -105,11 +115,12 @@ export default {
         pageSize: 10
       },
       total: 0, // 数据总数
-      buildingInfoLists: [],
-      buildingList: [],
-      unitList: [],
-      levelList: [],
-      roomNoList: [],
+      phaseList: [], // 期 集合
+      buildingInfoLists: [], // 表格数据集合
+      buildingList: [], // seletc 楼栋集合
+      unitList: [], // seletc 单元集合
+      levelList: [], // seletc 层 集合
+      roomNoList: [], //  seletc 户号集合
       listLoading: true, // 加载圈
       deleteIds: [] // 需要删除的id集合
     }
@@ -129,7 +140,10 @@ export default {
   },
   mounted() {
     // 获取栋
-    this.getBuild()
+    // this.getBuild()
+
+    // 获取期
+    this.getPhase()
 
     const query = this.$route.params.listQuery
     if (query !== undefined) {
@@ -169,12 +183,20 @@ export default {
         this.deleteIds.push(data[i].id)
       }
     },
+    getPhase() { // 获取楼栋
+      this.listQuery.phase = ''
+      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+        this.phaseList = res.data
+      }).catch(() => {
+        console.log('error phase BuildingAddress')
+      })
+    },
     getBuild() { // 获取楼栋
       this.listQuery.building = ''
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.buildingList = res.data
       }).catch(() => {
-        console.log('error BuildingAddress')
+        console.log('error building BuildingAddress')
       })
     },
     getUnit() { // 获取单元
@@ -182,7 +204,7 @@ export default {
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.unitList = res.data
       }).catch(() => {
-        console.log('error BuildingAddress')
+        console.log('error unit BuildingAddress')
       })
     },
     getLevel() { // 获取楼层
@@ -190,7 +212,7 @@ export default {
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.levelList = res.data
       }).catch(() => {
-        console.log('error BuildingAddress')
+        console.log('error level BuildingAddress')
       })
     },
     getRoomNo() { // 获取户号
@@ -198,11 +220,22 @@ export default {
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.roomNoList = res.data
       }).catch(() => {
-        console.log('error BuildingAddress')
+        console.log('error roomNo BuildingAddress')
       })
     },
     buildSelectChange(value) { // select 的 change
       switch (value) {
+        case 0: // 查询栋
+          this.buildingList = []
+          this.unitList = []
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.building = ''
+          this.listQuery.unit = ''
+          this.listQuery.level = ''
+          this.listQuery.roomNo = ''
+          this.getBuild()
+          break
         case 1: // 查询 单元
           this.unitList = []
           this.levelList = []
@@ -245,6 +278,7 @@ export default {
       })
     },
     emptyListQuery() { // 清空按钮
+      this.listQuery.phase = ''
       this.listQuery.building = ''
       this.listQuery.unit = ''
       this.listQuery.level = ''

VUECODE/smart-property-manage/src/views/social/activity/add/index.vue

@@ -171,6 +171,7 @@ export default {
       })
       if (this.ruleForm.activityContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
         this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
+        loading.close()
         return false
       }
       this.ruleForm.status = status // 发布状态  1 是已发布   2 是草稿

VUECODE/smart-property-manage/src/views/social/activity/edi/index.vue

@@ -120,6 +120,7 @@ export default {
         if (valid) {
           if (this.ruleForm.activityContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
             this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
+            loading.close()
             return false
           }
           this.ruleForm.status = 1 // 发布状态

VUECODE/smart-property-manage/src/views/social/activity/index.vue

@@ -19,7 +19,7 @@
     <div class="operation">
       <el-button type="primary" @click="addActivity">添加</el-button>
       <el-button type="warning" @click="ediActivity">修改</el-button>
-      <el-button type="danger" >作废</el-button>
+      <el-button type="danger" @click="invalidActivity">作废</el-button>
     </div>
     <el-table
       v-loading="listLoading"
@@ -57,7 +57,11 @@
       <el-table-column
         prop="signUpCount"
         label="已报名人数"
-        align="center"/>
+        align="center">
+        <template slot-scope="scope">
+          <span style="color: #409EFF;cursor: pointer" @click="selectSignUpActivity(scope.row.id)" >{{ scope.row.signUpCount }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="status"
         label="状态"
@@ -219,6 +223,29 @@ export default {
     },
     infoActivity(id) { // 查看活动
       this.$router.push({ name: 'activity-info', params: { id: id }})
+    },
+    invalidActivity() { //  批量作废
+      const ids = this.deleteIds
+      if (ids < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
+      this.$store.dispatch('InvalidActivity', ids).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.activityList()
+          return
+        }
+        this.$message.error(res.message)
+      }).catch(() => {
+        console.log('error InvalidActivity')
+      })
+    },
+    selectSignUpActivity(id) {
+      this.$router.push({ name: 'signUp-info', params: { id: id }})
     }
   }
 }

VUECODE/smart-property-manage/src/views/social/activity/info/index.vue

@@ -1,31 +1,76 @@
 <template>
   <div id="root">
-    <span class="activityTile">活动标题</span>
-    <img src="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1543484412841.png" width="700" height="500">
+    <span class="activityTile">{{ ruleForm.activityTitle }}</span>
+    <img :src="ruleForm.activityCarouselImg" width="700" height="500">
     <div class="activityContext">
-      尊敬的业主/住户：
-      为丰富小区入住业主/住户的社区文化活动，增进各业主/住户间的联系，现物业服务中心特协调银城旗下分公司南京锦城佳业营销策划有限公司举办为期两个月的暑期露天电影节活动！详情请关注通知及各幢大堂的公告通知，下周六11月24日晚将进行第一场活动！更多细节敬请期待！
+      {{ ruleForm.activityContent }}
     </div>
     <div class="activityContextImg">
-      <img src="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1543484412841.png" width="700" height="500">
-      <img src="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1543484412841.png" width="700" height="500">
+      <img v-for="item in ruleForm.contentImg" :src="item" width="700" height="500" >
     </div>
     <div class="progress">
       <div class="text-progress">
-        <span class="people-number">已报名人数100</span>
+        <span class="people-number">已报名人数 {{ ruleForm.signUpCount }}</span>
         <div class="outer-layer"/>
         <div class="inner-layer"/>
       </div>
       <div class="circular"/>
-      <div class="people-limit">限制100人</div>
+      <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
       <el-button type="primary" style="float: left;">查看报名名单</el-button>
     </div>
+    <span>报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span>
+    <div class="bom-button">
+      <el-button type="primary" style="width: 100px;" @click="ediActivity">修改</el-button>
+    </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'Index'
+  name: 'Index',
+  data() {
+    return {
+      asOfdate: '2018/10/10 23:59:59',
+      ruleForm: {
+        id: '',
+        activityTitle: '',
+        activityCarouselImg: '', // 轮播图
+        activityContent: '', // 活动内容详细
+        contentImg: [], // 活动内容配图
+        signUpCount: '', // 报名人数统计
+        signUpMax: '', //  活动人数上限
+        registrationEndTime: '', // 报名活动结束时间
+        sort: 1, // 权重
+        status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+      }
+    }
+  },
+  mounted() {
+    this.getById(this.$route.params.id)
+  },
+  methods: {
+    getById(id) { // 根据ID获取活动信息
+      this.$store.dispatch('ActivityById', id).then((res) => {
+        const resData = res.data
+        this.ruleForm = resData.info
+        this.ruleForm.contentImg = resData.contentImg
+      })
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    ediActivity() { // 修改活动
+      this.$router.push({ name: 'activity-edi', params: { id: this.ruleForm.id }})
+    }
+  }
 }
 </script>
 
@@ -94,4 +139,10 @@ export default {
 .people-limit {
   margin-top: 13px;
 }
+.bom-button{
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  margin-bottom: 100px;
+}
 </style>

VUECODE/smart-property-manage/src/views/social/signUp/index.vue

@@ -0,0 +1,195 @@
+
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="listQuery" class="form-inline">
+      <el-form-item label="报名人姓名">
+        <el-input v-model="listQuery.userName" placeholder="报名人姓名"/>
+      </el-form-item>
+      <el-form-item label="报名人手机号">
+        <el-input v-model="listQuery.phone" placeholder="报名人手机号"/>
+      </el-form-item>
+      <!--<el-form-item label="活动内容">-->
+      <!--<el-input v-model="formInline.user" placeholder="活动内容"/>-->
+      <!--</el-form-item>-->
+      <el-form-item>
+        <el-button type="info" @click="clearListQuery">清空</el-button>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="list"
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      border
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        align="center"/>
+      <el-table-column
+        label="编号"
+        align="center">
+        <template slot-scope="scope">{{ scope.row.id }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="userName"
+        label="姓名"
+        align="center"/>
+      <el-table-column
+        prop="roleName"
+        label="角色"
+        show-overflow-tooltip
+        align="center">
+        <template slot-scope="scope">{{ getRoleName(scope.row.roleName) }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="房号"
+        align="center"/>
+      <el-table-column
+        prop="signUpTime"
+        label="报名时间"
+        align="center">
+        <template slot-scope="scope">{{ formatDate(scope.row.signUpTime) }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="remark"
+        label="报名备注"
+        align="center">
+        <template slot-scope="scope">{{ scope.row.remark }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="phone"
+        label="联系电话"
+        align="center"/>
+      <el-table-column
+        prop="id"
+        label="操作"
+        align="center">
+        <template slot-scope="scope">{{ '删除报名' }}</template>
+      </el-table-column>
+    </el-table>
+    <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 40, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      listQuery: {
+        userName: '',
+        phone: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0, // 数据总数
+      list: [],
+      listLoading: true // 表格加载框
+    }
+  },
+  mounted() {
+    this.listQuery.id = this.$route.params.id
+    this.signUpList()
+  },
+  methods: {
+    onSubmit() {
+      this.listQuery.pageNum = 1
+      this.signUpList()
+    },
+    clearListQuery() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.listQuery.id = ''
+      this.listQuery.activityTitle = ''
+      this.signUpList()
+    },
+    handleSelectionChange(data) { // 表格选择
+      // 设置为 空
+      this.deleteIds = []
+      for (let i = 0; i < data.length; i++) {
+        this.deleteIds.push(data[i].id)
+      }
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = val
+      this.signUpList()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.signUpList()
+    },
+    signUpList() { // 查询列表
+      this.listLoading = true
+      this.$store.dispatch('GetSignUp', this.listQuery).then((res) => {
+        const resData = res.data
+        this.list = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = resData.pageSize
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error GetSignUp get')
+      })
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    getRoleName(roleName) {
+      let role = ''
+      switch (roleName) {
+        case 'OWNER':
+          role = '业主'
+          break
+        case 'TENANT':
+          role = '租客'
+          break
+        case 'RELATION':
+          role = '家属'
+          break
+        default:
+          role = '未认证'
+      }
+      return role
+    }
+  }
+}
+</script>
+
+<style scoped>
+#root {
+  margin-top: 20px;
+}
+.form-inline{
+  margin-left: 20px;
+}
+.operation {
+  margin-left: 20px;
+}
+.block {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>