fix

virgo.api/src/main/java/com/bosshand/virgo/api/controller/RoomController.java

@@ -79,7 +79,7 @@ public class RoomController {
 
     @ApiOperation("当前用户收藏房源列表")
     @RequestMapping(value = "/collection/{currPage}/{pageSize}", method = RequestMethod.GET)
-    public Response list(@PathVariable int currPage, @PathVariable int pageSize) {
+    public Response list(@PathVariable int currPage, @PathVariable int pageSize, @RequestParam(required = false) String coordinates) {
         long userId = ContextUtils.getCurrentUser().getId();
         int totalCount = roomService.getTotalCount(userId);
         List<RoomCollection> list = roomService.getLimit(userId, currPage, pageSize);
@@ -87,6 +87,10 @@ public class RoomController {
         List<Long> ids = new ArrayList<>();
         list.forEach(ls -> ids.add(ls.getProjectItemTargetRoomId()));
         List<ProjectItemTargetRoom> dataList = projectItemTargetRoomService.getIds(ids);
+        // 返回距离
+        for(ProjectItemTargetRoom room : dataList){
+            projectItemTargetRoomService.coordinates(room, coordinates);
+        }
         Map<String, Object> result = new HashMap<>();
         result.put("dataList", dataList);
         result.put("totalCount", totalCount);

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

@@ -7,6 +7,11 @@ public class RoomReservation {
 
     private long id;
 
+    /**
+     * 项目id
+     */
+    private long projectId;
+
     /**
      * 房源id
      */
@@ -18,15 +23,40 @@ public class RoomReservation {
     private long userId;
 
     /**
-     * 用户名称
+     * DTO-用户名称
      */
     private String userName;
 
     /**
-     * 用户头像
+     * DTO-手机号
+     */
+    private String userPhone;
+
+    /**
+     * DTO-用户头像
      */
     private String userPortrait;
 
+    /**
+     * 负责人id
+     */
+    private long chargePersonId;
+
+    /**
+     * DTO-负责人名称
+     */
+    private String chargePersonName;
+
+    /**
+     * DTO-负责人头像
+     */
+    private String chargePersonPortrait;
+
+    /**
+     * DTO-负责人手机号
+     */
+    private String chargePersonPhone;
+
     /**
      * 预约时间
      */
@@ -40,6 +70,14 @@ public class RoomReservation {
         this.id = id;
     }
 
+    public long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(long projectId) {
+        this.projectId = projectId;
+    }
+
     public long getProjectItemTargetRoomId() {
         return projectItemTargetRoomId;
     }
@@ -64,6 +102,14 @@ public class RoomReservation {
         this.userName = userName;
     }
 
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
     public String getUserPortrait() {
         return userPortrait;
     }
@@ -72,6 +118,38 @@ public class RoomReservation {
         this.userPortrait = userPortrait;
     }
 
+    public long getChargePersonId() {
+        return chargePersonId;
+    }
+
+    public void setChargePersonId(long chargePersonId) {
+        this.chargePersonId = chargePersonId;
+    }
+
+    public String getChargePersonName() {
+        return chargePersonName;
+    }
+
+    public void setChargePersonName(String chargePersonName) {
+        this.chargePersonName = chargePersonName;
+    }
+
+    public String getChargePersonPortrait() {
+        return chargePersonPortrait;
+    }
+
+    public void setChargePersonPortrait(String chargePersonPortrait) {
+        this.chargePersonPortrait = chargePersonPortrait;
+    }
+
+    public String getChargePersonPhone() {
+        return chargePersonPhone;
+    }
+
+    public void setChargePersonPhone(String chargePersonPhone) {
+        this.chargePersonPhone = chargePersonPhone;
+    }
+
     public String getDate() {
         return date;
     }
@@ -79,5 +157,4 @@ public class RoomReservation {
     public void setDate(String date) {
         this.date = date;
     }
-
 }

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

@@ -7,17 +7,32 @@
         <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
         <result column="userId" property="userId"/>
         <result column="userName" property="userName"/>
+        <result column="userPhone" property="userPhone"/>
         <result column="userPortrait" property="userPortrait"/>
+        <result column="chargePersonId" property="chargePersonId"/>
+        <result column="chargePersonName" property="chargePersonName"/>
+        <result column="chargePersonPhone" property="chargePersonPhone"/>
+        <result column="chargePersonPortrait" property="chargePersonPortrait"/>
         <result column="date" property="date"/>
     </resultMap>
 
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.RoomReservation" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO room_reservation(`projectItemTargetRoomId`, `userId`, `date`) VALUES (#{projectItemTargetRoomId}, #{userId}, #{date})
+        INSERT INTO room_reservation(`projectId`, `projectItemTargetRoomId`, `userId`, `date`) VALUES (#{projectId}, #{projectItemTargetRoomId}, #{userId}, #{date})
     </insert>
 
     <select id="getList" resultMap="result">
-        SELECT a.*, b.name as userName, b.portrait as userPortrait FROM room_reservation a LEFT JOIN mgr_user b ON a.userId = b.id
+        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>
+            <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="date!=null">and a.date = #{date}</if>

virgo.manager/src/main/java/com/bosshand/virgo/service/ClientService.java

@@ -71,6 +71,23 @@ public class ClientService {
             Cell cell = row.createCell(i);
             cell.setCellValue(split[i]);
         }
+        // 备注说明
+        Sheet sheet1 = workbook.createSheet("备注说明");
+
+        String st1 = "客户类型:,1.潜在客户,2.新增客户,3.跟进中客户,4.成交客户,5.流失客户";
+        String[] split1 = st1.split(",");
+        Row row1 = sheet1.createRow(0);
+        for (int i = 0; i < split1.length; i++) {
+            Cell cell = row1.createCell(i);
+            cell.setCellValue(split1[i]);
+        }
+        String st2 = "跟进状态:,1.初次接触,2.沟通中,3.已成交,4.失败/放弃,5.暂不考虑,6.待定,7.未联系上";
+        String[] split2 = st2.split(",");
+        Row row2 = sheet1.createRow(1);
+        for (int i = 0; i < split2.length; i++) {
+            Cell cell = row2.createCell(i);
+            cell.setCellValue(split2[i]);
+        }
         // 写入到文件
         try {
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();