diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
index f71f7d90..5bf64652 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
@@ -25,10 +25,35 @@ public class QcFAIRecordData extends QueryPage {
private String supplierDesc;
// 检验结果
private String inspectionResult;
- // 任务生成日期
+ // 送检日期
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date taskDate;
+
+ public Date getStartDate2() {
+ return startDate2;
+ }
+
+ public void setStartDate2(Date startDate2) {
+ this.startDate2 = startDate2;
+ }
+
+ public Date getEndDate2() {
+ return endDate2;
+ }
+
+ public void setEndDate2(Date endDate2) {
+ this.endDate2 = endDate2;
+ }
+
+ // 送检日期(最大)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date startDate2;
+ // 送检日期(最小)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date endDate2;
// 检验任务日期(最大)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index b7bdb94a..5ac9ef10 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1584,6 +1584,12 @@
AND #{query.endDate} >= inspector_date
+
+ AND task_date >= #{query.startDate2}
+
+
+ AND #{query.endDate2} >= task_date
+
ORDER BY
CASE WHEN state = '待检验' THEN 1
@@ -1896,6 +1902,12 @@
AND #{query.endDate} >= inspector_date
+
+ AND task_date >= #{query.startDate2}
+
+
+ AND #{query.endDate2} >= task_date
+
ORDER BY
CASE WHEN state = '待检验' THEN 1
@@ -2230,6 +2242,12 @@
AND #{query.endDate} >= inspector_date
+
+ AND create_date >= #{query.startDate2}
+
+
+ AND #{query.endDate2} >= create_date
+
ORDER BY
CASE WHEN state = '待检验' THEN 1
@@ -2548,6 +2566,12 @@
AND #{query.endDate} >= inspector_date
+
+ AND task_date >= #{query.startDate2}
+
+
+ AND #{query.endDate2} >= task_date
+
ORDER BY
CASE WHEN state = '待检验' THEN 1