From 7bd47aa9378d93c86cd40a9448fb58d1b640abc5 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 04 九月 2023 14:45:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 6 ++++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
index 5ba8886..913d936 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -154,6 +154,8 @@
private String opId;
//淇敼鎿嶄綔鐨勫娉�
private String note;
+ /** 鎬у埆0鏈煡1鐢�2濂� */
+ private Integer gender;
public UserParamDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
index 0380043..0efd929 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
@@ -94,4 +94,10 @@
@PostMapping("/admin/export/employee/cycle/week/list")
Result cycleWeekList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 鍜ㄨ甯�-棰勭害鍛ㄦ湡鎶ヨ〃-瀵煎嚭
+ */
+ @PostMapping("/admin/export/employee/cycle/week/list/export")
+ Result cycleWeekListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
}
--
Gitblit v1.8.0