* 新需求

src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java

@@ -149,14 +149,14 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
 
         JSONObject obj = new JSONObject();
         obj.put("preselectionStartTime", salesBatch.getPreselectionStartTime());
-        obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());
-        obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
-        obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
-        obj.put("heatNumber", totalHeat == null ? 0 : totalHeat);
-        obj.put("raiseRealNumber", raiseRealNumber == null ? 0 : raiseRealNumber);
+        obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());        obj.put("raiseRealNumber", raiseRealNumber == null ? 0 : raiseRealNumber);
         obj.put("raiseNumber", raiseNumber == null ? 0 : raiseNumber);
         obj.put("raiseStartTime", taRaise.getRaiseStartTime());
         obj.put("raiseEndTime", taRaise.getRaiseEndTime());
+        obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
+        obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
+        obj.put("heatNumber", totalHeat == null ? 0 : totalHeat);
+
         responseBean.addSuccess(obj);
         return responseBean;
     }

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -244,12 +244,11 @@ FROM
         SELECT
         b.*,
         IF
-        ( IFNULL( tpp.NAME, '' ) != '', tpp.NAME, tpp.nickname ) AS sharePersonName
+        ( IFNULL( b.NAME, '' ) != '', b.NAME, b.nickname ) AS sharePersonName
         FROM
         ta_person b
-        LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
-        LEFT JOIN ta_person tpp ON r.share_person_id = tpp.person_id
-        left join td_wx_dict d on r.scene_id = d.scene_id
+        LEFT JOIN ta_person_from_record r ON r.share_person_id = b.person_id
+        LEFT JOIN td_wx_dict d ON r.scene_id = d.scene_id
         <where>
             b.status > 0
             and b.org_id = #{orgId}
@@ -280,11 +279,11 @@ FROM
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
             <if test="buildingId != null and buildingId !=''">
-                AND r.building_id = #{buildingId}
+                AND b.building_id = #{buildingId}
             </if>
             and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
             <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND r.building_id in
+                AND b.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                     #{personBuilding.buildingId}
                 </foreach>