From 67f2d8fb6220ce4a2fe639b2c6176414c3ef8779 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 29 八月 2024 17:56:16 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index 7c3a3f9..6952f60 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -136,4 +136,22 @@
     @PostMapping("/admin/consultant/report/relation/project/list")
     Result relationProjectList(@RequestBody EmployeeReportDto employeeReportDto);
 
+    /**
+     * 棰勭害杩熷埌鏁版嵁
+     */
+    @PostMapping("/admin/consultant/report/appointment/arrive/late/detail/list")
+    Result appointmentArriveLateList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     *   椤鹃棶-鍚嶄笅浼氬憳+鍏捣閲婃斁浼氬憳鏈墽琛屾暟鎹�
+     */
+    @PostMapping("/admin/consultant/report/user/data/deduction/list")
+    Result userDataDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     *  椤鹃棶-鍚嶄笅浼氬憳+鍏捣閲婃斁浼氬憳鏈墽琛屾暟鎹�-瀵煎嚭
+     */
+    @PostMapping("/admin/consultant/report/user/data/deduction/list/export")
+    Result userDataDeductionExport(@RequestBody EmployeeReportDto employeeReportDto);
+
 }

--
Gitblit v1.8.0