diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java index 95397af9c6..a546b2d436 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java @@ -30,11 +30,11 @@ public class GridMemberDataAnalysisFromDTO { @NotBlank(message = "请选择组织类型", groups = { listGridMemberDatas4PcWork.class }) private String orgType; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyyMMdd") + @JsonFormat(pattern = "yyyyMMdd") private Date startTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyyMMdd") + @JsonFormat(pattern = "yyyyMMdd") private Date endTime; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 8da4aa41b2..60c2050f24 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -499,10 +499,10 @@ AND CREATED_BY = #{staffId} - AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) >= #{startTime} + AND DATE_FORMAT( CREATED_TIME, '%Y%m%d' ) >= #{startTime} - AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) <= #{endTime} + AND DATE_FORMAT( CREATED_TIME, '%Y%m%d' ) <= #{endTime} ORDER BY CREATED_TIME DESC