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

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

@@ -60,7 +60,7 @@ public class TaPersonController extends BaseController {
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
-            IPage<TaPerson> result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
+            IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
             return ResponseBean.success(result);
         }else {
             IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
@@ -309,32 +309,32 @@ public class TaPersonController extends BaseController {
     }
 
     /**
-     * 获取收藏置业顾问列表
-     * @param pageNumber
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/wx/savedPerson")
-    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
-                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
-        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
-        if (null == taPersons || taPersons.size() != 1) {
-            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-        TaPerson person = taPersons.get(0);
-        if (pageNumber < 0 || pageSize < 0) {
-            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-        try {
-            IPage<TaPerson> result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
-            return ResponseBean.success(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-    }
+//     * 获取收藏置业顾问列表
+//     * @param pageNumber
+//     * @param pageSize
+//     * @return
+//     */
+//    @GetMapping("/wx/savedPerson")
+//    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
+//                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
+//        String openid = JWTUtils.getSubject(request);
+//        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+//        if (null == taPersons || taPersons.size() != 1) {
+//            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//        TaPerson person = taPersons.get(0);
+//        if (pageNumber < 0 || pageSize < 0) {
+//            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+//        try {
+//            IPage<TaPerson> result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
+//            return ResponseBean.success(result);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//
+//    }
     /**
      * 获取我参加过的活动列表
      * @param pageNumber

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

@@ -43,4 +43,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     String getConsultantByTel(@Param("tel")String tel);
 
+    List<Map<String,Object>> selectCardListofMine(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("personIds")List<String> personIds);
+
 }

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

@@ -57,7 +57,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     String getPersonIdByCustomerId(String customerId);
 
-    IPage<TaPerson> getSavedConsaultants(int pageNumber, int pageSize,String personId);
+    IPage<Map<String,Object>> getSavedConsaultants(int pageNumber, int pageSize,String personId);
 
     IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building);
 

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

@@ -659,7 +659,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<TaPerson> getSavedConsaultants(int pageNumber,int pageSize,String personId){
+    public IPage<Map<String,Object>> getSavedConsaultants(int pageNumber,int pageSize,String personId){
         QueryWrapper<TaSave> savePerson = new QueryWrapper<>();
         savePerson.eq("person_id",personId);
         savePerson.eq("target_type",CommConstant.FAVOR_CONSULTANT);
@@ -668,10 +668,12 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         for(int i =0;i<savedPerson.size();i++){
             personIds.add(savedPerson.get(i).getSavedTarget());
         }
-        IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
-        QueryWrapper<TaPerson> persons = new QueryWrapper<>();
-        persons.in("personId",personIds);
-        return taPersonMapper.selectPage(page,persons);
+        Page<Map<String, Object>> page = new Page<>();
+        page.setSize(pageSize);
+        page.setPages(pageNumber);
+        page.setCurrent(pageNumber);
+        page.setRecords(taPersonMapper.selectCardListofMine(page,CommConstant.PERSON_REALTY_CONSULTANT,CommConstant.STATUS_NORMAL,personIds));
+        return page;
 
     }
 

src/main/resources/mapper/TaPersonMapper.xml

@@ -113,4 +113,29 @@ FROM
     <select id="getConsultantByTel" resultType="java.lang.String">
         select person_id from ta_person where tel = #{tel}
     </select>
+
+    <select id="selectCardListofMine" resultType="java.util.HashMap">
+        SELECT
+        t.person_id AS id,
+        t.name,
+        t.company,
+        t.department,
+        t.post,
+        t.tel AS phone,
+        t.avatarurl AS avatar,
+        t.photo
+        FROM
+        ta_person t
+        WHERE
+        t.person_type = #{personType}
+        AND t.status = #{status}
+        <if test="personIds != null">
+            and t.person_id in
+            <foreach collection="personIds" item="personIds" index="index" open="(" close=")" separator=",">
+                #{ordersId}
+            </foreach>
+        </if>
+        ORDER BY
+        t.create_date DESC
+    </select>
 </mapper>