1

pro-base/src/main/java/com/idea/transactionRecordManage/service/TransactionRecordService.java

@@ -209,6 +209,11 @@ public class TransactionRecordService {
         }
         // 收款记录
         List<NccRecordVo> list = modelMapper.convertRecord(model);
+        for(NccRecordVo vo : list){
+            if(nameMap.containsKey(vo.getHouseId())){
+                vo.setHouseName(nameMap.get(vo.getHouseId()));
+            }
+        }
         return list;
     }
 

pro-base/src/main/java/com/idea/transactionRecordManage/vo/NccRecordVo.java

@@ -62,6 +62,10 @@ public class NccRecordVo {
      */
     private String bankSerialId;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createdAt;
+
     private String createdName;
 
     private Integer ncSubmitStatus;
@@ -72,21 +76,6 @@ public class NccRecordVo {
 
     private String ncSubmitName;
 
-    /*
-     * 批量查询时，discIds为discId拼接的字符串，discIdList为discId的集合
-     */
-    private String discIds;
-
-    private List<String> discIdList;
-
-    private String collectionDateFrom;
-
-    private String collectionDateTo;
-
-//    private String handleDateFrom;
-//
-//    private String handleDateTo;
-
     /**
      * 转换类型
      */
@@ -101,4 +90,24 @@ public class NccRecordVo {
 
     private String houseId;
 
+    /**
+     * 收款日期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date payTime;
+
+
+    // 条件查询
+    /*
+     * 批量查询时，discIds为discId拼接的字符串，discIdList为discId的集合
+     */
+    private String discIds;
+
+    private List<String> discIdList;
+
+    private String collectionDateFrom;
+
+    private String collectionDateTo;
+
 }