我的登记列表

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java

@@ -85,6 +85,12 @@ public class SaveCollectVisitorFormDTO implements Serializable {
     @NotBlank(message = "房间名不能为空")
 	private String homeName;
 
+    /**
+     * 详细地址
+     */
+    @NotBlank(message = "家庭地址不能为空")
+    private String address;
+
     /**
      * 姓名
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectPageFormDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epmet-cloud
+ * @description:
+ * @author: wangtong
+ * @create: 2022-08-03 14:15
+ **/
+@Data
+public class CollectPageFormDTO extends PageFormDTO implements Serializable {
+
+    private String customerId;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectPageListDTO.java

@@ -0,0 +1,51 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/18 19:00
+ * @DESC
+ */
+@Data
+public class CollectPageListDTO implements Serializable {
+
+    private static final long serialVersionUID = -6692672375850864451L;
+
+
+    private String id;
+
+    /**
+     * 居住地址
+     */
+    private String address;
+
+    /**
+     * 居民：resi  访客：visitor
+     */
+    private String type;
+
+    /**
+     * 居民登记/访客登记
+     */
+    private String title;
+
+    /**
+     * 审核状态：0待审核 1审核不通过 2审核通过
+     */
+    private String checkState;
+
+    /**
+     * 审核状态名称
+     */
+    private String checkStateName;
+
+    /**
+     * 提交时间
+     */
+    private String createTime;
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java

@@ -11,10 +11,7 @@ import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CollectListExcelResultDTO;
-import com.epmet.dto.result.CollectListMemberExcelResultDTO;
-import com.epmet.dto.result.CollectListResultDTO;
-import com.epmet.dto.result.LatestCollectResDTO;
+import com.epmet.dto.result.*;
 import com.epmet.service.IcResiCollectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -186,4 +183,18 @@ public class IcResiCollectController {
         return icResiCollectService.saveCollectInfo(formDTO);
     }
 
+    /**
+    * @describe: 我的登记列表
+    * @author wangtong
+    * @date 2022/8/3 13:59
+    * @params [dto]
+    * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dto.result.CollectPageListDTO>>
+    */
+    @PostMapping("getCollectPage")
+    public Result<PageData<CollectPageListDTO>> getCollectPage(@LoginUser TokenDto tokenDto,@RequestBody CollectPageFormDTO dto) {
+        dto.setCustomerId(tokenDto.getCustomerId());
+        PageData<CollectPageListDTO> page = icResiCollectService.getCollectPage(dto);
+        return new Result<PageData<CollectPageListDTO>>().ok(page);
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java

@@ -3,6 +3,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.CollectListFormDTO;
 import com.epmet.dto.result.CollectListResultDTO;
+import com.epmet.dto.result.CollectPageListDTO;
 import com.epmet.entity.IcResiCollectEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,4 +44,13 @@ public interface IcResiCollectDao extends BaseDao<IcResiCollectEntity> {
      * @return
      */
     List<String> selectLastSubmitId(@Param("customerId") String customerId, @Param("userId") String userId);
-}
+
+    /**
+    * @describe: 我的登记列表
+    * @author wangtong
+    * @date 2022/8/3 14:19
+    * @params [customerId]
+    * @return java.util.List<com.epmet.dto.result.CollectPageListDTO>
+    */
+    List<CollectPageListDTO> getCollectPage(@Param("customerId") String customerId);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectVisitorEntity.java

@@ -78,6 +78,11 @@ public class IcResiCollectVisitorEntity extends BaseEpmetEntity {
      */
 	private String homeName;
 
+	/**
+	 * 详细地址
+	 */
+	private String address;
+
     /**
      * 姓名
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CollectListResultDTO;
+import com.epmet.dto.result.CollectPageListDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
 import com.epmet.entity.IcResiCollectEntity;
 
@@ -70,5 +71,14 @@ public interface IcResiCollectService extends BaseService<IcResiCollectEntity> {
     * @return com.epmet.commons.tools.utils.Result
     */
     Result saveCollectInfo(SaveCollectFormDTO formDTO);
+
+    /**
+    * @describe: 我的登记列表
+    * @author wangtong
+    * @date 2022/8/3 14:14
+    * @params [dto]
+    * @return com.epmet.commons.tools.page.PageData<com.epmet.dto.result.CollectPageListDTO>
+    */
+    PageData<CollectPageListDTO> getCollectPage(CollectPageFormDTO dto);
 }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java

@@ -19,7 +19,9 @@ import com.epmet.dao.IcResiMemberDao;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CollectListResultDTO;
+import com.epmet.dto.result.CollectPageListDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
+import com.epmet.dto.result.PartyMemberAgeResultDTO;
 import com.epmet.entity.IcResiCollectEntity;
 import com.epmet.entity.IcResiMemberEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -165,6 +167,14 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         return new Result().ok("提交成功");
     }
 
+    @Override
+    public PageData<CollectPageListDTO> getCollectPage(CollectPageFormDTO dto) {
+        PageHelper.startPage(dto.getPageNo(), dto.getPageSize());
+        List<CollectPageListDTO> list = baseDao.getCollectPage(dto.getCustomerId());
+        PageInfo<CollectPageListDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
     public IcNeighborHoodDTO queryIcNeighborHood(String villageId) {
         Result<IcNeighborHoodDTO> res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId);
         if (!res.success() || null == res.getData()) {

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml

@@ -105,4 +105,34 @@
         ORDER BY
             m.UPDATED_TIME DESC
     </select>
+    <select id="getCollectPage" resultType="com.epmet.dto.result.CollectPageListDTO">
+        select tot.*
+        from (select id,
+						 'resi' as type,
+						 '居民登记' as title,
+						 ADDRESS,
+						 CHECK_STATE,
+						 case CHECK_STATE
+						 when '0' then '待审核'
+						 when '1' then '审核不通过'
+						 when '2' then '审核通过'
+						 else ''
+						 end as checkStateName,
+						 CREATED_TIME
+			from ic_resi_collect
+			where DEL_FLAG='0'
+						and CUSTOMER_ID=#{customerId}
+			union
+			select id,
+						 'visitor' as type,
+						 '访客登记' as title,
+						 ADDRESS,
+						 '2' as checkState,
+						 '审核通过' as checkStateName,
+						 CREATED_TIME
+			from ic_resi_collect_visitor
+			where DEL_FLAG='0'
+				  and CUSTOMER_ID=#{customerId})tot
+            order by tot.CREATED_TIME desc
+    </select>
 </mapper>