From 02266528f0eb6c751200c90768582d68d7fe1acb Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sun, 28 Sep 2025 17:20:38 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
=?UTF-8?q?=E8=BF=90=E8=BE=93=E7=AE=A1=E7=90=86=20-=20=E6=BC=8F=E7=BB=84?=
=?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=BB=9F=E8=AE=A1=20-=20=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E7=BB=9F=E8=AE=A1=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E3=80=81=E5=AF=BC=E5=87=BA=E6=BC=8F=E7=BB=84=E8=AF=A6?=
=?UTF-8?q?=E7=BB=86=E6=95=B0=E6=8D=AE=E3=80=81=E5=AF=BC=E5=87=BA=E6=BC=8F?=
=?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E6=94=AF=E6=8C=81=E6=A0=B9?=
=?UTF-8?q?=E6=8D=AE=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?/=E5=AF=BC=E5=87=BA=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
=?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?=
=?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=94=B6=E6=AC=BE=E9=92=88=E5=AF=B9=E7=9B=B8?=
=?UTF-8?q?=E5=90=8C=E8=B4=A6=E5=8D=95=E4=B8=8D=E5=90=8C=E5=8F=91=E7=A5=A8?=
=?UTF-8?q?=E5=90=88=E5=B9=B6=E6=94=B6=E6=AC=BE=E7=89=B9=E6=AE=8A=E9=80=BB?=
=?UTF-8?q?=E8=BE=91=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
committer: heyu
---
.../EmisTmsSiteBatchMissStatistics.java | 13 ++----
.../EmisTmsSiteBatchMissStatisticsMapper.xml | 40 +++++++++----------
2 files changed, 24 insertions(+), 29 deletions(-)
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')