兑换记录

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaGoods;
 import com.huiju.estateagents.entity.TaPointsExchange;
+import com.huiju.estateagents.service.ITaGoodsService;
 import com.huiju.estateagents.service.ITaPointsExchangeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -39,6 +42,8 @@ public class TaPointsExchangeController extends BaseController {
     @Autowired
     public ITaPointsExchangeService iTaPointsExchangeService;
 
+    @Autowired
+    private ITaGoodsService taGoodsService;
 
     /**
      * 分页查询列表
@@ -226,6 +231,14 @@ public class TaPointsExchangeController extends BaseController {
             queryWrapper.orderByDesc("create_date");
             
             IPage<TaPointsExchange> result = iTaPointsExchangeService.page(pg, queryWrapper);
+            List<TaPointsExchange> records = result.getRecords();
+            records.forEach(e -> {
+                if (null == e.getStatus() || e.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+                    TaGoods goods = taGoodsService.getById(e.getTargetId());
+                    e.setAddress(goods.getAddress());
+                }
+            });
+            result.setRecords(records);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -99,7 +99,7 @@
 	        d.name as activity_name,
 	        d.create_date
         FROM
-            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC ) t
+            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC LIMIT 999) t
             left JOIN ta_person p on t.person_id = p.person_id
             LEFT join ta_drainage d on t.target_id = d.drainage_id
         GROUP BY
@@ -117,6 +117,8 @@
                 LEFT JOIN ta_drainage d ON t.target_id = d.drainage_id
             GROUP BY
                 t.target_id
+            ORDER BY
+	            t.visit_time DESC
     </select>
 
     <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">