1

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;

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
         <where>
-             CONVERT(varchar(10),a.CreatedDate,120) = #{createdDate2}
+             a.CreatedDate >= #{createdDate2}
+            <if test=" createdDate3 != null">
+                AND #{createdDate3} >= CONVERT(varchar(10), a.CreatedDate, 120)
+            </if>
             <if test=" Site != null and Site != ''">
                 AND A.site = #{Site}
             </if>