diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml
index 015eff9..4f1acbb 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml
@@ -23,8 +23,11 @@
and mse.standard_laboratory = #{request.standardLaboratory}
-
- and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = #{request.preparationDate}
+
+ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = ]]> #{request.preparationStartDate}
+
+
+ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{preparationEndDate}
@@ -53,7 +56,10 @@
WHERE 1=1 and mse.is_del != 1
and CURRENT_TIMESTAMP >= mse.remind_time
-
+
+
+
+
ORDER BY mse.remind_time DESC
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml
index 015eff9..4f1acbb 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStandardEquipmentMapper.xml
@@ -23,8 +23,11 @@
and mse.standard_laboratory = #{request.standardLaboratory}
-
- and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = #{request.preparationDate}
+
+ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = ]]> #{request.preparationStartDate}
+
+
+ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{preparationEndDate}
@@ -53,7 +56,10 @@
WHERE 1=1 and mse.is_del != 1
and CURRENT_TIMESTAMP >= mse.remind_time
-
+
+
+
+
ORDER BY mse.remind_time DESC
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java
index 04012e5..e547184 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/StandardEquipmentRequest.java
@@ -52,13 +52,19 @@
/**
* 筹建日期
*/
- @ApiModelProperty(value = "筹建日期", dataType = "String")
- private String preparationDate;
+ @ApiModelProperty(value = "筹建开始日期", dataType = "String")
+ private String preparationStartDate;
+
+ @ApiModelProperty(value = "筹建结束日期", dataType = "String")
+ private String preparationEndDate;
/**
* 到期日期
*/
- @ApiModelProperty(value = "到期日期(即有效日期,到期提醒列表)", dataType = "String")
- private String validTime;
+ @ApiModelProperty(value = "到期开始日期(即有效日期,到期提醒列表)", dataType = "String")
+ private String validStartTime;
+
+ @ApiModelProperty(value = "到期结束日期(即有效日期,到期提醒列表)", dataType = "String")
+ private String validEndTime;
}