房源档案导出

pro-base/src/main/java/com/idea/buildManage/dto/ProjectHouseAllVo.java

@@ -1,7 +1,9 @@
 package com.idea.buildManage.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.idea.buildManage.model.ParkRoom;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -19,6 +21,8 @@ public class ProjectHouseAllVo extends ParkRoom {
      */
     private String areaStatus;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date roomSelectionDate;
 
     private String batchNumber;
@@ -29,6 +33,8 @@ public class ProjectHouseAllVo extends ParkRoom {
 
     private String contractNumber;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date signingDate;
 
     private String buyerName;
@@ -65,6 +71,8 @@ public class ProjectHouseAllVo extends ParkRoom {
     /**
      * 入住时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date checkInDate;
 
     private String contractId;

pro-base/src/main/java/com/idea/buildManage/service/ParkRoomService.java

@@ -762,6 +762,10 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
         contractManageDto.setPayType("1");
         List<ContractManageDto> contractManages = payLogExtendMapper.listByModel(contractManageDto);
         Map<String, ContractManageDto> contractManageMap = contractManages.stream().collect(Collectors.toMap(ContractManageDto::getId, item -> item, (existing, replacement) -> existing));
+        // 选房信息
+        List<CustomerManagement> customerManagements = customerManagementMapper.selectByExample(new CustomerManagementExample());
+        Map<String, CustomerManagement> customerManagementMap = customerManagements.stream().collect(Collectors.toMap(CustomerManagement::getId, item -> item, (existing, replacement) -> existing));
+
 
         List<ProjectHouseAllVo> projectHouseAllVos = extendMapper.projectHouseAllVoList(model);
         for(ProjectHouseAllVo houseAllVo: projectHouseAllVos){
@@ -785,6 +789,12 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
                 ContractManageDto contractManage = contractManageMap.get(houseAllVo.getContractId());
                 houseAllVo.setReceivedMoney(contractManage.getReceivedMoney());
             }
+            if(customerManagementMap.containsKey(houseAllVo.getCustomerManagementId())){
+                CustomerManagement customerManagement = customerManagementMap.get(houseAllVo.getCustomerManagementId());
+                houseAllVo.setRoomSelectionDate(customerManagement.getRoomSelectionDate());
+                houseAllVo.setBatchNumber(customerManagement.getBatchNumber());
+                houseAllVo.setRoomSelectionNumber(customerManagement.getRoomSelectionNumber());
+            }
         }
         return projectHouseAllVos;
     }