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 |   49 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatSatisfaction.java b/smartor/src/main/java/com/smartor/domain/PatSatisfaction.java
index a51537e..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;
 
 /**
  * 鎮h�呮弧鎰忓害瀵硅薄 pat_satisfaction
@@ -23,54 +26,53 @@
     @ApiModelProperty("$column.columnComment")
     //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
     private Long id;
-
     /**
      * $column.columnComment
      */
     @ApiModelProperty("鎮h�呭鍚�")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "鎮h�呭鍚�")
     private String patName;
 
     /**
      * $column.columnComment
      */
     @ApiModelProperty("鎮h�呯紪鐮�")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "鎮h�呯紪鐮�")
     private String patCode;
 
     /**
      * $column.columnComment
      */
     @ApiModelProperty("鎵嬫満鍙�")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "鎵嬫満鍙�")
     private String phone;
 
     /**
      * $column.columnComment
      */
     @ApiModelProperty("鐥呭尯鍚嶇О")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "鐥呭尯鍚嶇О")
     private String hospitaldistrictname;
 
     /**
      * $column.columnComment
      */
     @ApiModelProperty("鐥呭尯缂栫爜")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "鐥呭尯缂栫爜")
     private String hospitaldistrictcode;
 
     /**
      * $column.columnComment
      */
     @ApiModelProperty("閮ㄩ棬鍚嶇О")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "閮ㄩ棬鍚嶇О")
     private String deptname;
 
     /**
      * 閮ㄩ棬缂栫爜
      */
     @ApiModelProperty("閮ㄩ棬缂栫爜")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "閮ㄩ棬缂栫爜")
     private String deptcode;
 
     /**
@@ -126,10 +128,11 @@
      * $column.columnComment
      */
     @ApiModelProperty("鎶ゅ+婊℃剰搴�")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "鎶ゅ+婊℃剰搴�")
     private double nurseSatisfaction;
 
     @ApiModelProperty("鎬诲垎")
+    @Excel(name = "鎬诲垎")
     private double total;
 
     /**
@@ -138,5 +141,33 @@
     @ApiModelProperty("鍒犻櫎")
     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")
+    @Excel(name = "pageNum")
+    private Integer pageNum;
+
+    /**
+     * pageSize
+     */
+    @ApiModelProperty(value = "pageSize")
+    @Excel(name = "pageSize")
+    private Integer pageSize;
+
 }
 

--
Gitblit v1.9.3