From e866153e0dc7ca2647bef50467d301efdf243aad Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Mon, 5 Sep 2022 09:41:30 +0800 Subject: [PATCH] =?UTF-8?q?:rotating=5Flight:=20=E5=8A=A0=E5=BC=BA?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java | 3 +++ .../com/cloud/kicc/commonbiz/api/entity/MapLogisticPoint.java | 2 +- .../main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java | 3 +++ .../com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java | 3 +++ .../cloud/kicc/commonbiz/controller/HospitalController.java | 2 +- .../kicc-system-biz/src/main/resources/mapper/UserMapper.xml | 2 +- kicc-ui | 2 +- 7 files changed, 13 insertions(+), 4 deletions(-) diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java index f6ac3a70..0d0efb01 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java @@ -52,6 +52,9 @@ public class MapLogistic extends CommonEntity { @ApiModelProperty("发单下级医院名称") private String sendOrderName; + @ApiModelProperty("发单任务类型") + private String sendOrderTaskType; + @ApiModelProperty("发单起点经度值") private Double sendOrderLng; 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 39310699..d946e803 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 @@ -40,7 +40,7 @@ public class MapLogisticPoint extends CommonEntity { @ApiModelProperty("纬度值") private Double lat; - @ApiModelProperty("标记点排序") + @ApiModelProperty("标记点排序,为后面开发操作记录池做准备") private Integer sort; @ApiModelProperty("区分是医院还是医检标记点,0医院,1医检") diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java index a35aaf0d..e48d0073 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTask.java @@ -34,6 +34,9 @@ public class MapTask extends CommonEntity { @ApiModelProperty("附属子任务名称") private String name; + @ApiModelProperty("任务排序,为后面开发操作记录池做准备") + private Integer sort; + @ApiModelProperty("任务类型,1是普通任务,2是交接任务") private String taskType; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java index af05de3a..5d129f14 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java @@ -33,6 +33,9 @@ public class MapTaskPreset extends CommonEntity { @ApiModelProperty("预设点任务名称") private String name; + @ApiModelProperty("交接预设任务排序,为后面开发操作记录池做准备") + private Integer sort; + @ApiModelProperty("起始预设点id") private String orginPresetId; diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/HospitalController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/HospitalController.java index 5bddc3be..7aa3b240 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/HospitalController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/HospitalController.java @@ -41,7 +41,7 @@ public class HospitalController { return new LambdaQueryWrapper() .like(StrUtil.isNotBlank(hospital.getName()), Hospital::getName, hospital.getName()) .eq(StrUtil.isNotBlank(hospital.getType()), Hospital::getType, hospital.getType()) - .eq(StrUtil.isNotBlank(hospital.getMapNotify()), Hospital::getMapNotify, hospital.getMapLng()) + .eq(StrUtil.isNotBlank(hospital.getMapNotify()), Hospital::getMapNotify, hospital.getMapNotify()) .between(StrUtil.isNotBlank(hospital.getBeginTime()) && StrUtil.isNotBlank(hospital.getEndTime()), Hospital::getCreateTime, hospital.getBeginTime(), hospital.getEndTime()) .orderByAsc(Hospital::getCreateTime); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml index 92931c0b..8539ccb7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml @@ -44,6 +44,6 @@ diff --git a/kicc-ui b/kicc-ui index 7673f885..689860ca 160000 --- a/kicc-ui +++ b/kicc-ui @@ -1 +1 @@ -Subproject commit 7673f885a168321ca3f052c29a44c801148b9867 +Subproject commit 689860ca68656945e0426b25d48a58fae88c2932