Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/java/com/yunzhi/marketing/xlk/controller/SearchHouseController.java

@@ -8,8 +8,10 @@ import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.entity.TdCity;
 import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.service.ITaPersonService;
+import com.yunzhi.marketing.service.ITdCityService;
 import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
 import com.yunzhi.marketing.xlk.dto.SearchHouseReplayDTO;
 import com.yunzhi.marketing.xlk.entity.Curriculum;
@@ -59,6 +61,9 @@ public class SearchHouseController extends BaseController {
     @Autowired
     private ITaBuildingService taBuildingService;
 
+    @Autowired
+    private ITdCityService tdCityService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -114,6 +119,7 @@ public class SearchHouseController extends BaseController {
             BeanUtils.copyProperties(searchHouseDTO,searchHouse);
             searchHouse.setPersonId(person.getPersonId());
             searchHouse.setOrgId(orgId);
+            searchHouse.setStatus("0");
             searchHouse.setCreatedTime(LocalDateTime.now());
             if (iSearchHouseService.save(searchHouse)){
                 SearchHouseVO searchHouseVO = new SearchHouseVO();
@@ -180,7 +186,14 @@ public class SearchHouseController extends BaseController {
     public ResponseBean searchHouseGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iSearchHouseService.selectSearchHouseDetail(id));
+            SearchHouseVO searchHouseVO = iSearchHouseService.selectSearchHouseDetail(id);
+            if (!StringUtils.isEmpty(searchHouseVO.getIntentArea())) {
+                TdCity city = tdCityService.getById(searchHouseVO.getIntentArea());
+                if(null != city){
+                    searchHouseVO.setName(city.getName());
+                }
+            }
+            responseBean.addSuccess(searchHouseVO);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("searchHouseDelete -=- {}",e.toString());

src/main/java/com/yunzhi/marketing/xlk/vo/SearchHouseVO.java

@@ -32,5 +32,7 @@ public class SearchHouseVO extends SearchHouse implements Serializable {
 
     private String gender;
 
+    private String name;
+
     private List<TaBuilding> taBuildingList;
 }

src/main/resources/mapper/xlk/SearchHouseMapper.xml

@@ -8,17 +8,19 @@
             p.avatarurl,
             p.`nickname`,
             p.phone,
-            p.gender
+            p.gender,
+            c.`name`
         FROM
             xlk_search_house t
             LEFT JOIN ta_person p ON t.person_id = p.person_id
+            LEFT JOIN td_city c on t.intent_area = c.id
             WHERE t.ORG_ID = #{params.orgId}
                 and t.type = #{params.type}
         <if test="params.nickname != null and params.nickname != ''">
             and p.nickname like concat('%', #{params.nickname}, '%')
         </if>
         <if test="params.phone != null and params.phone != ''">
-            and p.phone like concat('%', #{phone}, '%')
+            and p.phone like concat('%', #{params.phone}, '%')
         </if>
         <if test="params.status != null and params.status != ''">
             and t.status = #{params.status}