信息采集详情

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;
 }

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;
 
     /**

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

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);
 }

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);

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">