From 4de4894edbb893064869c42751158989bf2e3ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Tue, 28 Oct 2025 10:41:08 +0800 Subject: [PATCH] 1 --- .../gaotao/modules/rollNoReview/data/SFDCRollsOutData.java | 3 +++ .../resources/mapper/shopOrder/ProductionReportMapper.xml | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java index d6d5d23..999f348 100644 --- a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java +++ b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java @@ -40,6 +40,9 @@ public class SFDCRollsOutData { @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createdDate2; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createdDate3; private Timestamp date1; private Timestamp date2; private String Reportedby; diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml index e288223..e88f98b 100644 --- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml +++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml @@ -252,7 +252,10 @@ FROM SFDC_Rolls A LEFT JOIN SFDC_MaterialHist B ON A.Site = B.SITE AND A.OrderNo = B.OrderNo AND A.RollNo = B.StartFromRollNo - CONVERT(varchar(10),a.CreatedDate,120) = #{createdDate2} + a.CreatedDate >= #{createdDate2} + + AND #{createdDate3} >= CONVERT(varchar(10), a.CreatedDate, 120) + AND A.site = #{Site}