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

src/main/java/com/huiju/estateagents/bo/request/PresecretRecordRequestBO.java

     /**
      * 房源ID
      */
-    private String houseId;
+    private Integer houseId;
 
     /**
      * 期名

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

 //            lockedHouseResources(taHousingResources);
         }
         //判断销售批次是否是发布状态和房源是否正常状态
-        checkHouseStatus(taRaiseRecord,orgId, personId, taRaise);
+        checkHouseStatus(taRaiseRecord, orgId, personId, taRaise);
 
         //插入认筹单
         saveRaiseRecord(taRaiseRecord, orgId, personId, taRaise);
 
         //发送订阅消息
-        sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),personId,"在线选房认筹通知","已提交认筹","点击详情查看认筹单","房源紧俏，请赶紧缴费",true);
+        sendRaiseMsg(taRaiseRecord.getRaiseRecordId(), personId, "在线选房认筹通知", "已提交认筹", "点击详情查看认筹单", "房源紧俏，请赶紧缴费", true);
 
         return taRaiseRecord;
     }
     private void checkHouseStatus(TaRaiseRecord taRaiseRecord, Integer orgId, String personId, TaRaise taRaise) throws Exception {
         //销售批次是否有效状态
         TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(taRaise.getSalesBatchId());
-        if (!taSalesBatch.getStatus().equals(CommConstant.STATUS_NORMAL)){
+        if (!taSalesBatch.getStatus().equals(CommConstant.STATUS_NORMAL)) {
             throw new Exception("此销售批次已经取消发布！");
         }
         //判断房源是否已经删除
         List<Integer> houseList = taRaiseRecord.getHouseList();
         for (Integer houseId : houseList) {
             TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseId);
-            if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL){
+            if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL) {
                 throw new Exception("存在已经删除的房源！");
             }
             //判断我是否认筹过这些房源
             QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
-            taRaiseHouseQueryWrapper.eq("org_id",orgId);
-            taRaiseHouseQueryWrapper.eq("house_id",houseId);
-            taRaiseHouseQueryWrapper.eq("person_id",personId);
+            taRaiseHouseQueryWrapper.eq("org_id", orgId);
+            taRaiseHouseQueryWrapper.eq("house_id", houseId);
+            taRaiseHouseQueryWrapper.eq("person_id", personId);
             List<TaRaiseHouse> taRaiseHouses = taRaiseHouseMapper.selectList(taRaiseHouseQueryWrapper);
-            if (taRaiseHouses.size() > 0){
+            if (taRaiseHouses.size() > 0) {
                 throw new Exception("存在已经认筹过的房源！");
             }
         }
                 taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_LOCKED);
                 taRaiseHouse.setPersonId(personId);
                 taRaiseHouse.setPersonName(taPerson.getName());
-            }else{
+            } else {
                 taRaiseHouse.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
             }
             taRaiseHouse.setOrgId(orgId);
             //更新房源的实际热度
             TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(e);
             Integer raiseRealHeat = taHousingResources.getRaiseRealHeat();
-            if (null == raiseRealHeat){
+            if (null == raiseRealHeat) {
                 raiseRealHeat = 0;
             }
-            taHousingResources.setRaiseRealHeat(raiseRealHeat+1);
+            taHousingResources.setRaiseRealHeat(raiseRealHeat + 1);
             taHousingResourcesMapper.updateById(taHousingResources);
         });
 
         //把idcard字断更新进person表
-        if (StringUtil.isEmpty(taPerson.getIdcard())){
+        if (StringUtil.isEmpty(taPerson.getIdcard())) {
             taPerson.setIdcard(taRaiseRecord.getIdcard());
             taPersonMapper.updateById(taPerson);
         }
     /**
      * 发送认筹订阅消息
      *
-     * @param raiseRecordId  认筹单ID
-     * @param personId   用户ID
-     * @param title  审核类型
-     * @param result     审核结果
-     * @param remark 失败原因
-     * @param isSuccess  是否成功 true是(只有成功才发送短信)
+     * @param raiseRecordId 认筹单ID
+     * @param personId      用户ID
+     * @param title         审核类型
+     * @param result        审核结果
+     * @param remark        失败原因
+     * @param isSuccess     是否成功 true是(只有成功才发送短信)
      */
     @Override
-    public void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason,String remark, Boolean isSuccess) {
+    public void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason, String remark, Boolean isSuccess) {
         logger.info("sendSubscribeMsg 接收参数：houseId:{},checkType:{},result:{}，reason:{}, remark:{}",
                 raiseRecordId, title, result, reason, remark);
 

src/main/resources/mapper/TaPreselectionRecordMapper.xml

                 AND t6.person_id != #{personId}
             </if>
           GROUP BY
-            t6.preselection_record_id
+            t3.preselection_record_id
          ORDER BY
             t3.create_date DESC
 
                 AND a.room_name like CONCAT('%',#{bo.roomName}, '%')
             </if>
             <if test="bo.houseId != null and bo.houseId !=''">
-                AND t.house_id = #{houseId}
+                AND t.house_id = #{bo.houseId}
             </if>
             <if test="bo.phone != null and bo.phone != ''">
-                AND b.phone = #{bo.phone}
+                AND b.phone like CONCAT('%',#{bo.phone}, '%')
             </if>
             <if test="bo.apartmentId != null and bo.apartmentId != ''">
                 AND a.apartment_id = #{bo.apartmentId}
         ) t
         GROUP BY
             t.house_id,
-            t.person_id
+            t.person_id,
+            t.status
 
     </select>
 

src/main/resources/mapper/TaRaiseRecordMapper.xml

         GROUP BY
           t.house_id
         ORDER BY
-          t3.create_date DESC
+          t.raise_real_heat DESC
     </select>
 
     <select id="listRaiseRecordByCondition" resultType="com.huiju.estateagents.entity.TaRaiseRecord">
             AND t.house_locking_status = #{bo.lockingStatus}
         </if>
         <if test="bo.tel != null and bo.tel != ''">
-            AND t.tel = #{bo.tel}
+            AND t.tel like CONCAT('%',#{bo.tel} , '%')
         </if>
         <if test="bo.personTel != null and bo.personTel != ''">
-            AND t5.tel = #{bo.personTel}
+            AND t5.tel like CONCAT('%',#{bo.personTel}  , '%')
         </if>
         <if test="bo.payStatus != null and bo.payStatus != ''">
             AND t.pay_status = #{bo.payStatus}
                 AND t.raise_record_id = #{bo.raiseRecordId}
             </if>
             <if test = "bo.tel != null and bo.tel != ''">
-                AND t.tel = #{bo.tel}
+                AND t.tel  like CONCAT('%',#{bo.tel} , '%')
             </if>
             <if test = "bo.personTel != null and bo.personTel != ''">
-                AND t3.tel = #{bo.personTel}
+                AND t3.tel like CONCAT('%',#{bo.personTel}  , '%')
             </if>
             <if test = "bo.transactionId != null and bo.transactionId != ''">
                 AND t2.transaction_id = #{bo.transactionId}