2023-08-04 2

src/main/java/com/jtem/modules/pda/query/ToolTransDetailQuery.java

@@ -1,6 +1,8 @@
 package com.jtem.modules.pda.query;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jtem.modules.pda.entity.ToolTransDetail;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -24,9 +26,11 @@ public class ToolTransDetailQuery extends ToolTransDetail {
     private String transType;
 
     private String supplierName;
-
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startDate;
-
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
 
     private String toolId;

src/main/java/com/jtem/modules/toolMan/entity/ToolCostData.java

@@ -29,7 +29,7 @@ public class ToolCostData extends QueryPage {
 	private String supplierId;
 	/** 购买日期 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date purchaseDate;
 	/** 加工中心 */
 	private String workCenterNo;
@@ -45,6 +45,30 @@ public class ToolCostData extends QueryPage {
 	private String customer;
 	/** 出资方 */
 	private String contributor;
+	/** 开始时间 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date startDate;
+	/** 结束时间 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date endDate;
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
 
 	public String getSite() {
 		return site;

src/main/java/com/jtem/modules/toolMan/entity/ToolUseQtyAssessData.java

@@ -30,14 +30,18 @@ public class ToolUseQtyAssessData extends QueryPage {
     // 创建人
     private String createBy;
     // 创建时间
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createDate;
     // 状态
     private String status;
     // 开始时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startDate;
     // 结束时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
     // 审核人
     private String checker;

src/main/resources/mapper/pda/ToolDetailMapper.xml

@@ -714,6 +714,12 @@
             <if test="query.contributor != '' and query.contributor != null">
                 AND dbo.Get_AttributeValue(td.Site, td.ToolID, 'FETYONG') like #{query.contributor}
             </if>
+            <if test="query.startDate != null">
+                AND td.PurchaseDate <![CDATA[ >= ]]> #{query.startDate}
+            </if>
+            <if test="query.endDate != null">
+                AND td.PurchaseDate <![CDATA[ <= ]]> #{query.endDate}
+            </if>
         </where>
     </select>
 </mapper>