From afd79c1be92164bddf2996e4d0eac5e7d712bf64 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 19 二月 2024 16:25:24 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmpUserPlanDto.java | 36 ++++++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiEmpUserService.java | 13 +++++++++++++
2 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmpUserPlanDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpUserPlanDto.java
new file mode 100644
index 0000000..6bcf0ad
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpUserPlanDto.java
@@ -0,0 +1,36 @@
+package com.hz.his.dto.employee;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author fwq
+ * 鍛樺伐-鐢ㄦ埛寮�鍙戣鍒�
+ * */
+@Data
+public class EmpUserPlanDto extends PageDto {
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+
+ /**寮�鍙戝懆鏈熷紑濮嬫椂闂�*/
+ private String cycleStartTime;
+ /**寮�鍙戝懆鏈熺粨鏉熸椂闂�*/
+ private String cycleEndTime;
+
+ /**椤圭洰淇℃伅鎼滅储*/
+ private String projectData;
+ /**鐢ㄦ埛淇℃伅鎼滅储*/
+ private String userData;
+ /**椤鹃棶鎼滅储*/
+ private String empData;
+
+ /**鍛樺伐鏍囪瘑*/
+ private List<String> employeeIdList;
+ /**闂ㄥ簵鏍囪瘑*/
+ private List<String> shopIdList;
+ /**鏍囪瘑*/
+ private List<String> idList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiEmpUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiEmpUserService.java
index 84db793..069513a 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiEmpUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiEmpUserService.java
@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
+import com.hz.his.dto.employee.EmpUserPlanDto;
import com.hz.his.dto.report.EmployeeReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,4 +28,16 @@
Result analyseListOne(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 鏌ョ湅瀹㈡埛寮�鍙戣鍒�
+ */
+ @PostMapping("/admin/employee/user/plan/list")
+ Result employeeUserPlanList(@RequestBody EmpUserPlanDto empUserPlanDto);
+
+ /**
+ * 鏌ョ湅瑕侀�氱煡鐨勫紑鍙戣鍒掑畬鎴愬害
+ */
+ @PostMapping("/admin/employee/user/plan/list/rate")
+ Result employeeUserPlanRate(@RequestBody EmpUserPlanDto empUserPlanDto);
+
}
--
Gitblit v1.8.0