更改接站和年龄数据看板

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/report/impl/VoyageStockBoardServiceImpl.java

@@ -994,7 +994,7 @@ public class VoyageStockBoardServiceImpl implements VoyageStockBoardService {
         // 年龄段统计
         Map<String, Integer> ageGroupCountMap = new LinkedHashMap<>();
         // 预定义年龄段顺序
-        String[] ageGroups = {"17岁以下", "18-25岁", "26-35岁", "36-45岁", "46-55岁", "56-65岁", "65岁以上"};
+        String[] ageGroups = {"12岁以下", "12岁-18岁", "18岁-30岁", "30岁-45岁", "45岁-60岁", "60岁以上"};
         for (String group : ageGroups) {
             ageGroupCountMap.put(group, 0);
         }
@@ -1006,7 +1006,7 @@ public class VoyageStockBoardServiceImpl implements VoyageStockBoardService {
             }
             knownAgeCount++;
 
-            String group = getAgeGroup(age);
+            String group = getAgeGroupLabel(age);
             ageGroupCountMap.merge(group, 1, Integer::sum);
         }
 
@@ -1050,26 +1050,6 @@ public class VoyageStockBoardServiceImpl implements VoyageStockBoardService {
         return respVO;
     }
 
-    /**
-     * 获取年龄段分组
-     */
-    private String getAgeGroup(int age) {
-        if (age <= 17) {
-            return "17岁以下";
-        } else if (age <= 25) {
-            return "18-25岁";
-        } else if (age <= 35) {
-            return "26-35岁";
-        } else if (age <= 45) {
-            return "36-45岁";
-        } else if (age <= 55) {
-            return "46-55岁";
-        } else if (age <= 65) {
-            return "56-65岁";
-        } else {
-            return "65岁以上";
-        }
-    }
 
     /**
      * 构建空响应

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdetail/OrderGiftVisitorMapper.xml

@@ -65,7 +65,7 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND o.source_id = #{vo.otaId}
         </if>
-        ORDER BY v.id desc
+        ORDER BY o.id desc
     </select>
 
     <!-- 导出蹭送行程接站明细 -->
@@ -127,7 +127,7 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             AND o.source_id = #{vo.otaId}
         </if>
-        ORDER BY v.id desc
+        ORDER BY o.id desc
     </select>
 
     <!-- 根据分车ID查询蹭送行程游客列表 -->

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdetail/OrderJzDetailMapper.xml

@@ -45,7 +45,7 @@
         <if test="vo.signStatus != null and vo.signStatus == 0">
             and d.sign_time is null
         </if>
-        order by d.address + 0 asc, d.arrive_time + 0 asc
+        order by d.address + 0 asc, d.arrive_time + 0 asc, oz.order_id asc
     </select>
 
     <!-- selectVisitorExportList: 导出游客接站明细，条件与selectPage2一致，不分页 -->
@@ -84,7 +84,7 @@
         <if test="vo.signStatus != null and vo.signStatus == 0">
             and d.sign_time is null
         </if>
-        order by d.address + 0 asc, d.arrive_time + 0 asc
+        order by d.address + 0 asc, d.arrive_time + 0 asc, oz.order_id asc
     </select>
 
     <select id="selectPage3" resultType="map">