diff --git a/src/main/java/com/jtem/modules/pda/query/ToolTransDetailQuery.java b/src/main/java/com/jtem/modules/pda/query/ToolTransDetailQuery.java index 98704be..2f0f243 100644 --- a/src/main/java/com/jtem/modules/pda/query/ToolTransDetailQuery.java +++ b/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; diff --git a/src/main/java/com/jtem/modules/toolMan/entity/ToolCostData.java b/src/main/java/com/jtem/modules/toolMan/entity/ToolCostData.java index d7a6540..119e17b 100644 --- a/src/main/java/com/jtem/modules/toolMan/entity/ToolCostData.java +++ b/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; diff --git a/src/main/java/com/jtem/modules/toolMan/entity/ToolUseQtyAssessData.java b/src/main/java/com/jtem/modules/toolMan/entity/ToolUseQtyAssessData.java index bbdc77a..136c0fb 100644 --- a/src/main/java/com/jtem/modules/toolMan/entity/ToolUseQtyAssessData.java +++ b/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; diff --git a/src/main/resources/mapper/pda/ToolDetailMapper.xml b/src/main/resources/mapper/pda/ToolDetailMapper.xml index d643987..9f2d527 100644 --- a/src/main/resources/mapper/pda/ToolDetailMapper.xml +++ b/src/main/resources/mapper/pda/ToolDetailMapper.xml @@ -714,6 +714,12 @@ AND dbo.Get_AttributeValue(td.Site, td.ToolID, 'FETYONG') like #{query.contributor} + + AND td.PurchaseDate = ]]> #{query.startDate} + + + AND td.PurchaseDate #{query.endDate} +