From 1c8c9dfb7958789a31f129cc5159f3e344864861 Mon Sep 17 00:00:00 2001
From: qiankanghui <11284155+qian-kanghui@user.noreply.gitee.com>
Date: Sat, 7 Mar 2026 17:25:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(pms):=20=E6=B7=BB=E5=8A=A0=E5=B7=A5?=
=?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E7=AD=9B=E9=80=89=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 EamMapper.xml 中增加 createdStartDate 和 createdEndDate 查询条件
- 为 EamWorkOrderInData 类添加 createdStartDate 和 createdEndDate 字段
- 配置日期格式化注解以支持前端日期参数解析
- 实现 getter 和 setter 方法供查询条件使用
- 修复注释中的多余空格格式问题
---
.../modules/pms/data/EamWorkOrderInData.java | 27 ++++++++++++++++++-
src/main/resources/mapper/pms/EamMapper.xml | 19 +++++++++++++
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java
index f2a262e1..fe54444a 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java
@@ -28,6 +28,12 @@ public class EamWorkOrderInData extends EamWorkOrderData{
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date actualEndDate;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createdStartDate;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createdEndDate;
private String userId;
private String planOperatorName;
@@ -114,9 +120,11 @@ public class EamWorkOrderInData extends EamWorkOrderData{
private String reportFaultFlag; // 是否有故障图片
private String reportSparPartFlag; // 是否有备件图片
- // 查询三色灯 的 ip地址 用到
+ // 查询三色灯 的 ip 地址 用到
private String ip;
+
+
public String getIp() {
return ip;
}
@@ -404,6 +412,22 @@ public class EamWorkOrderInData extends EamWorkOrderData{
this.createdDate = createdDate;
}
+ public Date getCreatedStartDate() {
+ return createdStartDate;
+ }
+
+ public void setCreatedStartDate(Date createdStartDate) {
+ this.createdStartDate = createdStartDate;
+ }
+
+ public Date getCreatedEndDate() {
+ return createdEndDate;
+ }
+
+ public void setCreatedEndDate(Date createdEndDate) {
+ this.createdEndDate = createdEndDate;
+ }
+
public String getReachOperatorName() {
return reachOperatorName;
}
@@ -651,4 +675,5 @@ public class EamWorkOrderInData extends EamWorkOrderData{
public void setReportSparPartFlag(String reportSparPartFlag) {
this.reportSparPartFlag = reportSparPartFlag;
}
+
}
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 65b82e94..90d044cc 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -1132,6 +1132,12 @@
AND b.FeedBackDesc like '%' +#{query.feedBackDesc}+'%'
+
+ AND b.CreatedDate >= #{query.createdStartDate}
+
+
+ AND #{query.createdEndDate} >= b.CreatedDate
+
and a.FunctionType =#{query.functionType}
ORDER BY a.PlanDate,
@@ -3260,6 +3266,7 @@
a.reach_date,
b.CreatedDate,
a.handling_method,
+ a.repair_reporting_type as repairReportingType,
dbo.eam_Get_eamResourceDesc(a.Site, a.ObjectID) as resourceDesc,
CASE
WHEN (DATEDIFF(SECOND, b.CreatedDate, a.reach_date) 60) THEN DATEDIFF(SECOND, b.CreatedDate, a.reach_date) / 60.0
@@ -3325,6 +3332,9 @@
AND a.document_source = #{query.documentSource}
+
+ And a.CreatedDate >= #{query.createdDate}
+
AND a.PlanDate >= #{query.startDate}
@@ -3343,6 +3353,15 @@
AND ewi.ItemDesc like '%' + #{query.itemDesc} +'%'
+
+ AND b.CreatedDate >= #{query.createdStartDate}
+
+
+ AND #{query.createdEndDate} >= b.CreatedDate
+
+
+ AND a.repair_reporting_type like '%' + #{query.repairReportingType} + '%'
+
and a.FunctionType =#{query.functionType}