fix

virgo.api/src/main/java/com/bosshand/virgo/api/dao/ContractDao.java

@@ -25,4 +25,6 @@ public interface ContractDao {
 
     List<Contract> getProjectId(@Param(value = "startDate") String startDate, @Param(value = "endDate") String endDate, @Param(value = "projectId") long projectId);
 
+    List<Contract> getEnd(@Param(value = "startDate") String startDate, @Param(value = "endDate") String endDate, @Param(value = "projectId") long projectId);
+
 }

virgo.api/src/main/java/com/bosshand/virgo/api/dao/LookRecordDao.java

@@ -21,4 +21,6 @@ public interface LookRecordDao {
 
     List<LookRecord> getLimit(@Param("p") LookRecord p, @Param("currIndex") int currIndex, @Param("pageSize") int pageSize);
 
+    List<LookRecord> getProjectId(@Param(value = "startDate") String startDate, @Param(value = "endDate") String endDate, @Param(value = "projectId") long projectId);
+
 }

virgo.api/src/main/java/com/bosshand/virgo/api/dao/RoomReservationDao.java

@@ -2,6 +2,7 @@ package com.bosshand.virgo.api.dao;
 
 import com.bosshand.virgo.api.model.RoomReservation;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,4 +13,6 @@ public interface RoomReservationDao {
 
     List<RoomReservation> getList(RoomReservation roomReservation);
 
+    List<RoomReservation> getProjectId(@Param(value = "startDate") String startDate, @Param(value = "endDate") String endDate, @Param(value = "projectId") long projectId);
+
 }

virgo.api/src/main/java/com/bosshand/virgo/api/model/LookRecord.java

@@ -11,6 +11,11 @@ public class LookRecord {
 
     private long id;
 
+    /**
+     * 项目id
+     */
+    private long projectId;
+
     /**
      * 房源id
      */
@@ -65,6 +70,14 @@ public class LookRecord {
         this.id = id;
     }
 
+    public long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(long projectId) {
+        this.projectId = projectId;
+    }
+
     public long getProjectItemTargetRoomId() {
         return projectItemTargetRoomId;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/service/WeeklyService.java

@@ -45,7 +45,10 @@ public class WeeklyService {
     OperateFlowDataDao operateFlowDataDao;
 
     @Autowired
-    ProjectItemTargetRoomDao projectItemTargetRoomDao;
+    LookRecordDao lookRecordDao;
+
+    @Autowired
+    RoomReservationDao roomReservationDao;
 
     @Autowired
     ManagerClient managerClient;
@@ -156,8 +159,20 @@ public class WeeklyService {
             //房源管理
             case 5:
                 if (weeklyType.getData() == null) {
-                    List<ProjectItemTargetRoom> data = projectItemTargetRoomDao.listByDate(startDate, endDate, projectId);
-                    weeklyType.setData(JSON.toJSONString(data));
+                    JSONObject js = new JSONObject();
+                    //带看
+                    List<LookRecord> data1 = lookRecordDao.getProjectId(startDate, endDate, projectId);
+                    js.put("lookRecord", data1);
+                    //预约
+                    List<RoomReservation> data2 = roomReservationDao.getProjectId(startDate, endDate, projectId);
+                    js.put("roomReservation", data2);
+                    //签约
+                    List<Contract> data3 = contractDao.getProjectId(startDate, endDate, projectId);
+                    js.put("contractSigning", data3);
+                    //到期
+                    List<Contract> data4 = contractDao.getEnd(startDate, endDate, projectId);
+                    js.put("contractEnd", data4);
+                    weeklyType.setData(js.toJSONString());
                     weeklyTypeDao.update(weeklyType);
                 }
                 break;

virgo.api/src/main/resources/mapper/ContractMapper.xml

@@ -174,6 +174,10 @@
         select * from contract where signingDate  <![CDATA[>=]]>  #{startDate} and signingDate <![CDATA[<=]]> #{endDate} and projectId = #{projectId}
     </select>
 
+    <select id="getEnd" resultMap="contractResult">
+        select * from contract where endDate  <![CDATA[>=]]>  #{startDate} and endDate <![CDATA[<=]]> #{endDate} and projectId = #{projectId}
+    </select>
+
     <select id="getList" resultMap="contractResult">
         SELECT * FROM contract
         <where>

virgo.api/src/main/resources/mapper/LookRecordMapper.xml

@@ -6,6 +6,7 @@
 
     <resultMap type="com.bosshand.virgo.api.model.LookRecord" id="lookRecordResult">
         <id column="id" property="id"/>
+        <result column="projectId" property="projectId"/>
         <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
         <result column="projectItemTargetRoomContent" property="projectItemTargetRoomContent"/>
         <result column="date" property="date"/>
@@ -18,8 +19,8 @@
     </resultMap>
 
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.LookRecord" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO look_record(`projectItemTargetRoomId`, `projectItemTargetRoomContent`, `date`, `content`, `remark`, `attachment`, `userId`)
-        VALUES (#{projectItemTargetRoomId}, #{projectItemTargetRoomContent}, now(), #{content}, #{remark}, #{attachment}, #{userId})
+        INSERT INTO look_record(`projectId`, `projectItemTargetRoomId`, `projectItemTargetRoomContent`, `date`, `content`, `remark`, `attachment`, `userId`)
+        VALUES (#{projectId}, #{projectItemTargetRoomId}, #{projectItemTargetRoomContent}, now(), #{content}, #{remark}, #{attachment}, #{userId})
     </insert>
 
     <delete id="delete">
@@ -29,6 +30,7 @@
     <update id="update" parameterType="com.bosshand.virgo.api.model.LookRecord">
         UPDATE look_record
         <trim prefix="set" suffixOverrides=",">
+            <if test="projectId!=0">projectId=#{projectId},</if>
             <if test="projectItemTargetRoomId!=0">projectItemTargetRoomId=#{projectItemTargetRoomId},</if>
             <if test="projectItemTargetRoomContent!=null">projectItemTargetRoomContent=#{projectItemTargetRoomContent},</if>
             <if test="content!=null">content=#{content},</if>
@@ -40,7 +42,7 @@
     </update>
 
     <sql id="query">
-        SELECT *, b.name as userName, b.portrait as userPortrait FROM look_record a LEFT JOIN mgr_user b on a.userId = b.id
+        SELECT a.*, b.name as userName, b.portrait as userPortrait FROM look_record a LEFT JOIN mgr_user b on a.userId = b.id
     </sql>
 
     <select id="get" resultMap="lookRecordResult">
@@ -65,4 +67,8 @@
         limit #{currIndex} , #{pageSize}
     </select>
 
+    <select id="getProjectId" resultMap="lookRecordResult">
+        <include refid="query"/>where a.date  <![CDATA[>=]]>  #{startDate} and a.date <![CDATA[<=]]> #{endDate} and a.projectId = #{projectId}
+    </select>
+
 </mapper>

virgo.api/src/main/resources/mapper/RoomReservationMapper.xml

@@ -42,4 +42,18 @@
         </where>
     </select>
 
+    <select id="getProjectId" resultMap="result">
+        SELECT a.*,
+               b.name as userName,
+               b.phone as userPhone,
+               b.portrait as userPortrait,
+               c.name as chargePersonName,
+               c.phone as chargePersonPhone,
+               c.portrait as chargePersonPortrait
+        FROM room_reservation a
+                 LEFT JOIN mgr_user b ON a.userId = b.id
+                 LEFT JOIN mgr_user c ON a.chargePersonId = c.id
+        where a.date  <![CDATA[>=]]>  #{startDate} and a.date <![CDATA[<=]]> #{endDate} and a.projectId = #{projectId}
+    </select>
+
 </mapper>