From 51cb74e77f73b9dbdab1200f410a7afd51f4c70e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 6 May 2022 15:03:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/CollectListFormDTO.java |  4 ++++
 .../epmet/dto/result/CollectListResultDTO.java |  3 +--
 .../controller/IcResiCollectController.java    | 18 ++++++++++++++----
 .../epmet/service/IcResiCollectService.java    |  7 +++++++
 .../service/impl/IcResiCollectServiceImpl.java | 14 ++++++++++++++
 .../main/resources/mapper/IcResiCollectDao.xml |  3 +++
 6 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java
index 368db969c4..decce16f25 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java
@@ -28,4 +28,8 @@ public class CollectListFormDTO extends PageFormDTO {
     private String userId;
     private String customerId;
 
+    /**
+     * 查看详情入参
+     */
+    private String id;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
index 2b95eb5e04..f4bd2a1886 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
@@ -1,6 +1,5 @@
 package com.epmet.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -21,7 +20,7 @@ public class CollectListResultDTO implements Serializable {
      */
     private String houseHolderName;
 
-    @JsonIgnore
+    // @JsonIgnore
     private String id;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
index 54314229cf..9c96f77ace 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
@@ -20,10 +20,7 @@ import com.epmet.dto.result.CollectListResultDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
 import com.epmet.service.IcResiCollectService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -81,6 +78,19 @@ public class IcResiCollectController {
         return new Result<PageData<CollectListResultDTO>>().ok(icResiCollectService.getCollectList(formDTO));
     }
 
+    /**
+     * 信息采集-详情
+     * @param formDTO
+     * @param tokenDto
+     * @return
+     */
+    @PostMapping("detail")
+    public Result<CollectListResultDTO> detail(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto) {
+        formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<CollectListResultDTO>().ok(icResiCollectService.detail(formDTO));
+    }
+
     /**
      * Desc: 查询采集居民信息
      * @param formDTO
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java
index 9129b34675..17b6031472 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java
@@ -49,4 +49,11 @@ public interface IcResiCollectService extends BaseService<IcResiCollectEntity> {
      * @return
      */
     LatestCollectResDTO latestSubmit(LatestSubmitCollectFormDTO formDTO);
+
+    /**
+     * 信息采集详情
+     * @param formDTO
+     * @return
+     */
+    CollectListResultDTO detail(CollectListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index fe75c7acbb..5caeb3a008 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -115,6 +115,20 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         return result;
     }
 
+    /**
+     * 信息采集详情
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public CollectListResultDTO detail(CollectListFormDTO formDTO) {
+        List<CollectListResultDTO> list = baseDao.getCollectList(formDTO);
+        if (CollectionUtils.isNotEmpty(list)) {
+            return list.get(NumConstant.ZERO);
+        }
+        return null;
+    }
 
     private IcNeighborHoodDTO queryIcNeighborHood(String villageId) {
         Result<IcNeighborHoodDTO> res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
index 28e1e8370a..ebfe3767fd 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
@@ -39,6 +39,9 @@
         <if test='endDate != null and endDate != "" '>
             AND DATE_FORMAT(c.CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
         </if>
+        <if test='id != null and id != "" '>
+            AND c.id=#{id}
+        </if>
         ORDER BY c.CREATED_TIME DESC
     </select>
     <select id="selectMemberList" resultType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO">