新需求

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

@@ -15,6 +15,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  * 预选记录表  前端控制器
@@ -24,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaPreselectionRecordController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaPreselectionRecordController.class);
@@ -41,7 +43,7 @@ public class TaPreselectionRecordController extends BaseController {
      * @return
      * @author gushaoyong
      */
-    @RequestMapping(value = "/taPreselectionRecord", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/taPreselectionRecord", method = RequestMethod.GET)
     public ResponseBean taPreselectionRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
@@ -223,4 +225,24 @@ public class TaPreselectionRecordController extends BaseController {
         }
         return responseBean;
     }
+
+    @RequestMapping(value = "/admin/taPreselectRecord", method = RequestMethod.GET)
+    public ResponseBean selectPreSelectRecordList(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
+                                                  @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                                  @RequestParam(value = "salesBatchId")String salesBatchId,
+                                                  @RequestParam(value = "houseId", required = false)Integer houseId,
+                                                  @RequestParam(value = "phone", required = false) String phone,
+                                                  @RequestParam(value = "apartmentId", required = false) String apartmentId,
+                                                  @RequestParam(value = "status", required = false) Integer status,
+                                                  HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaPreselectionRecordService.selectPreSelectRecordList(pageNum, pageSize, salesBatchId, houseId, getOrgId(request), phone, apartmentId, status);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taHousingResourcesList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/mapper/TaPreselectionRecordMapper.java

@@ -2,12 +2,15 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * <p>
  * 预选记录表  Mapper 接口
@@ -38,4 +41,23 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      */
     TaPreselectionRecord getRecordByPersonIdAndHouseId(@Param("personId") String personId,
                                                        @Param("houseId") String houseId);
+
+    /**
+     * 查询预选记录表
+     * @param page
+     * @param salesBatchId
+     * @param houseId
+     * @param orgId
+     * @param phone
+     * @param apartmentId
+     * @param status
+     * @return
+     */
+    List<TaPreselectionRecord> selectPreSelectRecordList(Page page,
+                                                         @Param("salesBatchId") String salesBatchId,
+                                                         @Param("houseId") Integer houseId,
+                                                         @Param("orgId") Integer orgId,
+                                                         @Param("phone") String phone,
+                                                         @Param("apartmentId") String apartmentId,
+                                                         @Param("status") Integer status);
 }

src/main/java/com/huiju/estateagents/po/TaPreselectionRecordPO.java

@@ -58,4 +58,29 @@ public class TaPreselectionRecordPO extends TaPreselectionRecord {
      */
     @TableField(exist = false)
     private List<TaBuildingImg> buildingImgList;
+
+    /**
+     * 用户昵称
+     */
+    private String nameOrnick;
+
+    /**
+     * 用户U型明
+     */
+    private String name;
+
+    /**
+     * 用户头像
+     */
+    private String avatarurl;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 最后修改人
+     */
+    private String updateName;
 }

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

@@ -52,4 +52,6 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      */
     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/TaPreselectionRecordServiceImpl.java

@@ -11,6 +11,7 @@ import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.entity.TaApartmentImg;
 import com.huiju.estateagents.entity.TaBuildingImg;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
+import com.huiju.estateagents.entity.TaSharePersonFrom;
 import com.huiju.estateagents.mapper.TaApartmentImgMapper;
 import com.huiju.estateagents.mapper.TaBuildingImgMapper;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
@@ -162,4 +163,13 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
 
         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);
+        // 分页查询
+        List<TaPreselectionRecord> list = taPreselectionRecordMapper.selectPreSelectRecordList(page, salesBatchId, houseId, orgId, phone, apartmentId, status);
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
 }

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -39,4 +39,36 @@
             AND t.house_id = #{houseId}
     </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.apartment_id,
+        b.nickname as nameOrnick,
+        b.`name`,
+        b.avatarurl,
+        b.phone,
+        t.`status`,
+        t.update_date,
+        (select name from ta_person t where (t.user_id = t.update_user || t.person_id = t.update_user)) as updateName
+        from ta_preselection_record t
+        left join ta_housing_resources a on t.house_id = a.house_id
+        left join ta_person b on t.person_id = b.person_id
+        where b.org_id = #{orgId} and a.sales_batch_id = #{salesBatchId}
+        <if test="houseId != null and houseId !=''">
+          and t.house_id = #{houseId}
+        </if>
+        <if test="phone != null and phone != ''">
+          and b.phone = #{phone}
+        </if>
+        <if test="apartmentId != null and apartmentId != ''">
+          and a.apartment_id = #{apartmentId}
+        </if>
+        <if test="status != null">
+          and t.status = #{status}
+        </if>
+    </select>
+
 </mapper>