✨ 获取地图数据接口支持排序

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java

@@ -46,6 +46,9 @@ public class MapLogisticPoint extends CommonEntity {
     @ApiModelProperty("区分是医院还是医检标记点,0医院,1医检")
     private String type;
 
+    @ApiModelProperty("任务类型,1是普通任务,2是交接任务")
+    private String taskType;
+
     @ApiModelProperty("关联报告单生成的批次码")
     private String batchCode;
 

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java

@@ -1,6 +1,4 @@
 package com.cloud.kicc.commonbiz.controller;
-
-
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -59,29 +57,24 @@ public class MapLogisticController {
         return R.ok(iPage.getRecords(), iPage.getTotal());
     }
 
-    @GetMapping("/{courierUserId:\\w+}")
+    @GetMapping("getMapDataByCourierUserId/{courierUserId:\\w+}")
     @ApiOperation(value = "根据收样员id获取地图数据")
     public R getById(@PathVariable String courierUserId) {
         MapLogistic mapLogistic = iMapLogisticService.getOne(Wrappers.<MapLogistic>lambdaQuery().eq(MapLogistic::getCourierUserId, courierUserId));
         if (ObjectUtil.isNotEmpty(mapLogistic)) {
             List<MapTask> mapTaskList = iMapTaskService
-                    .list(Wrappers.<MapTask>lambdaQuery().eq(MapTask::getMapLogisticId, mapLogistic.getId()));
+                    .list(Wrappers.<MapTask>lambdaQuery().eq(MapTask::getMapLogisticId, mapLogistic.getId()).orderByAsc(MapTask::getSort));
             mapTaskList.forEach(item -> {
+                // 需要带上key,前端地图设计器表格是通过唯一key定位行数据,以及保存时通过key绑定地图标记点数据
                 item.setKey(item.getId());
                 List<MapTaskPreset> mapTaskPresetList = iMapTaskPresetService
-                        .list(Wrappers.<MapTaskPreset>lambdaQuery().eq(MapTaskPreset::getMapTaskId, item.getId()));
-                mapTaskPresetList.forEach(childItem -> {
-                    childItem.setKey(childItem.getId());
-                });
+                        .list(Wrappers.<MapTaskPreset>lambdaQuery().eq(MapTaskPreset::getMapTaskId, item.getId()).orderByAsc(MapTaskPreset::getSort));
+                mapTaskPresetList.forEach(childItem -> childItem.setKey(childItem.getId()));
                 item.setMapTaskPreset(mapTaskPresetList);
             });
-
             List<MapLogisticPoint> mapLogisticPointList = iMapLogisticPointService
-                    .list(Wrappers.<MapLogisticPoint>lambdaQuery().eq(MapLogisticPoint::getMapLogisticId, mapLogistic.getId()));
-            mapLogisticPointList.forEach(item -> {
-                item.setKey(item.getId());
-            });
-
+                    .list(Wrappers.<MapLogisticPoint>lambdaQuery().eq(MapLogisticPoint::getMapLogisticId, mapLogistic.getId()).orderByAsc(MapLogisticPoint::getSort));
+            mapLogisticPointList.forEach(item -> item.setKey(item.getId()));
             mapLogistic.setMapTask(mapTaskList);
             mapLogistic.setMapLogisticPoint(mapLogisticPointList);
         }