feat: 公司接口查询条件修改，新增位置排序，所属区域筛选

guzijian
1 parent 8008e620
Showing 6 changed files with 46 additions and 21 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/EnterpriseDto.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -144,9 +144,8 @@ public class GarbageOrderController {
     @GetMapping("/company")
-    public Result<?> queryEnterpriseList(TransportationEnterprise enterprise) {
-        startPage();
-        return Result.OK(garOrderService.queryEnterpriseList(enterprise));
+    public Result<?> queryEnterpriseList(TransportationEnterprise dto) {
+        return Result.OK(garOrderService.queryEnterpriseList(dto));
     }
     @GetMapping("/search/history")
@@ -15,7 +15,7 @@ import java.util.List;
 */
 public interface GarOrderMapper extends BaseMapper<GarOrder> {
-    List<GarOrder> queryCleanNumberByEnterpriseIds(@Param("list") List<Long> enterpriseIds,@Param("status") Integer value);
+    List<GarOrder> queryCleanNumberByEnterpriseIds(@Param("list") List<Long> list,@Param("status") Integer value);
     List<GarOrderDriverVo> queryOrderListByTelWithType(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer cancelFlag);
-package com.trash.garbage.pojo.dto;
-
-public class EnterpriseDto {
-}
@@ -65,7 +65,7 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     OrderDetailVo queryOrderWebDetail(String id);
-    PageInfo queryEnterpriseList(TransportationEnterprise enterprise);
+    PageInfo queryEnterpriseList(TransportationEnterprise dto);
     List<GarOrderEvaluate> queryEvaluateDetail(String orderId);
@@ -3,6 +3,7 @@ package com.trash.garbage.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
+import com.trash.common.utils.ServletUtils;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.enterprise.service.ITransportationEnterpriseService;
 import com.trash.garbage.custom.BizException;
@@ -491,8 +492,23 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Override
     public PageInfo queryEnterpriseList(TransportationEnterprise enterprise) {
+        // 1）支持选择企业“所属区域”（长沙市内的）展示区域内所有企业
+        // 2）支持选择车辆“车辆类型”展示有该车辆类型的企业
+        // TODO 车辆类型暂时不考虑
         List<TransportationEnterprise> list = transportationEnterpriseService.selectTransportationEnterpriseList(enterprise);
-        long total = new PageInfo<>(list).getTotal();
+        Integer pageNum = ServletUtils.getParameterToInt("pageNum");
+        Integer pageSize = ServletUtils.getParameterToInt("pageSize");
+        Integer orderByColumn = ServletUtils.getParameterToInt("orderByColumn");
+
+        Comparator<TransportationEnterpriseVo> comparator;
+        if (1 == orderByColumn) {
+            comparator = Comparator.comparing(TransportationEnterpriseVo::getCleanNumber);
+        } else if (2 == orderByColumn) {
+            comparator = Comparator.comparing(TransportationEnterpriseVo::getScore);
+        } else {
+            comparator = Comparator.comparing(TransportationEnterpriseVo::getDistance);
+        }
+
         List<Long> enterpriseIds = list.stream().map(TransportationEnterprise::getId).collect(Collectors.toList());
         List<GarOrder> orderList = baseMapper.queryCleanNumberByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
         List<GarOrderEvaluate> evaluateList = garOrderEvaluateService.queryEvaluateByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
@@ -516,21 +532,30 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     List<GarOrderEvaluate> evaluate = evaluateMap.get(String.valueOf(item.getId()));
                     handleCleanNumber(vo, orderList);
                     handleScore(vo, evaluate);
-                    handleKilometre(vo, address);
+                    handleDistance(vo, address);
                     return vo;
                 })
-                .sorted(Comparator.comparing(TransportationEnterpriseVo::getDistance))
+                // 降序
+                .sorted(comparator.reversed())
                 .collect(Collectors.toList());
+
+        int total = voList.size();
+        int remainder = total % pageSize;
+        int currentPage = pageNum > 0 ? (pageNum - 1) * pageSize : pageNum * pageSize;
+        // 怕页码超出界限了 超出界限就通过currenPage (3 * 10) > total (25) ? currentPage (20) - (pageSize (10) - remainder (3)) : currentPage
+        int startPage = currentPage > total ? currentPage - (pageSize - remainder) : currentPage;
+        int endPage = Math.min(startPage + pageSize, total);
         PageInfo<TransportationEnterpriseVo> pageInfo = new PageInfo<>();
-        pageInfo.setList(voList);
+        pageInfo.setList(voList.subList(startPage, endPage));
         pageInfo.setTotal(total);
         return pageInfo;
     }
-    private void handleKilometre(TransportationEnterpriseVo vo, GarAddress address) {
+
+    private void handleDistance(TransportationEnterpriseVo vo, GarAddress address) {
         String[] params = vo.getOfficeAddressGps().split(",");
-        double kilometre = calculateDistance(Double.parseDouble(params[1]), Double.parseDouble(params[0]), address.getGarLatitude(), address.getGarLongitude());
-        vo.setDistance(kilometre);
+        double distance = calculateDistance(Double.parseDouble(params[1]), Double.parseDouble(params[0]), address.getGarLatitude(), address.getGarLongitude());
+        vo.setDistance(distance);
     }
     private double calculateDistance(double lat1, double lon1, double lat2, double lon2) {
@@ -48,11 +48,16 @@
         select gar_order_company_id, count(gar_order_company_id) as count
         from gar_order
         where gar_order_handler_status = #{status}
-        and gar_order_company_id in
-        <foreach collection="list" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-        group by gar_order_company_id
+        <if test="list != null and list.size() > 0">
+            and gar_order_company_id in
+            <foreach collection="list" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            group by gar_order_company_id
+        </if>
+        <if test="list == null or list.size() == 0">
+            and 1 = 0
+        </if>
     </select>
     <select id="queryOrderListByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
         SELECT