1

pro-base/src/main/java/com/idea/buildManage/model/ParkRoom.java

@@ -1,5 +1,8 @@
 package com.idea.buildManage.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -53,6 +56,8 @@ public class ParkRoom implements Serializable {
 
     private String createdId;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createdAt;
 
     private Date updatedAt;

pro-base/src/main/java/com/idea/buildManage/response/ParkRoomResponse.java

@@ -9,6 +9,8 @@ import java.util.List;
 @Data
 public class ParkRoomResponse extends ParkRoom {
 
+    private String createdName;
+
     private String organizationalCode;
 
     private String buildName;

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

@@ -713,7 +713,7 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
                 ParkRoomResponse roomResponse = new ParkRoomResponse();
                 roomResponse.setRoomNo(room.getRoomNo());
                 // 已选房 待售
-                if (room.getIsChoose() == 1 && room.getSoldStatus() == 2) {
+                if (room.getIsChoose() == 1 && room.getSoldStatus() == 1) {
                     roomResponse.setProjectStatusStr("已选房");
                 }
                 // 已签约

pro-base/src/main/java/com/idea/customerManagement/controller/RoomSelectionInfoController.java

@@ -98,6 +98,14 @@ public class RoomSelectionInfoController extends BaseController {
         return modelService.getById(id);
     }
 
+
+    @PostMapping(value = "getByHouseId",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object getByHouseId(String houseId,String customerManagementId){
+        return modelService.getByHouseId(houseId,customerManagementId);
+    }
+
+
     /**
      * 房源确认单 下载
      * @param model

pro-base/src/main/java/com/idea/customerManagement/service/RoomSelectionInfoService.java

@@ -1,5 +1,6 @@
 package com.idea.customerManagement.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
@@ -32,8 +33,10 @@ import com.idea.util.ReplaceWord;
 import com.idea.util.WordToPdfUtil;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.common.domain.AjaxResult;
+import com.rockstar.frame.model.FrameUser;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.frame.service.FrameUserService;
 import com.rockstar.shiro.util.ShiroUtils;
 import com.rockstar.system.service.SysDictService;
 import com.rockstar.util.StringUtils;
@@ -76,6 +79,8 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
     private SysDictService sysDictService;
     @Autowired
     private ParkInfoMapper parkInfoMapper;
+    @Autowired
+    private FrameUserService frameUserService;
 
 
     @Override
@@ -364,6 +369,29 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         return selectByPrimaryKey(id);
     }
 
+    public ParkRoomResponse getByHouseId(String houseId,String customerManagementId) {
+
+        ParkRoom parkRoom = parkRoomMapper.selectByPrimaryKey(houseId);
+        RoomSelectionInfoExample example = new RoomSelectionInfoExample();
+        example.createCriteria().andHouseIdEqualTo(houseId).andCustomerManagementIdEqualTo(customerManagementId);
+        List<RoomSelectionInfo> list = selectByExample(example);
+        RoomSelectionInfo roomSelectionInfo = list.get(0);
+        String createdId = roomSelectionInfo.getCreatedId();
+        Date createdAt = roomSelectionInfo.getCreatedAt();
+        parkRoom.setCreatedAt(createdAt);
+        FrameUser frameUser = frameUserService.selectByPrimaryKey(createdId);
+
+        ParkRoomResponse response = new ParkRoomResponse();
+        BeanUtil.copyProperties(parkRoom, response);
+        response.setCreatedName(frameUser.getTruename());
+        response.setCreatedAt(createdAt);
+
+
+        return response;
+    }
+
+
+
     /**
      * 房源确认单 下载
      *