dcs il y a 6 mois
Parent
commit
5153e49103

+ 5 - 1
virgo.api/src/main/java/com/bosshand/virgo/api/controller/RoomController.java

@@ -119,7 +119,11 @@ public class RoomController {
     @ApiOperation("获取预约看房")
     @RequestMapping(value = "/reservation/list", method = RequestMethod.POST)
     public Response list(@RequestBody RoomReservation roomReservation) {
-        return Response.ok(roomService.getList(roomReservation));
+        List<RoomReservation> list = roomService.getList(roomReservation);
+        for (RoomReservation r : list) {
+            r.setProjectName(projectItemTargetRoomService.getProject(r.getProjectId()).getName());
+        }
+        return Response.ok(list);
     }
 
     @ApiOperation("新增预约看房")

+ 13 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/model/RoomReservation.java

@@ -12,6 +12,11 @@ public class RoomReservation {
      */
     private long projectId;
 
+    /**
+     * DTO-项目名称
+     */
+    private String projectName;
+
     /**
      * 房源id
      */
@@ -78,6 +83,14 @@ public class RoomReservation {
         this.projectId = projectId;
     }
 
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     public long getProjectItemTargetRoomId() {
         return projectItemTargetRoomId;
     }

+ 4 - 1
virgo.api/src/main/resources/mapper/RoomReservationMapper.xml

@@ -4,6 +4,7 @@
 
     <resultMap type="com.bosshand.virgo.api.model.RoomReservation" id="result">
         <id column="id" property="id"/>
+        <result column="projectId" property="projectId"/>
         <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
         <result column="userId" property="userId"/>
         <result column="userName" property="userName"/>
@@ -17,7 +18,8 @@
     </resultMap>
 
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.RoomReservation" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO room_reservation(`projectId`, `projectItemTargetRoomId`, `userId`, `date`) VALUES (#{projectId}, #{projectItemTargetRoomId}, #{userId}, #{date})
+        INSERT INTO room_reservation(`projectId`, `projectItemTargetRoomId`, `userId`, `chargePersonId`, `date`)
+        VALUES (#{projectId}, #{projectItemTargetRoomId}, #{userId}, #{chargePersonId}, #{date})
     </insert>
 
     <select id="getList" resultMap="result">
@@ -35,6 +37,7 @@
             <if test="projectId!=0">and a.projectId=#{projectId}</if>
             <if test="projectItemTargetRoomId!=0">and a.projectItemTargetRoomId=#{projectItemTargetRoomId}</if>
             <if test="userId!=0">and a.userId=#{userId}</if>
+            <if test="chargePersonId!=0">and a.chargePersonId=#{chargePersonId}</if>
             <if test="date!=null">and a.date = #{date}</if>
         </where>
     </select>