diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java index 003542408..0c8d57e15 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java @@ -50,4 +50,5 @@ public interface SchBasePointMapper extends BaseMapper { List isBlock(JSONObject whereJson); + SchBasePoint getOneAndNotTask(String productArea); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml index 1d2286b20..54aef8fd9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml @@ -147,4 +147,16 @@ ) + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IschBasePointService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IschBasePointService.java index c24ac89aa..df3ec15e6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IschBasePointService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/IschBasePointService.java @@ -43,6 +43,7 @@ public interface IschBasePointService extends IService { void deleteAll(Set ids); + SchBasePoint getoneAndNotTask(String productArea); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/SchBasePointServiceImpl.java index 370cabf65..abddb574f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -79,6 +79,11 @@ public class SchBasePointServiceImpl extends ServiceImpl() - .eq(SchBasePoint::getProduct_area, product_area) - .eq(SchBasePoint::getPoint_type, "6") - .eq(SchBasePoint::getIs_used, "1") - .eq(SchBasePoint::getIs_delete, "0") - .like(SchBasePoint::getRegion_code, "-FQCR")); + SchBasePoint inPoint = pointService.getoneAndNotTask(product_area); if (ObjectUtil.isNotEmpty(inPoint)) { if (ObjectUtil.isNotEmpty(inPoint.getVehicle_code())) { // 判断载具是不是同区域