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

# Conflicts:
#	src/main/java/com/huiju/estateagents/controller/TaPreselectionRecordController.java

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

@@ -71,7 +71,7 @@ public class TaRaiseHouseController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/taRaiseHouse", method = RequestMethod.POST)
-    public ResponseBean taRaiseHouseAdd(@RequestBody TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
+    public ResponseBean taRaiseHouseAdd(TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
 

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

@@ -724,12 +724,12 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 taRaiseRecordMapper.updateById(taRaiseRecord);
 
                 // 更新关联表状态
-                TaRaiseHouse raiseHouse = new TaRaiseHouse();
-                raiseHouse.setRaiseHouseId(raiseHouseId);
-//                raiseHouse.setHouseLockingStatus("unlocked");
-//                raiseHouse.setPersonId("");
-//                raiseHouse.setPersonName("");
-                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
+//                TaRaiseHouse raiseHouse = new TaRaiseHouse();
+//                raiseHouse.setRaiseHouseId(raiseHouseId);
+////                raiseHouse.setHouseLockingStatus("unlocked");
+////                raiseHouse.setPersonId("");
+////                raiseHouse.setPersonName("");
+//                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
         }
         responseBean.addError("fail");

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -342,11 +342,12 @@
         SELECT
             t.*,
             t2.raise_house_id,
-            t2.person_id lockingPersonId,
-            t2.person_name lockingPersonName
+            t3.person_id lockingPersonId,
+            t3.name lockingPersonName
         FROM
             ta_housing_resources t
             LEFT JOIN ta_raise_house t2 ON t.house_id = t2.house_id
+            left join ta_person t3 on t.house_locking_person = t3.person_id
         WHERE
             t.org_id = #{orgId}
             AND t.`status` != - 1
@@ -358,11 +359,12 @@
     <select id="getHouseByRaiseHouseId" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
             t.*,
-            t2.person_id lockingPersonId,
-            t2.person_name lockingPersonName
+            t3.person_id lockingPersonId,
+            t3.name lockingPersonName
         FROM
             ta_housing_resources t
             LEFT JOIN ta_raise_house t2 ON t.house_id = t2.house_id
+            left join ta_person t3 on t.house_locking_person = t3.person_id
         WHERE
             t2.raise_house_id = #{raiseHouseId}
             AND t2.org_id = #{orgId}

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -27,6 +27,8 @@
             t.person_id = #{personId}
             AND t.org_id = #{orgId}
         <if test="source == 'raiseChoose'">
+            AND t2.`status` = 1
+            AND t3.`status` = 1
             AND t4.raise_start_time &lt;= now( ) AND t4.raise_end_time &gt;= now( )
         </if>
         <if test="customerLocked == 'mine'">