人员名单

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivitySignUpRecordFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 人员名单
+ * @Author yzm
+ * @Date 2023/3/29 13:42
+ */
+@Data
+public class PartyActivitySignUpRecordFormDTO extends PageFormDTO implements Serializable {
+    /**
+     * 联建活动ID
+     */
+    @NotBlank(message = "activityId不能为空", groups = AddUserInternalGroup.class)
+    private String activityId;
+}
+

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyActivitySignUpRecordResDTO.java

@@ -0,0 +1,61 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 联建活动报名记录表(烟台需求)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-03-29
+ */
+@Data
+public class PartyActivitySignUpRecordResDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 联建活动ID
+     */
+    private String activityId;
+
+    /**
+     * 居民端用户id
+     */
+    private String userId;
+
+    /**
+     * 姓名
+     */
+    private String userName;
+    private String mobile;
+    /**
+     * 报名时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date signUpTime;
+
+    /**
+     * 用户报名时所在的网格
+     */
+    private String gridId;
+    /**
+     * 网格名称：XXX社区-xxx网格
+     */
+    private String gridName;
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java

@@ -24,6 +24,7 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -39,7 +40,9 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
+import com.epmet.dto.form.PartyActivitySignUpRecordFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.dto.result.PartyActivitySignUpRecordResDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.excel.IcPartyActivityExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -253,5 +256,18 @@ public class IcPartyActivityController implements ResultDataResolver {
         }
     }
 
+    /**
+     * 人员名单
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("querySignUpRecord")
+    public Result<PageData<PartyActivitySignUpRecordResDTO>> querySignUpRecord(@RequestBody PartyActivitySignUpRecordFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserShowGroup.class,PageFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<PartyActivitySignUpRecordResDTO>>().ok(icPartyActivityService.querySignUpRecord(formDTO.getActivityId(),formDTO.getPageNo(),formDTO.getPageSize()));
+    }
+
+
 
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivitySignUpRecordDao.java

@@ -0,0 +1,24 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.PartyActivitySignUpRecordResDTO;
+import com.epmet.entity.IcPartyActivitySignUpRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 联建活动报名记录表(烟台需求)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-03-29
+ */
+@Mapper
+public interface IcPartyActivitySignUpRecordDao extends BaseDao<IcPartyActivitySignUpRecordEntity> {
+    /**
+     * 人员名单
+     * @param activityId
+     * @return
+     */
+    List<PartyActivitySignUpRecordResDTO> querySignUpRecord(String activityId);
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivitySignUpRecordEntity.java

@@ -0,0 +1,54 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 联建活动报名记录表(烟台需求)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-03-29
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_party_activity_sign_up_record")
+public class IcPartyActivitySignUpRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 联建活动ID
+     */
+	private String activityId;
+
+    /**
+     * 居民端用户id
+     */
+	private String userId;
+
+    /**
+     * 姓名
+     */
+	private String userName;
+	private String mobile;
+    /**
+     * 报名时间
+     */
+	private Date signUpTime;
+
+    /**
+     * 用户报名时所在的网格
+     */
+	private String gridId;
+	private String gridName;
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java

@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
+import com.epmet.dto.result.PartyActivitySignUpRecordResDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyActivityEntity;
 
@@ -127,4 +128,11 @@ public interface IcPartyActivityService extends BaseService<IcPartyActivityEntit
      * @param filePath
      */
     void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId);
+
+    /**
+     * 人员名单
+     * @param activityId
+     * @return
+     */
+    PageData<PartyActivitySignUpRecordResDTO> querySignUpRecord(String activityId,Integer pageNo,Integer pageSize);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java

@@ -33,11 +33,13 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcPartyActivityDao;
+import com.epmet.dao.IcPartyActivitySignUpRecordDao;
 import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.result.ActivityStatisticsDTO;
+import com.epmet.dto.result.PartyActivitySignUpRecordResDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcActivityServiceRelationEntity;
@@ -57,6 +59,7 @@ import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -93,6 +96,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
     private OssFeignClient ossFeignClient;
     @Resource
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+    @Autowired
+    private IcPartyActivitySignUpRecordDao partyActivitySignUpRecordDao;
 
 
     @Override
@@ -156,7 +161,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
             });
         }
 
-        return new PageData<>(dtoList, pageInfo.getTotal());
+        return new PageData<>(dtoList, pageInfo.getTotal(),formDTO.getPageSize());
     }
 
     @Override
@@ -509,4 +514,18 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
             baseDao.insert(e);
         });
     }
+
+    /**
+     * 人员名单
+     *
+     * @param activityId
+     * @return
+     */
+    @Override
+    public PageData<PartyActivitySignUpRecordResDTO> querySignUpRecord(String activityId, Integer pageNo, Integer pageSize) {
+        PageHelper.startPage(pageNo, pageSize);
+        List<PartyActivitySignUpRecordResDTO> list = partyActivitySignUpRecordDao.querySignUpRecord(activityId);
+        PageInfo<PartyActivitySignUpRecordResDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal(), pageSize);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivitySignUpRecordDao.xml

@@ -0,0 +1,37 @@
+<?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.epmet.dao.IcPartyActivitySignUpRecordDao">
+
+    <resultMap type="com.epmet.entity.IcPartyActivitySignUpRecordEntity" id="icPartyActivitySignUpRecordMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="activityId" column="ACTIVITY_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="userName" column="USER_NAME"/>
+        <result property="signUpTime" column="SIGN_UP_TIME"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <select id="querySignUpRecord" parameterType="java.lang.String" resultType="com.epmet.dto.result.PartyActivitySignUpRecordResDTO">
+        SELECT
+            m.USER_ID,
+            m.USER_NAME,
+            m.MOBILE,
+            m.GRID_ID,
+            m.GRID_NAME,
+            m.SIGN_UP_TIME
+        FROM
+            ic_party_activity_sign_up_record m
+        WHERE
+            m.ACTIVITY_ID = #{activityId}
+        ORDER BY
+            m.SIGN_UP_TIME DESC
+    </select>
+</mapper>