From 9c5aaac9b17e52a334ead62790f16d6d0613b93c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 19 十二月 2025 10:57:33 +0800
Subject: [PATCH] 【丽水景宁】统计的地方没有时间的筛选条件，需要根据满意度完成时间进行筛选，例如筛选8月份的满意度调查数据
---
smartor/src/main/java/com/smartor/domain/PatSatisfaction.java | 18 +++++++++++++++++-
smartor/src/main/resources/mapper/smartor/PatSatisfactionMapper.xml | 6 ++++++
2 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatSatisfaction.java b/smartor/src/main/java/com/smartor/domain/PatSatisfaction.java
index 98149a4..cc29281 100644
--- a/smartor/src/main/java/com/smartor/domain/PatSatisfaction.java
+++ b/smartor/src/main/java/com/smartor/domain/PatSatisfaction.java
@@ -1,10 +1,13 @@
package com.smartor.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
/**
* 鎮ｈ�呮弧鎰忓害瀵硅薄 pat_satisfaction
@@ -23,7 +26,6 @@
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
private Long id;
-
/**
* $column.columnComment
*/
@@ -140,6 +142,20 @@
private String delFlag;
/**
+ * 婊℃剰搴﹀畬鎴愭椂闂�-寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "婊℃剰搴﹀畬鎴愭椂闂�-寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /**
+ * 婊℃剰搴﹀畬鎴愭椂闂�-缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value = "婊℃剰搴﹀畬鎴愭椂闂�-缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ /**
* pageNum
*/
@ApiModelProperty(value = "pageNum")
diff --git a/smartor/src/main/resources/mapper/smartor/PatSatisfactionMapper.xml b/smartor/src/main/resources/mapper/smartor/PatSatisfactionMapper.xml
index 2f08750..6619965 100644
--- a/smartor/src/main/resources/mapper/smartor/PatSatisfactionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatSatisfactionMapper.xml
@@ -108,6 +108,12 @@
<if test="orgid != null and orgid != ''">
and orgid = #{orgid}
</if>
+ <if test="startTime != null">
+ AND date_format(update_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
+ </if>
+ <if test="endTime != null">
+ AND date_format(update_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
+ </if>
</where>
</select>
--
Gitblit v1.9.3