From a568fd000828ee14ed732f78f47a38af28cd943c Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 10 十月 2023 10:15:46 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java                         |    2 ++
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java |   13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 6d7ad5e..fa7b371 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -43,5 +43,7 @@
     private Date startTime;
     /**缁撴潫鏃堕棿*/
     private Date endTime;
+    //鏄惁璇勪环
+    private Integer isEvaluate;
 
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
index 345aff0..b815fe0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
@@ -11,8 +11,8 @@
 import java.math.BigDecimal;
 
 /**
- * @ClassName SActivityController
- * @Description 娲诲姩瑙勫垯
+ * @ClassName SQuestionnaireService
+ * @Description 璋冩煡闂嵎鎺ㄩ�佽褰�
  * @Author Wrh
  * @Date 2022/8/8 17:36
  * @Version 1.0
@@ -29,5 +29,14 @@
     Result getSendingRecordsDetail(@RequestBody(required = false) UserDto dto);
 
 
+    /**
+     * 鑾峰彇璋冩煡闂嵎鎺ㄩ�佽褰曞垪琛�
+     * @param dto 鐢ㄦ埛鏍囪瘑
+     * @return Result
+     */
+    @PostMapping(value = "/sending/records/list")
+    Result getSendingRecordsList(@RequestBody(required = false) UserDto dto);
+
+
 
 }

--
Gitblit v1.8.0