diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMissStatistics.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMissStatistics.java index 4c2217fc3..7bb4d6195 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMissStatistics.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMissStatistics.java @@ -1,7 +1,6 @@ package com.xdadan.erp.emis.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; import com.xdadan.erp.common.core.domain.BaseEntity; import lombok.Data; @@ -29,13 +28,9 @@ public class EmisTmsSiteBatchMissStatistics extends BaseEntity { /** 票数 */ private Integer ticketCount; - /** 开始时间(含) */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date startTime; + /** 开始月份(含),格式:yyyy-MM */ + private String startTime; - /** 结束时间(含) */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date endTime; + /** 结束月份(含),格式:yyyy-MM */ + private String endTime; } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissStatisticsMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissStatisticsMapper.xml index 309172a60..c2be17cd6 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissStatisticsMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissStatisticsMapper.xml @@ -24,13 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bm.start_site_code = #{startSiteCode} - - AND w.send_date = ]]> #{startTime} + + AND DATE_FORMAT(w.send_date, '%Y-%m') = ]]> #{startTime} - - AND w.send_date #{endTime} + + AND DATE_FORMAT(w.send_date, '%Y-%m') #{endTime} - + AND DATE_FORMAT(w.send_date, '%Y-%m') = DATE_FORMAT(#{billMonth}, '%Y-%m') @@ -76,13 +76,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND m.start_site_code = #{startSiteCode} - - AND w.send_date = ]]> #{startTime} + + AND DATE_FORMAT(w.send_date, '%Y-%m') = ]]> #{startTime} - - AND w.send_date #{endTime} + + AND DATE_FORMAT(w.send_date, '%Y-%m') #{endTime} - + AND DATE_FORMAT(w.send_date, '%Y-%m') = DATE_FORMAT(#{billMonth}, '%Y-%m') @@ -128,13 +128,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND m.start_site_code = #{query.startSiteCode} - - AND w.send_date = ]]> #{query.startTime} + + AND DATE_FORMAT(w.send_date, '%Y-%m') = ]]> #{query.startTime} - - AND w.send_date #{query.endTime} + + AND DATE_FORMAT(w.send_date, '%Y-%m') #{query.endTime} - + AND DATE_FORMAT(w.send_date, '%Y-%m') = DATE_FORMAT(#{query.billMonth}, '%Y-%m') @@ -152,13 +152,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND m.start_site_code = #{startSiteCode} - - AND w.send_date = ]]> #{startTime} + + AND DATE_FORMAT(w.send_date, '%Y-%m') = ]]> #{startTime} - - AND w.send_date #{endTime} + + AND DATE_FORMAT(w.send_date, '%Y-%m') #{endTime} - + AND DATE_FORMAT(w.send_date, '%Y-%m') = DATE_FORMAT(#{billMonth}, '%Y-%m')