Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542

project-order/src/main/java/com/dituhui/pea/order/common/SaasUtils.java

@@ -28,7 +28,7 @@ import java.util.Map;
 @Slf4j
 public class SaasUtils {
 
-    @Value("SaaS.ak")
+    @Value("${SaaS.ak}")
     String ak;
 
     @Value("${SaaS.url}")

project-order/src/main/java/com/dituhui/pea/order/service/impl/FendanServiceImpl.java

@@ -241,7 +241,7 @@ public class FendanServiceImpl implements FendanService {
         List<MapBlockInfoEntity> mapBlockInBlockIdsList = new ArrayList<>();
         //区划所在范围所有工作队
         for (String blockId : blockIds) {
-            List<MapBlockInfoEntity> mapBlockInfoEntities = mapBlockInfoDao.findByAreaIdsLike(blockId);
+            List<MapBlockInfoEntity> mapBlockInfoEntities = mapBlockInfoDao.findByAreaIdsLike("%" + blockId + "%");
             mapBlockInBlockIdsList.addAll(mapBlockInfoEntities);
         }
         //区划所在范围并分配到具体技能的工作队

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java

@@ -136,7 +136,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
             orderId = s.substring(s.length() - 9);
         }
         OrderInfoEntity byOrderId = orderInfoDao.getByOrderId(req.getOrderId());
-        if (ObjectUtil.isNull(byOrderId)) {
+        if (ObjectUtil.isNotNull(byOrderId)) {
             return Result.failed(StatusCodeEnum.ORDER_EXISTS);
         }
 

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java

@@ -64,7 +64,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
         lqw.in(ListUtils.isNotEmpty(reqDTO.getTeamIds()), OrderInfo::getOrgTeamId, reqDTO.getTeamIds());
         lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentType()), OrderInfo::getAppointmentMethod, reqDTO.getAppointmentType());
         lqw.in(ListUtils.isNotEmpty(reqDTO.getAppointmentStatus()), OrderInfo::getAppointmentStatus, reqDTO.getAppointmentStatus());
-
+        lqw.orderByDesc(OrderInfo::getCreateTime);
         if (ListUtils.isNotEmpty(reqDTO.getPriorities())) {
             List<Integer> p = reqDTO.getPriorities();
             if (p.contains(0) && p.contains(1)) {