From 2c2719974474120eceb9771b8dd0820b22ae97b6 Mon Sep 17 00:00:00 2001 From: YXY <932687738@qq.com> Date: Tue, 15 Aug 2023 23:13:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=85=E6=8D=B7=E9=80=9A=20=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=B1=BB=E5=9E=8B=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/utils/DateUtils.java | 17 ++++++++++------ .../task/CJT/CJTCreateLarkTableJob.java | 20 +++++++++---------- .../task/CJT/ManufactureOrderSyncJob.java | 5 +++-- .../task/CJT/PurchaseArrivalOpenSyncJob.java | 2 +- .../quartz/task/CJT/PurchaseOrderSyncJob.java | 5 +++-- .../quartz/task/CJT/SaleDeliverySyncJob.java | 4 ++-- .../quartz/task/CJT/SaleDispatchSyncJob.java | 2 +- .../quartz/task/CJT/SaleOrderSyncJob.java | 4 ++-- 8 files changed, 33 insertions(+), 26 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java index 13e3cd3..dfa232c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java @@ -3,10 +3,7 @@ package com.ruoyi.common.utils; import java.lang.management.ManagementFactory; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZoneOffset; +import java.time.*; import java.time.format.DateTimeFormatter; import java.util.Date; @@ -23,7 +20,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { public static String YYYY_MM = "yyyy-MM"; public static String YYYY_MM_DD = "yyyy-MM-dd"; + public static String YYYYMMDD_SECOND = "yyyy/MM/dd"; public static String YYYY_MM_DD_SECOND = "yyyy/MM/dd HH:mm"; + public static String YYYY_MM_DD_HH_MM_SS_SECOND = "yyyy/MM/dd HH:mm:ss"; + public static String YYYY_MM_DD_HH_MM_SS_THIRD = "yyyy/M/dd HH:mm:ss"; + public static String YYYY_MM_DD_HH_MM_SS_FOUR = "yyyy/M/d H:mm:ss"; public static String YYYYMM = "yyyyMM"; public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; @@ -146,8 +147,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { } public static LocalDateTime str2ldt(String time, String pattern) { - DateTimeFormatter fmt = DateTimeFormatter.ofPattern(pattern); - return LocalDateTime.parse(time,fmt); + if (YYYYMMDD_SECOND.equals(pattern)){ + return LocalDate.parse(time, DateTimeFormatter.ofPattern(pattern)).atStartOfDay(); + }else { + DateTimeFormatter fmt = DateTimeFormatter.ofPattern(pattern); + return LocalDateTime.parse(time, fmt); + } } public static LocalDateTime long2ldt(long time) { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/CJTCreateLarkTableJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/CJTCreateLarkTableJob.java index a074752..31f7df4 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/CJTCreateLarkTableJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/CJTCreateLarkTableJob.java @@ -105,11 +105,11 @@ public class CJTCreateLarkTableJob{ switch (appType){ case SYNC_CJT_MANUFACTURE_ORDER_DATA_TO_MULTI_TABLE: return new AppTableCreateHeader[]{ - buildHeader("单据日期", AppTableCreateHeaderTypeEnum.TEXT), + buildPropertyHeader("单据日期", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYYMMDD_SECOND)), buildHeader("存货编码", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("存货", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("钢板面", AppTableCreateHeaderTypeEnum.TEXT), - buildHeader("创建时间", AppTableCreateHeaderTypeEnum.TEXT), + buildPropertyHeader("创建时间", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYY_MM_DD_SECOND)), buildHeader("生产车间", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("负责人", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("产品编码", AppTableCreateHeaderTypeEnum.TEXT), @@ -129,7 +129,7 @@ public class CJTCreateLarkTableJob{ buildHeader("规格型号", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("采购单位", AppTableCreateHeaderTypeEnum.TEXT), buildPropertyHeader("数量", AppTableCreateHeaderTypeEnum.NUMBER,buildProperty("0")), - buildHeader("单据日期", AppTableCreateHeaderTypeEnum.TEXT), + buildPropertyHeader("单据日期", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYYMMDD_SECOND)), buildPropertyHeader("创建时间", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYY_MM_DD_SECOND)), buildHeader("单据编号", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("供应商", AppTableCreateHeaderTypeEnum.TEXT), @@ -140,7 +140,7 @@ public class CJTCreateLarkTableJob{ }; case SYNC_CJT_PURCHASE_ORDER_DATA_TO_MULTI_TABLE: return new AppTableCreateHeader[]{ - buildHeader("单据日期", AppTableCreateHeaderTypeEnum.TEXT), + buildPropertyHeader("单据日期", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYYMMDD_SECOND)), buildHeader("单据编号", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("供应商", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("存货编码", AppTableCreateHeaderTypeEnum.TEXT), @@ -148,7 +148,7 @@ public class CJTCreateLarkTableJob{ buildHeader("规格型号", AppTableCreateHeaderTypeEnum.TEXT), buildPropertyHeader("数量", AppTableCreateHeaderTypeEnum.NUMBER,buildProperty("0")), buildHeader("采购单位", AppTableCreateHeaderTypeEnum.TEXT), - buildHeader("预计到货日期", AppTableCreateHeaderTypeEnum.TEXT), + buildPropertyHeader("预计到货日期", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYYMMDD_SECOND)), buildHeader("销售订单号", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("明细备注", AppTableCreateHeaderTypeEnum.TEXT) }; @@ -158,8 +158,8 @@ public class CJTCreateLarkTableJob{ buildHeader("客户", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("业务类型", AppTableCreateHeaderTypeEnum.TEXT), buildPropertyHeader("创建时间", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYY_MM_DD_SECOND)), - buildHeader("审核时间", AppTableCreateHeaderTypeEnum.TEXT), - buildHeader("单据日期", AppTableCreateHeaderTypeEnum.TEXT), + buildPropertyHeader("审核时间", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYYMMDD_SECOND)), + buildPropertyHeader("单据日期", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYYMMDD_SECOND)), buildHeader("销售订单号", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("存货编码", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("存货", AppTableCreateHeaderTypeEnum.TEXT), @@ -173,11 +173,11 @@ public class CJTCreateLarkTableJob{ }; case SYNC_CJT_SALE_ORDER_DATA_TO_MULTI_TABLE: return new AppTableCreateHeader[]{ - buildHeader("单据日期", AppTableCreateHeaderTypeEnum.TEXT), + buildPropertyHeader("单据日期", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYYMMDD_SECOND)), buildHeader("编号", AppTableCreateHeaderTypeEnum.TEXT), buildPropertyHeader("生单时间", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYY_MM_DD_SECOND)), buildHeader("客户", AppTableCreateHeaderTypeEnum.TEXT), - buildHeader("审核日期", AppTableCreateHeaderTypeEnum.TEXT), + buildPropertyHeader("审核日期", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYYMMDD_SECOND)), buildHeader("单据状态", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("存货编码", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("存货", AppTableCreateHeaderTypeEnum.TEXT), @@ -193,7 +193,7 @@ public class CJTCreateLarkTableJob{ case SYNC_CJT_SALE_DISPATCH_DATA_TO_MULTI_TABLE: return new AppTableCreateHeader[]{ buildHeader("来源单号", AppTableCreateHeaderTypeEnum.TEXT), - buildHeader("单据日期", AppTableCreateHeaderTypeEnum.TEXT), + buildPropertyHeader("单据日期", AppTableCreateHeaderTypeEnum.DATETIME,buildProperty(DateUtils.YYYYMMDD_SECOND)), buildHeader("单据编号", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("客户", AppTableCreateHeaderTypeEnum.TEXT), buildHeader("客户编码", AppTableCreateHeaderTypeEnum.TEXT), diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/ManufactureOrderSyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/ManufactureOrderSyncJob.java index 309d73a..8631b63 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/ManufactureOrderSyncJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/ManufactureOrderSyncJob.java @@ -4,6 +4,7 @@ import com.ruoyi.common.enums.AppType; import com.ruoyi.common.enums.CjtAccountEnum; import com.ruoyi.common.enums.TableFieldTypeEnum; import com.ruoyi.common.enums.TableRelationTypeEnum; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.quartz.domain.CJTSyncTypeRelation; import org.apache.commons.collections4.map.CaseInsensitiveMap; import org.springframework.stereotype.Component; @@ -75,10 +76,10 @@ public class ManufactureOrderSyncJob extends SyncAccountsJobAbstract { @Override protected Map getQueryFieldsMap(String cjt) { Map map = new CaseInsensitiveMap<>(); - map.put("VoucherDate", new CJTSyncTypeRelation("单据日期")); + map.put("VoucherDate", new CJTSyncTypeRelation("单据日期",TableFieldTypeEnum.DATE, DateUtils.YYYYMMDD_SECOND)); map.put("manufactureorderdetails_sourcevouchercode", new CJTSyncTypeRelation("来源单号")); map.put("Code", new CJTSyncTypeRelation("单据编码")); - map.put("CreatedTime", new CJTSyncTypeRelation("创建时间")); + map.put("CreatedTime", new CJTSyncTypeRelation("创建时间",TableFieldTypeEnum.DATE, DateUtils.YYYY_MM_DD_HH_MM_SS_THIRD)); map.put("Department_Name", new CJTSyncTypeRelation("生产车间")); map.put("person_name", new CJTSyncTypeRelation("负责人")); map.put("ManufactureOrderDetails_Inventory_Code", new CJTSyncTypeRelation("产品编码")); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseArrivalOpenSyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseArrivalOpenSyncJob.java index 560504a..6dcc9ea 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseArrivalOpenSyncJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseArrivalOpenSyncJob.java @@ -78,7 +78,7 @@ public class PurchaseArrivalOpenSyncJob extends SyncAccountsJobAbstract{ map.put("Details_Inventory_Specification",new CJTSyncTypeRelation("规格型号")); map.put("Details_Unit_Name",new CJTSyncTypeRelation("采购单位")); map.put("Details_Quantity",new CJTSyncTypeRelation("数量", TableFieldTypeEnum.NUMBER)); - map.put("VoucherDate",new CJTSyncTypeRelation("单据日期")); + map.put("VoucherDate",new CJTSyncTypeRelation("单据日期",TableFieldTypeEnum.DATE, DateUtils.YYYYMMDD_SECOND)); map.put("createdtime",new CJTSyncTypeRelation("创建时间",TableFieldTypeEnum.DATE, DateUtils.YYYY_MM_DD_HH_MM_SS)); map.put("Code",new CJTSyncTypeRelation("单据编号")); map.put("Partner_Name",new CJTSyncTypeRelation("供应商")); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseOrderSyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseOrderSyncJob.java index d3fbb51..8d7e24f 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseOrderSyncJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/PurchaseOrderSyncJob.java @@ -3,6 +3,7 @@ package com.ruoyi.quartz.task.CJT; import com.ruoyi.common.enums.AppType; import com.ruoyi.common.enums.TableFieldTypeEnum; import com.ruoyi.common.enums.TableRelationTypeEnum; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.quartz.domain.CJTSyncTypeRelation; import org.apache.commons.collections4.map.CaseInsensitiveMap; import org.springframework.stereotype.Component; @@ -68,7 +69,7 @@ public class PurchaseOrderSyncJob extends SyncAccountsJobAbstract{ @Override protected Map getQueryFieldsMap(String cjt) { Map map = new CaseInsensitiveMap<>(); - map.put("voucherdate",new CJTSyncTypeRelation("单据日期")); + map.put("voucherdate",new CJTSyncTypeRelation("单据日期",TableFieldTypeEnum.DATE, DateUtils.YYYYMMDD_SECOND)); map.put("code",new CJTSyncTypeRelation("单据编号")); map.put("Partner_Name",new CJTSyncTypeRelation("供应商")); map.put("PurchaseOrderDetails_Inventory_Code",new CJTSyncTypeRelation("存货编码")); @@ -76,7 +77,7 @@ public class PurchaseOrderSyncJob extends SyncAccountsJobAbstract{ map.put("PurchaseOrderDetails_Inventory_Specification",new CJTSyncTypeRelation("规格型号")); map.put("PurchaseOrderDetails_Quantity",new CJTSyncTypeRelation("数量", TableFieldTypeEnum.NUMBER)); map.put("PurchaseOrderDetails_Unit_Name",new CJTSyncTypeRelation("采购单位")); - map.put("PurchaseOrderDetails_AcceptDate",new CJTSyncTypeRelation("预计到货日期")); + map.put("PurchaseOrderDetails_AcceptDate",new CJTSyncTypeRelation("预计到货日期",TableFieldTypeEnum.DATE, DateUtils.YYYY_MM_DD_HH_MM_SS_FOUR)); map.put("PurchaseOrderDetails_SaleOrderCode",new CJTSyncTypeRelation("销售订单号")); map.put("PurchaseOrderDetails_DetailMemo",new CJTSyncTypeRelation("明细备注")); return map; diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDeliverySyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDeliverySyncJob.java index 6d7ec33..95244dc 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDeliverySyncJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDeliverySyncJob.java @@ -82,8 +82,8 @@ public class SaleDeliverySyncJob extends SyncAccountsJobAbstract { map.put("customer_name", new CJTSyncTypeRelation("客户")); map.put("BusinessType_Name", new CJTSyncTypeRelation("业务类型")); map.put("CreatedTime", new CJTSyncTypeRelation("创建时间", TableFieldTypeEnum.DATE, DateUtils.YYYY_MM_DD_HH_MM_SS)); - map.put("auditeddate", new CJTSyncTypeRelation("审核时间")); - map.put("voucherdate", new CJTSyncTypeRelation("单据日期")); + map.put("auditeddate", new CJTSyncTypeRelation("审核时间", TableFieldTypeEnum.DATE, DateUtils.YYYYMMDD_SECOND)); + map.put("voucherdate", new CJTSyncTypeRelation("单据日期", TableFieldTypeEnum.DATE, DateUtils.YYYYMMDD_SECOND)); map.put("saledeliverydetails_saleordercode", new CJTSyncTypeRelation("销售订单号")); map.put("SaleDeliveryDetails_Inventory_Code", new CJTSyncTypeRelation("存货编码")); map.put("SaleDeliveryDetails_Inventory_Name", new CJTSyncTypeRelation("存货")); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDispatchSyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDispatchSyncJob.java index e435dec..2ca6ae4 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDispatchSyncJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleDispatchSyncJob.java @@ -81,7 +81,7 @@ public class SaleDispatchSyncJob extends SyncAccountsJobAbstract{ protected Map getQueryFieldsMap(String cjt) { Map map = new CaseInsensitiveMap<>(); map.put("rdrecorddetails_sourcevouchercode",new CJTSyncTypeRelation("来源单号")); - map.put("VoucherDate",new CJTSyncTypeRelation("单据日期")); + map.put("VoucherDate",new CJTSyncTypeRelation("单据日期", TableFieldTypeEnum.DATE, DateUtils.YYYYMMDD_SECOND)); map.put("Code",new CJTSyncTypeRelation("单据编号")); map.put("Partner_Name",new CJTSyncTypeRelation("客户")); map.put("Partner_Code",new CJTSyncTypeRelation("客户编码")); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleOrderSyncJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleOrderSyncJob.java index 71c0006..75b5e2c 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleOrderSyncJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SaleOrderSyncJob.java @@ -78,11 +78,11 @@ public class SaleOrderSyncJob extends SyncAccountsJobAbstract{ @Override protected Map getQueryFieldsMap(String cjt) { Map map = new CaseInsensitiveMap<>(); - map.put("voucherdate",new CJTSyncTypeRelation("单据日期")); + map.put("voucherdate",new CJTSyncTypeRelation("单据日期", TableFieldTypeEnum.DATE, DateUtils.YYYYMMDD_SECOND)); map.put("code",new CJTSyncTypeRelation("编号")); map.put("createdtime",new CJTSyncTypeRelation("生单时间",TableFieldTypeEnum.DATE, DateUtils.YYYY_MM_DD_HH_MM_SS)); map.put("customer_name",new CJTSyncTypeRelation("客户")); - map.put("auditeddate",new CJTSyncTypeRelation("审核日期")); + map.put("auditeddate",new CJTSyncTypeRelation("审核日期", TableFieldTypeEnum.DATE, DateUtils.YYYYMMDD_SECOND)); map.put("voucherstate_name",new CJTSyncTypeRelation("单据状态")); map.put("SaleOrderDetails_Inventory_Code",new CJTSyncTypeRelation("存货编码")); map.put("SaleOrderDetails_Inventory_Name",new CJTSyncTypeRelation("存货"));