From ddb8a0b7a4c3bc10a07d1975430a062492f2e663 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 7 Sep 2022 05:26:12 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E8=8E=B7=E5=8F=96=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/entity/MapLogisticPoint.java | 3 +++ .../controller/MapLogisticController.java | 21 +++++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java index d946e803..37d55c30 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java +++ b/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; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java index 45bd57c9..8b27acfc 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java +++ b/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.lambdaQuery().eq(MapLogistic::getCourierUserId, courierUserId)); if (ObjectUtil.isNotEmpty(mapLogistic)) { List mapTaskList = iMapTaskService - .list(Wrappers.lambdaQuery().eq(MapTask::getMapLogisticId, mapLogistic.getId())); + .list(Wrappers.lambdaQuery().eq(MapTask::getMapLogisticId, mapLogistic.getId()).orderByAsc(MapTask::getSort)); mapTaskList.forEach(item -> { + // 需要带上key,前端地图设计器表格是通过唯一key定位行数据,以及保存时通过key绑定地图标记点数据 item.setKey(item.getId()); List mapTaskPresetList = iMapTaskPresetService - .list(Wrappers.lambdaQuery().eq(MapTaskPreset::getMapTaskId, item.getId())); - mapTaskPresetList.forEach(childItem -> { - childItem.setKey(childItem.getId()); - }); + .list(Wrappers.lambdaQuery().eq(MapTaskPreset::getMapTaskId, item.getId()).orderByAsc(MapTaskPreset::getSort)); + mapTaskPresetList.forEach(childItem -> childItem.setKey(childItem.getId())); item.setMapTaskPreset(mapTaskPresetList); }); - List mapLogisticPointList = iMapLogisticPointService - .list(Wrappers.lambdaQuery().eq(MapLogisticPoint::getMapLogisticId, mapLogistic.getId())); - mapLogisticPointList.forEach(item -> { - item.setKey(item.getId()); - }); - + .list(Wrappers.lambdaQuery().eq(MapLogisticPoint::getMapLogisticId, mapLogistic.getId()).orderByAsc(MapLogisticPoint::getSort)); + mapLogisticPointList.forEach(item -> item.setKey(item.getId())); mapLogistic.setMapTask(mapTaskList); mapLogistic.setMapLogisticPoint(mapLogisticPointList); }