Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -518,6 +518,11 @@ public class CommConstant {
      */
     public static final String EVENT_H5 = "h5";
 
+    /**
+     * 房源分享
+     */
+    public static final String HOUSE = "house";
+
     /**
      * 系统参数  通知消息次时间间隔
      */

src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java

@@ -380,6 +380,9 @@ public class TaPersonVisitRecordController extends BaseController {
                 case CommConstant.EVENT_H5:
                     e.setDrainageShareNum(shareNum);
                     break;
+                case CommConstant.HOUSE:
+                    e.setHouseShareNum(shareNum);
+                    break;
             }
         });
         result.setRecords(taConsultantInfos);

src/main/java/com/huiju/estateagents/controller/TaPreselectionRecordController.java

@@ -167,12 +167,11 @@ public class TaPreselectionRecordController extends BaseController {
     /**
      * 取消房源预选
      *
-     * @param personId 用户ID
      * @return
      */
     @RequestMapping(value = "/wx/taPreselectionRecordCancel", method = RequestMethod.DELETE)
-    public ResponseBean taPreselectionRecordCancel(@RequestParam("personId") String personId,
-                                                   @RequestParam("houseId") String houseId) {
+    public ResponseBean taPreselectionRecordCancel(@RequestParam("houseId") String houseId,
+                                                   @RequestParam("personId") String personId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaPreselectionRecordService.taPreselectionRecordCancel(personId, houseId);

src/main/java/com/huiju/estateagents/entity/TaConsultantInfo.java

@@ -32,6 +32,8 @@ public class TaConsultantInfo {
 
     private Integer drainageShareNum;
 
+    private Integer houseShareNum;
+
     private Integer buildingTypeId;
 
     private String priceType;

src/main/java/com/huiju/estateagents/service/ITaPreselectionRecordService.java

@@ -38,21 +38,12 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
     /**
      * 取消预选
      *
-     * @param personId 用户ID
+     * @param personId
      * @param houseId  房源ID
      * @return
      */
     ResponseBean taPreselectionRecordCancel(String personId, String houseId);
 
-    /**
-     * 校验用户是否预选
-     *
-     * @param personId 用户ID
-     * @param houseId  房源ID
-     * @return
-     */
-    TaPreselectionRecord checkPreselect(String personId, String houseId);
-
     ResponseBean selectPreSelectRecordList(Integer pageNum, Integer pageSize, String salesBatchId, Integer houseId, Integer orgId, String phone, String apartmentId, Integer status);
 
 }

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

@@ -161,7 +161,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
         // 获取该用户是否预选房源信息
         TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
-        if (taPreselectionRecord != null && taPreselectionRecord.getStatus() == 1) {
+        if (taPreselectionRecord != null) {
             resourcesPO.setIsPreselect(true);
         } else {
             resourcesPO.setIsPreselect(false);

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

@@ -99,7 +99,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         // 校验用户是否已经预选房源
         TaPreselectionRecord record = taPreselectionRecordMapper
                 .getRecordByPersonIdAndHouseId(taPreselectionRecord.getPersonId(), taPreselectionRecord.getHouseId());
-        if (record != null && 1 == record.getStatus()) {
+        if (record != null) {
             responseBean.addError("已预选过此房源，请到选房记录中查看。");
             return responseBean;
         }
@@ -152,7 +152,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         ResponseBean responseBean = new ResponseBean<>();
         // 校验是否已经取消
         TaPreselectionRecord preselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
-        if (preselectionRecord == null || 1 != preselectionRecord.getStatus()) {
+        if (preselectionRecord == null) {
             responseBean.addError("未预选过此房源，或已取消预选此房源");
             return responseBean;
         }
@@ -181,13 +181,6 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         return responseBean;
     }
 
-    @Override
-    public TaPreselectionRecord checkPreselect(String personId, String houseId) {
-        logger.info("checkPreselect 接收参数：personId：{}，houseId：{}", personId, houseId);
-
-        return taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
-    }
-
     @Override
     public ResponseBean selectPreSelectRecordList(Integer pageNum, Integer pageSize, String salesBatchId, Integer houseId, Integer orgId, String phone, String apartmentId, Integer status) {
         Page page = new Page(pageNum, pageSize);

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -57,25 +57,38 @@
             AND t.`status` > 0
           ) t5
         ORDER BY
-            REPLACE ( CONVERT ( t5.termName USING ascii ), '?', '' ) + 0,
-            REPLACE ( CONVERT ( t5.block_name USING ascii ), '?', '' ) + 0,
-            REPLACE ( CONVERT ( t5.unit_name USING ascii ), '?', '' ) + 0,
-            REPLACE ( CONVERT ( t5.floor_name USING ascii ), '?', '' ) + 0 desc ,
-            REPLACE ( CONVERT ( t5.room_name USING ascii ), '?', '' ) + 0
+            ( SELECT num_char_extract ( t5.termName, 2 ) ),
+            ( SELECT num_char_extract ( t5.block_name, 2 ) ),
+            ( SELECT num_char_extract ( t5.unit_name, 2 ) ),
+            ( SELECT num_char_extract ( t5.floor_name, 2 ) ) DESC,
+            ( SELECT num_char_extract ( t5.room_name, 2 ) )
     </select>
 
     <select id="listBuildApartmentBySalesBatchId" resultType="com.huiju.estateagents.entity.TaBuildingApartment">
-        SELECT
+	    SELECT
             t3.apartment_id,
             t3.apartment_name,
             t3.apartment_type,
             t3.inside_area,
-            t3.building_area
+            t3.building_area,
+            t2.apartment_id
+        FROM
+            (
+        SELECT
+            t.sales_batch_id,
+            t.apartment_id
         FROM
-            ( SELECT t.sales_batch_id, t.apartment_id FROM ta_housing_resources t WHERE t.sales_batch_id = #{salesBatchId} and t.apartment_id is not null GROUP BY t.apartment_id ) t2
+            ta_housing_resources t
+        WHERE
+            t.sales_batch_id = #{salesBatchId}
+            AND t.`status` > 0
+            AND t.apartment_id IS NOT NULL
+        GROUP BY
+            t.apartment_id
+            ) t2
             LEFT JOIN ta_building_apartment t3 ON t2.apartment_id = t3.apartment_id
         ORDER BY
-	      t3.apartment_name
+            t3.apartment_name
     </select>
 
     <update id="updateForAddHeat" parameterType="java.lang.String">

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -347,7 +347,7 @@
             '2' as building_name,
             '3' as address,
             1 as building_type_id,
-			t.tagert_type as eventType,
+			left(t.tagert_type,5) as eventType,
 			t.create_date as visit_time
             from ta_share t
             left join ta_sales_batch g on t.be_share = g.sales_batch_id

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -16,6 +16,7 @@
             t.house_id,
             t.`status`,
             t.create_date,
+            t2.term_name,
             t2.block_name,
             t2.unit_name,
             t2.floor_name,
@@ -32,11 +33,11 @@
             t.person_id = #{personId}
             AND t.org_id = #{orgId}
             AND t.house_id = t2.house_id
-        ORDER BY
-            t.create_date DESC
             ) t3
             LEFT JOIN ta_building t4 ON t3.buildingId = t4.building_id
             LEFT JOIN ta_sales_batch t5 ON t3.saleBatchId = t5.sales_batch_id
+         ORDER BY
+            t3.create_date DESC
     </select>
 
     <select id="getRecordByPersonIdAndHouseId" resultType="com.huiju.estateagents.entity.TaPreselectionRecord">
@@ -47,14 +48,15 @@
         WHERE
             t.person_id = #{personId}
             AND t.house_id = #{houseId}
+            AND t.status = 1
     </select>
 
     <select id="selectPreSelectRecordList" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
         select t.house_id,
-        a.block_id as blockName,
-        a.unit_id as unitName,
-        a.floor_id as floorName,
-        a.room_id as roomName,
+        a.block_name,
+        a.unit_name,
+        a.floor_name,
+        a.room_name,
         a.apartment_id,
         b.nickname as nameOrnick,
         b.`name`,

src/main/resources/mapper/TaShareCountMapper.xml

@@ -25,9 +25,9 @@
         when e.building_name != null || e.building_name != '' then e.building_name
         when f.news_name != null || f.news_name != '' then f.news_name
         when g.`name` != null || g.`name` != '' then g.`name`
+        when h.sales_batch_name != null || h.sales_batch_name != '' then h.sales_batch_name
         else '空'
         end as shareTitle,t.create_date
-
         from ta_share_count t
         left join ta_building_dynamic a on t.be_share = a.dynamic_id and t.tagert_type = 'activity'
         left join ta_help_activity b on t.be_share = b.help_activity_id and t.tagert_type = 'help'
@@ -35,10 +35,11 @@
         LEFT JOIN ta_drainage d on t.be_share = d.drainage_id and t.tagert_type = 'h5'
         left join ta_building e on t.be_share = e.building_id and t.tagert_type = 'project'
         LEFT JOIN ta_news f on t.be_share = f.news_id and t.tagert_type = 'news'
+        LEFT JOIN ta_sales_batch h on t.be_share = h.sales_batch_id and t.tagert_type like CONCAT('house' , '%')
         left JOIN ta_person g on t.be_share = g.person_id and t.tagert_type = 'consultant'
         where t.person_id = #{personId}
         <if test="shareType != null and shareType != ''">
-            and t.tagert_type = #{shareType}
+            and (t.tagert_type = #{shareType} || t.tagert_type like CONCAT(#{shareType} , '%'))
         </if>
         <if test="shareTitle != null and shareTitle != ''">
             and
@@ -49,7 +50,8 @@
                 d.`name` like CONCAT('%', #{shareTitle} , '%') or
                 e.building_name like CONCAT('%', #{shareTitle} , '%') or
                 f.news_name like CONCAT('%', #{shareTitle} , '%') or
-                g.`name` like CONCAT('%', #{shareTitle} , '%')
+                g.`name` like CONCAT('%', #{shareTitle} , '%') or
+                h.sales_batch_name like CONCAT('%', #{shareTitle} , '%')
             )
         </if>
         order by t.create_date desc