Merge remote-tracking branch 'origin/房屋tree_yzm'

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

@@ -1,9 +1,11 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description
@@ -17,4 +19,11 @@ public class NatListDTO implements Serializable {
     private String testTime;
     private String address;
     private String result;
+    //01.11，增加以下两个参数
+    private String idNatId;
+    /**
+     * 采样时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date sampleTime;
 }

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

@@ -99,6 +99,12 @@ public class IcEpidemicPreventionController{
         return new Result<EpidemicPreventionResultDTO>().ok(result);
     }
 
+    /**
+     * 居民防疫信息-点击查看
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
     @PostMapping("info")
     public Result<EpidemicPreventionInfoDTO> info(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());

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

@@ -457,6 +457,8 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
         }
         return list.stream().map(item -> {
             NatListDTO dto = new NatListDTO();
+            dto.setIdNatId(item.getId());
+            dto.setSampleTime(item.getSampleTime());
             dto.setAddress(item.getNatAddress());
             dto.setTestTime(DateUtils.format(item.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE));
             if(StringUtils.isNotBlank(item.getNatResult())){