From 9272eaf564ecc2631488bbe071160daf5a861109 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 4 Aug 2022 09:27:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=97=B6=E9=97=B4=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/info/SyncUploadDataSetEntity.java | 3 ++ .../api/admin/thread/OrderSubmitTask.java | 16 +++++++++- .../mapper/info/SyncUploadDataSetDao.xml | 4 +-- .../com/glxp/api/admin/util/NormalTest.java | 29 +++++++++++++++---- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java index cd8ec85e..1670d3ef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java @@ -23,5 +23,8 @@ public class SyncUploadDataSetEntity { private boolean checkChange; private boolean checkSp; private boolean checkBalacne; + + private String orderStartTime; + private List busTypes; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java index facaf68d..db291f27 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.thread; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.ConstantStatus; @@ -118,7 +119,20 @@ public class OrderSubmitTask implements SchedulingConfigurer { StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderId); OrderEntity orderEntity = orderService.findById(stockOrderEntity.getOrderIdFk()); - + if (StrUtil.isNotEmpty(syncUploadDataSetEntity.getOrderStartTime())) { + if (orderEntity.getActDate().length() > 10) { + String resultDate = orderEntity.getActDate().substring(0, 10); + if (syncUploadDataSetEntity.getOrderStartTime().compareTo(resultDate) > 0) { + continue; + } + } else if (orderEntity.getActDate().length() == 10) { + if (syncUploadDataSetEntity.getOrderStartTime().compareTo(orderEntity.getActDate()) > 0) { + continue; + } + } + } else { + continue; + } if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) { orderEntity.setFromType(orderEntity.getOriginFromType()); } diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml index b640de60..faa32d08 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml @@ -15,7 +15,7 @@ replace INTO thr_order_upload(id,autoUpload, orderSyncTime,orderUnCheck,orderUnReceive, orderScanFinish, checkUdims, checkPdaEd, checkPdaUn, checkPc, - checkWebNew, checkChange, checkSp,checkBalacne) + checkWebNew, checkChange, checkSp,checkBalacne,orderStartTime) values ( #{id}, #{autoUpload}, @@ -30,7 +30,7 @@ #{checkWebNew}, #{checkChange}, #{checkSp}, - #{checkBalacne} + #{checkBalacne},#{orderStartTime} ) diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java index b07b5ade..3807ec05 100644 --- a/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java +++ b/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java @@ -5,13 +5,15 @@ import com.glxp.api.BaseApiAdminApplicationTest; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; +import org.springframework.boot.test.context.SpringBootTest; import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -public class NormalTest extends BaseApiAdminApplicationTest { +public class NormalTest extends BaseApiAdminApplicationTest { private static final Logger log = LoggerFactory.getLogger(NormalTest.class); @Test @@ -30,7 +32,6 @@ public class NormalTest extends BaseApiAdminApplicationTest { } - public static long getStartTime(String startTime) { final SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss"); final Date datetime;//将你的日期转换为时间戳 @@ -48,12 +49,28 @@ public class NormalTest extends BaseApiAdminApplicationTest { return 0; } - @Test - public void testTime(){ - log.info(getStartTime("17:30:01")+""); - } + @AutoConfigureWebTestClient + public void testTime() { +// log.info(getStartTime("17:30:01")+""); + + String data = "2022-07-15"; + String setTime = "2022-09-26"; + + if (data.length() > 10) { + String resultDate = data.substring(0, 10); + log.info("1=" + resultDate); + if (setTime.compareTo(resultDate) > 0) { + log.info(">1" + resultDate); + } + } else if (data.length() == 10) { + if (setTime.compareTo(data) > 0) { + log.info(">2" + data); + } + } + + } }