diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
index 6732263..cacab08 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
@@ -46,8 +46,14 @@
and mfa.use_dept = #{fixedAssetRequest.useDept}
-
- and DATE_FORMAT(valid_date,'%Y-%m-%d') = #{fixedAssetRequest.validDate}
+
+
+
+
+ and mfa.valid_date = ]]> #{fixedAssetRequest.validDateStart}
+
+
+ and mfa.valid_date #{fixedAssetRequest.validDateEnd}
and mfa.ABC = #{fixedAssetRequest.abc}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
index 6732263..cacab08 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
@@ -46,8 +46,14 @@
and mfa.use_dept = #{fixedAssetRequest.useDept}
-
- and DATE_FORMAT(valid_date,'%Y-%m-%d') = #{fixedAssetRequest.validDate}
+
+
+
+
+ and mfa.valid_date = ]]> #{fixedAssetRequest.validDateStart}
+
+
+ and mfa.valid_date #{fixedAssetRequest.validDateEnd}
and mfa.ABC = #{fixedAssetRequest.abc}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FixedAssetRequest.java
index 552a6f6..da67ea4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FixedAssetRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FixedAssetRequest.java
@@ -61,8 +61,10 @@
/**
* 有效日期
*/
- @ApiModelProperty(value = "有效日期", dataType = "String")
- private String validDate;
+ @ApiModelProperty(value = "有效日期起始", dataType = "String")
+ private String validDateStart;
+ @ApiModelProperty(value = "有效日期结束", dataType = "String")
+ private String validDateEnd;
/**
* ABC 值 A,B,C
*/
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
index 6732263..cacab08 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
@@ -46,8 +46,14 @@
and mfa.use_dept = #{fixedAssetRequest.useDept}
-
- and DATE_FORMAT(valid_date,'%Y-%m-%d') = #{fixedAssetRequest.validDate}
+
+
+
+
+ and mfa.valid_date = ]]> #{fixedAssetRequest.validDateStart}
+
+
+ and mfa.valid_date #{fixedAssetRequest.validDateEnd}
and mfa.ABC = #{fixedAssetRequest.abc}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FixedAssetRequest.java
index 552a6f6..da67ea4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FixedAssetRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FixedAssetRequest.java
@@ -61,8 +61,10 @@
/**
* 有效日期
*/
- @ApiModelProperty(value = "有效日期", dataType = "String")
- private String validDate;
+ @ApiModelProperty(value = "有效日期起始", dataType = "String")
+ private String validDateStart;
+ @ApiModelProperty(value = "有效日期结束", dataType = "String")
+ private String validDateEnd;
/**
* ABC 值 A,B,C
*/
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java
index 58d29f4..12049e9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java
@@ -259,8 +259,10 @@
wrapper.like(StringUtils.isNotEmpty(request.getModelNo()), "model_no", request.getModelNo());
wrapper.eq(StringUtils.isNotEmpty(request.getEquipmentSpecifications()), "equipment_specifications", request.getEquipmentSpecifications());
wrapper.eq(request.getEquipmentCategory() != null, "equipment_category", request.getEquipmentCategory());
- wrapper.apply(StringUtils.isNotBlank(request.getValidDate()),
- "{0} = DATE_FORMAT(valid_date,'%Y-%m-%d')", request.getValidDate());
+ wrapper.apply(StringUtils.isNotBlank(request.getValidDateStart()),
+ "{0} = DATE_FORMAT(valid_date,'%Y-%m-%d %H:%i:%s')", request.getValidDateStart());
+ wrapper.apply(StringUtils.isNotBlank(request.getValidDateEnd()),
+ "{0} = DATE_FORMAT(valid_date,'%Y-%m-%d %H:%i:%s')", request.getValidDateEnd());
wrapper.eq(StringUtils.isNotEmpty(request.getManufacturingNo()), "manufacturing_no", request.getModelNo());
wrapper.eq("is_del", 0);
wrapper.orderByDesc("create_time");