修复 bug

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

@@ -74,7 +74,7 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
-        responseBean = socialServiceI.findTaUserInfo(activityId, communityId, userId,remark);
+        responseBean = socialServiceI.findTaUserInfo(userElement, activityId, communityId, userId,remark);
         return responseBean;
     }
     

CODE/smart-community/app-api/src/main/java/com/community/huiju/enums/UserVerifyEnum.java

@@ -17,6 +17,7 @@ public enum UserVerifyEnum {
 
     A_MULTIPLE_REAL_ESTATE("1004", "有多个关联房产"),
 
+    NO_OWNER("1005", "该房产，暂无审核通过的业主！"),
     ;
 
     UserVerifyEnum(String code, String msg) {

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

@@ -16,6 +16,16 @@ public class TpActivitySignup {
 
     private String remark;
 
+    /**
+     * 住户地址
+     */
+    private String address;
+
+    /**
+     * 用户角色名称
+     */
+    private String userRole;
+
     public Integer getId() {
         return id;
     }
@@ -63,4 +73,20 @@ public class TpActivitySignup {
     public void setRemark(String remark) {
         this.remark = remark == null ? null : remark.trim();
     }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getUserRole() {
+        return userRole;
+    }
+
+    public void setUserRole(String userRole) {
+        this.userRole = userRole;
+    }
 }

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

@@ -68,7 +68,7 @@ public interface SocialServiceI {
 	 * @param remark
 	 * @return
 	 */
-	ResponseBean findTaUserInfo(Integer activityId, Integer communityId, Integer userId, String remark);
+	ResponseBean findTaUserInfo(UserElement userElement, Integer activityId, Integer communityId, Integer userId, String remark);
 
 	/**
 	 * 修改活动报名

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.*;
+import com.community.huiju.enums.UserVerifyEnum;
 import com.community.huiju.model.*;
 import com.community.huiju.service.IBuildingOwnerInfo;
 import com.github.pagehelper.Page;
@@ -105,7 +106,7 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
             return responseBean;
         }
 
-        responseBean.addError("该房产，暂无审核通过的业主！");
+        responseBean.addError(UserVerifyEnum.NO_OWNER.getCode(),UserVerifyEnum.NO_OWNER.getMsg());
         return responseBean;
     }
 }

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

@@ -247,7 +247,7 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean findTaUserInfo(Integer activityId, Integer communityId, Integer userId,String remark) {
+    public ResponseBean findTaUserInfo(UserElement userElement, Integer activityId, Integer communityId, Integer userId,String remark) {
         ResponseBean responseBean = new ResponseBean();
         TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
         //判断是否已经过了报名截至时间
@@ -296,7 +296,8 @@ public class SocialServiceImpl implements SocialServiceI {
                 || Constant.TENANT.equals(sysRole.getRoleName())
                 || Constant.OWNER.equals(sysRole.getRoleName()))){
 
-            return insertActivitySignUp(tpActivity, communityId, userId, remark);
+
+            return insertActivitySignUp(userElement, tpActivity, communityId, userId, remark);
         }
         responseBean.addError("9995", "无法确认您的身份，请联系物业");
         return responseBean;
@@ -758,7 +759,7 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
 
-    public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId, Integer userId,String remark){
+    public ResponseBean insertActivitySignUp(UserElement userElement, TpActivity tpActivity, Integer communityId, Integer userId,String remark){
         ResponseBean responseBean = new ResponseBean();
         //判断是否已经报名
         Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
@@ -773,6 +774,13 @@ public class SocialServiceImpl implements SocialServiceI {
         tpActivitySignup.setTaUserId(userId);
         tpActivitySignup.setSignUpTime(new Date());
         tpActivitySignup.setRemark(remark);
+
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
+
+        tpActivitySignup.setAddress(userVerify.getPhaseName() + userVerify.getBuildingName() + userVerify.getUnitName() + userVerify.getLevelName() + userVerify.getRoomNoName());
+        tpActivitySignup.setUserRole(sysRole.getRoleName());
+
         tpActivitySignupMapper.insertSelective(tpActivitySignup);
         //更新报名人数
         updateActivitySignUpNum(communityId,tpActivity.getId());

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

@@ -188,7 +188,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
             responseBean.addError("无法删除当前登录的房产！");
             return responseBean;
         }
-        if (null != userVerify && userElement.getId().intValue() == userVerify.getUserId().intValue()) {
+        if (null != userVerify && userElement.getId().intValue() != userVerify.getUserId().intValue()) {
             responseBean.addError("您名下无此房产关联！");
             return responseBean;
         }

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

@@ -49,7 +49,7 @@
       #{roomNoId,jdbcType=INTEGER}, #{roomNoName,jdbcType=VARCHAR}, #{verifyStatus,jdbcType=VARCHAR},
       #{createDate,jdbcType=TIMESTAMP}, #{verifyName,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserVerify" keyColumn="id" useGeneratedKeys="true">
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserVerify" keyProperty="id" useGeneratedKeys="true">
     insert into ta_user_verify
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

@@ -7,10 +7,11 @@
     <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" />
+    <result column="address" property="address" jdbcType="VARCHAR" />
+    <result column="user_role" property="userRole" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, activity_id, ta_user_id, sign_up_time, remark
+    id, community_id, activity_id, ta_user_id, sign_up_time, remark, address, user_role
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -24,10 +25,11 @@
   </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
+      ta_user_id, sign_up_time, remark, address, user_role
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{activityId,jdbcType=INTEGER}, 
-      #{taUserId,jdbcType=INTEGER}, #{signUpTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}
+      #{taUserId,jdbcType=INTEGER}, #{signUpTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR},
+      #{address,jdbcType=VARCHAR}, #{userRole,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpActivitySignup" >
@@ -51,6 +53,12 @@
       <if test="remark != null" >
         remark,
       </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="userRole">
+        user_role,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -71,6 +79,12 @@
       <if test="remark != null" >
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole != null">
+        #{userRole,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpActivitySignup" >
@@ -91,6 +105,12 @@
       <if test="remark != null" >
         remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole">
+        user_role = #{userRole,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -100,7 +120,9 @@
       activity_id = #{activityId,jdbcType=INTEGER},
       ta_user_id = #{taUserId,jdbcType=INTEGER},
       sign_up_time = #{signUpTime,jdbcType=TIMESTAMP},
-      remark = #{remark,jdbcType=VARCHAR}
+      remark = #{remark,jdbcType=VARCHAR},
+      address = #{address,jdbcType=VARCHAR},
+      user_role = #{userRole,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

CODE/smart-community/community-common/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.3.9
+version=0.0.1
+groupId=com.community
+artifactId=community-common

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,32 @@
+com\community\commom\redis\RedisTemplate.class
+com\community\commom\redis\RedisConfiguration.class
+com\community\commom\utils\OssUtil.class
+com\community\commom\redis\SingleRedisTemplate.class
+com\community\commom\utils\EnumUtils.class
+com\community\commom\hk\HttpClientSSLUtils$2.class
+com\community\commom\redis\RedisJsonSerializer.class
+com\community\commom\uuid\IdGen.class
+com\community\commom\utils\BeanTools.class
+com\community\commom\hk\HttpClientSSLUtils.class
+com\community\commom\session\UserElement.class
+com\community\commom\utils\CommonUtils.class
+com\community\commom\redis\RedisSerializer.class
+com\community\commom\utils\StringConverter.class
+com\community\commom\mode\ResponseBean.class
+com\community\commom\utils\DESUtils.class
+com\community\commom\redis\FastJsonSerializer.class
+com\community\commom\utils\DateUtils.class
+com\community\commom\utils\HttpClientUtils.class
+com\community\commom\constant\Constant.class
+com\community\commom\utils\CookieUtil.class
+com\community\commom\mode\HkResponseBean.class
+com\community\commom\ailiyun\AESDecode.class
+com\community\commom\uuid\IdGen$IdGenHolder.class
+com\community\commom\utils\PayPriceUtils.class
+com\community\commom\hk\HttpClientSSLUtils$1.class
+com\community\commom\utils\MD5Utils.class
+com\community\commom\redis\RedisObjectSerializer.class
+com\community\commom\utils\QRCodeGeneratorUtils.class
+com\community\commom\redis\SerializationFailedException.class
+com\community\commom\hk\Digests.class
+com\community\commom\utils\AccountValidatorUtil.class

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,29 @@
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisJsonSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\ailiyun\AESDecode.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HttpClientSSLUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\PayPriceUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DateUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\HttpClientUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DESUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\BeanTools.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\OssUtil.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisObjectSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\EnumUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisTemplate.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\HkResponseBean.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SerializationFailedException.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CommonUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\MD5Utils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\session\UserElement.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SingleRedisTemplate.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\Digests.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\QRCodeGeneratorUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisConfiguration.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\AccountValidatorUtil.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\uuid\IdGen.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\ResponseBean.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\StringConverter.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\FastJsonSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\constant\Constant.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CookieUtil.java

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.ITpActivitySignInService;
 import com.community.huiju.service.ITpActivitySignUpService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -37,6 +38,9 @@ public class ActivityController extends BaseController {
     @Autowired
     private ITpActivitySignUpService iTpActivitySignUpService;
 
+    @Autowired
+    private ITpActivitySignInService iTpActivitySignInService;
+
     @ApiOperation(value = "查询活动列表数据", notes = "根据条件查询活动列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
@@ -116,7 +120,6 @@ public class ActivityController extends BaseController {
     @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)
@@ -132,7 +135,6 @@ public class ActivityController extends BaseController {
     @ApiImplicitParams({
 //            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
             @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "编号id"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "parameter", value = "true表示发送短信;false表示不发送短信"),
     })
     @RequestMapping(value = "/signUp/{id}", method = RequestMethod.DELETE)
@@ -145,6 +147,24 @@ public class ActivityController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取签到人员列表", notes = "获取签到人员列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "活动id"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "userName", value = "用户姓名"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "userTel", value = "用户手机号"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "一页多少行"),
+    })
+    @RequestMapping(value = "/activity/signIn/{id}", method = RequestMethod.GET)
+    public ResponseBean getActivitySignIn(@PathVariable("id") Integer activityId,
+                                          @RequestParam(value = "userName", required = false) String userName,
+                                          @RequestParam(value = "userTel", required = false) String userTel,
+                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTpActivitySignInService.getActivitySignIn(activityId, userName, userTel, pageNum, pageSize);
+        return responseBean;
+    }
 
 
 }

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

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpActivitySignIn;
+
+/**
+ * <p>
+ * 活动签到表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-09
+ */
+public interface TpActivitySignInMapper extends BaseMapper<TpActivitySignIn> {
+
+}

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

@@ -0,0 +1,65 @@
+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>
+ * 活动签到表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_activity_sign_in")
+public class TpActivitySignIn implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer communityId;
+
+    /**
+     * 活动ID
+     */
+    private Integer activityId;
+
+    /**
+     * 用户姓名
+     */
+    private String userName;
+
+    /**
+     * 用户角色
+     */
+    private String userRole;
+
+    /**
+     * 楼栋信息
+     */
+    private String buildingInfo;
+
+    /**
+     * APP用户ID
+     */
+    private Integer taUserId;
+
+    /**
+     * 用户手机号
+     */
+    private String userTel;
+
+    /**
+     * 签到时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -51,5 +51,13 @@ public class TpActivitySignUp implements Serializable {
      */
     private String remark;
 
+    /**
+     * 住户地址
+     */
+    private String address;
 
+    /**
+     * 角色名称
+     */
+    private String userRole;
 }

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

@@ -0,0 +1,26 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TpActivitySignIn;
+
+/**
+ * <p>
+ * 活动签到表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-09
+ */
+public interface ITpActivitySignInService extends IService<TpActivitySignIn> {
+
+    /**
+     * 根据活动id 查询 所有签到人员
+     * @param activityId
+     * @param userName
+     * @param userTel
+     * @return
+     */
+    ResponseBean getActivitySignIn(Integer activityId, String userName, String userTel, Integer pageNum, Integer pageSize);
+
+}

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

@@ -102,6 +102,8 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
                 User updateUser = iUserService.getById(activity.getUpdateUser());
                 activityVO.setUpdateUserName(updateUser.getUserName());
             }
+            // TODO 临时数据
+            activityVO.setSignInCount(1);
             return activityVO;
         }).collect(Collectors.toList());
 

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

@@ -80,14 +80,11 @@ public class TpActivitySignUpServiceImpl extends ServiceImpl<TpActivitySignUpMap
             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.getPhaseName() + tpBuildingOwnerInfo.getBuildingName()
-                    + tpBuildingOwnerInfo.getUnitName() + tpBuildingOwnerInfo.getLevelName() + tpBuildingOwnerInfo.getName());
+            activitySignUpVO.setRoleName(e.getUserRole());
+            activitySignUpVO.setAddress(e.getAddress());
 
             return activitySignUpVO;
         }).collect(Collectors.toList());

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

@@ -0,0 +1,40 @@
+package com.community.huiju.service.impl;
+
+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.huiju.dao.TpActivitySignInMapper;
+import com.community.huiju.model.TpActivitySignIn;
+import com.community.huiju.service.ITpActivitySignInService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 活动签到表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-09
+ */
+@Service
+public class TpTpActivitySignInServiceImpl extends ServiceImpl<TpActivitySignInMapper, TpActivitySignIn> implements ITpActivitySignInService {
+
+    @Override
+    public ResponseBean getActivitySignIn(Integer activityId, String userName, String userTel, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Page<TpActivitySignIn> page = new Page<>();
+        QueryWrapper<TpActivitySignIn> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("activity_id", activityId);
+        queryWrapper.like(StringUtils.isNotBlank(userName), "user_name", userName);
+        queryWrapper.like(StringUtils.isNotBlank(userTel), "user_tel", userTel);
+
+        IPage<TpActivitySignIn> signInIPage = this.page(page, queryWrapper);
+
+        responseBean.addSuccess(signInIPage);
+        return responseBean;
+    }
+}

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

@@ -16,5 +16,10 @@ public class ActivityVO extends TpActivity {
      */
     private String updateUserName;
 
+    /**
+     * 签到人数
+     */
+    private Integer signInCount;
+
 
 }

CODE/smart-community/property-api/src/main/resources/mapper/TpActivitySignInMapper.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.TpActivitySignInMapper">
+
+</mapper>

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

@@ -7,9 +7,16 @@
         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},'%')
-        and tas.activity_id = #{activityId, jdbcType=INTEGER}
+        <where>
+            tas.activity_id = #{activityId, jdbcType=INTEGER}
+            <if test="userName != null and userName != ''">
+                and tau.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')
+            </if>
+            <if test="phone != null and phone != ''">
+                and tau.login_name LIKE concat('%',#{phone,jdbcType=VARCHAR},'%')
+            </if>
+        </where>
+
     </select>
 
 </mapper>

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

@@ -96,3 +96,18 @@ export function deleteSignUp(data) {
     }
   })
 }
+
+// 根据活动id 获取所有签到人员列表
+export function getActivitySignIn(data) {
+  return request({
+    url: '/activity/signIn/' + data.activityId,
+    method: 'get',
+    params: {
+      userName: data.userName,
+      userTel: data.userTel,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}
+

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

@@ -1,4 +1,4 @@
-import { activityList, addActivity, updateActivity, activityById, invalidActivity, getSignUp, deleteSignUp } from '@/api/activity'
+import { activityList, addActivity, updateActivity, activityById, invalidActivity, getSignUp, deleteSignUp, getActivitySignIn } from '@/api/activity'
 
 const activityInfo = {
   state: {
@@ -68,8 +68,16 @@ const activityInfo = {
           reject(error)
         })
       })
+    },
+    GetActivitySignIn({ commit }, data) { // 获取签到列表
+      return new Promise((resolve, reject) => {
+        getActivitySignIn(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
-
   }
 }
 

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

@@ -242,7 +242,7 @@ export default {
           this.$message.error('已作废活动无法修改')
           return
         }
-        this.$router.push({ name: 'activity-edi', params: { id: ids[0] }})
+        this.$router.push({ name: 'activity-edi', query: { id: ids[0] }})
       }).catch(() => {
         console.log('error InvalidActivity')
       })
@@ -271,7 +271,7 @@ export default {
       })
     },
     selectSignUpActivity(id) {
-      this.$router.push({ name: 'signUp-info', params: { id: id }})
+      this.$router.push({ name: 'signUp-info', query: { id: id }})
     },
     activitySignInIndex(id) {
       this.$router.push({ name: 'activity-signIn-index', query: { id: id }})

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

@@ -1,15 +1,141 @@
 <template>
   <div id="root">
-    签到管理
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="签到人姓名">
+        <el-input v-model="formInline.userName" placeholder="签到人姓名"/>
+      </el-form-item>
+      <el-form-item label="签到人手机号">
+        <el-input v-model="formInline.userTel" placeholder="签到人手机号"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" @click="clear">清空</el-button>
+        <el-button type="primary" @click="queryList">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 表格 -->
+    <el-table
+      :data="tableData"
+      border
+      style="width: 100%">
+      <el-table-column
+        align="center"
+        prop="userName"
+        label="姓名"/>
+      <el-table-column
+        align="center"
+        prop="userRole"
+        label="角色"/>
+      <el-table-column
+        align="center"
+        prop="buildingInfo"
+        label="房号"/>
+      <el-table-column
+        align="center"
+        prop="createDate"
+        label="签到时间">
+        <template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="userTel"
+        label="联系电话"/>
+    </el-table>
+    <!-- 分页 -->
+    <div class="footer-page">
+      <el-pagination
+        :current-page="formInline.pageNum"
+        :page-sizes="[100, 200, 300, 400]"
+        :page-size="formInline.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'SignIn'
+  name: 'SignIn',
+  data() {
+    return {
+      formInline: {
+        activityId: '',
+        pageNum: 1,
+        pageSize: 10,
+        userName: '',
+        userTel: ''
+      },
+      tableData: [], // 数据集合
+      total: 0 // 总数
+    }
+  },
+  mounted() {
+    this.formInline.activityId = this.$route.query.id
+    this.getData()
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.formInline.pageSize = val
+      this.getData()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.formInline.pageNum = val
+      this.getData()
+    },
+    getData() { // 回去数据
+      this.$store.dispatch('GetActivitySignIn', this.formInline).then((res) => {
+        const resCode = res.code
+        if (resCode === '0') {
+          const resData = res.data
+          this.tableData = resData.records
+          this.formInline.pageNum = resData.current
+          this.formInline.pageSize = resData.size
+          this.total = resData.total
+        }
+      }).catch(() => {
+        console.log('GetActivitySignIn error')
+      })
+    },
+    clear() {
+      this.formInline.userTel = ''
+      this.formInline.userName = ''
+      this.formInline.pageNum = 1
+      this.formInline.pageSize = 10
+      this.getData()
+    },
+    queryList() {
+      this.formInline.pageNum = 1
+      this.formInline.pageSize = 10
+      this.getData()
+    },
+    formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      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
+    },
+  }
 }
 </script>
 
 <style scoped>
-
+.demo-form-inline {
+  margin-top: 20px;
+  margin-left: 20px;
+}
+.footer-page{
+  display: flex;
+  justify-content: flex-end;
+}
 </style>

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

@@ -111,6 +111,7 @@ export default {
   data() {
     return {
       listQuery: {
+        id: '',
         userName: '',
         phone: '',
         pageNum: 1,