🚨 加强地图设计器校验逻辑

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;
 

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医检")

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;
 

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;
 

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<Hospital>()
                 .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);
     }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml

@@ -44,6 +44,6 @@
     </select>
 
     <select id="getCourierUserList" resultType="User">
-        select * from sys_user u,common_map_logistic m where u.id != m.courier_user_id
+        select u.* from sys_user u,common_map_logistic m where u.id != m.courier_user_id and u.user_type='1'
     </select>
 </mapper>

kicc-ui

@@ -1 +1 @@
-Subproject commit 7673f885a168321ca3f052c29a44c801148b9867
+Subproject commit 689860ca68656945e0426b25d48a58fae88c2932