From 45f0189e0dfb0dd5a34c5b406575263e78cc1f58 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 19 四月 2023 10:34:31 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 82 ++++++++++++++++++++---------------------
1 files changed, 40 insertions(+), 42 deletions(-)
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 41900cc..cf291b0 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
@@ -2,86 +2,84 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
+import com.hz.his.dto.report.UserReleaseDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
/**
- * 鍜ㄨ甯堟棩鎶ヨ〃
+ * 鍜ㄨ甯堟棩鎶�
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-shop-day")
+@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-day")
public interface BiConsultantDayService {
/**
- * 鍜ㄨ甯�-涓氱哗鎬诲垪琛�
+ * 鍜ㄨ甯�-鍚勪笟缁╂寚鏍囨暟鎹�
+ * EmployeeAchievementVo
*/
- @PostMapping("/admin/export/employee/deduction/total/list")
- Result deductionList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
+ @PostMapping("/admin/export/employee/indicators/list")
+ Result indicators(@RequestBody EmployeeReportDto employeeReportDto);
/**
- * 鍜ㄨ甯�-鎵ц涓氱哗蹇姤
- */
- @PostMapping("/admin/export/employee/deduction/detail/list")
- Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);
-
-
- /**
- * 鍜ㄨ甯�-鍒濊瘖绠�鎶�
+ * 鍜ㄨ甯�-鍒濊瘖鎯呭喌
+ * EmployeeFirstTreatVo
*/
@PostMapping("/admin/export/employee/first/treat/list")
- Result firstTreatList(@RequestBody EmployeeReportDto employeeReportDto);
-
- /**
- * 鍜ㄨ甯�-棰勭害鍒拌瘖
- */
- @PostMapping("/admin/export/employee/appointment/arrive/list")
- Result appointmentArriveList(@RequestBody EmployeeReportDto employeeReportDto);
+ Result firstTreat(@RequestBody EmployeeReportDto employeeReportDto);
/**
- * 鍜ㄨ甯�-鑰佸甫鏂扮畝鎶�
+ * 鍜ㄨ甯�-鍒拌鏈垚浜ゅ悕鍗�
+ *
*/
- @PostMapping("/admin/export/employee/old/new/list")
- Result oldLeadNew(@RequestBody EmployeeReportDto employeeReportDto);
+ @PostMapping("/admin/export/employee/first/treat/user/list")
+ Result firstTreatUser(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
- * 鍜ㄨ甯�-浼氬憳鍙樺姩鏁版嵁
+ * 鍜ㄨ甯�-鏍稿績椤圭洰鎸囨爣鏁版嵁
*/
- @PostMapping("/admin/export/employee/level/change/list")
- Result levelChangeList(@RequestBody EmployeeReportDto employeeReportDto);
+ @PostMapping("/admin/export/employee/core/project/list")
+ Result coreProject(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
- * 鍜ㄨ甯�-瀛ｅ害娲昏穬瀹㈡埛
+ * 鍜ㄨ甯�-鍏捣閲婃斁鍚嶅崟
*/
- @PostMapping("/admin/export/employee/active/user/list")
- Result activeUserList(@RequestBody EmployeeReportDto employeeReportDto);
+ @PostMapping("/admin/export/employee/user/release/list")
+ Result userReleaseList(@RequestBody UserReleaseDto userReleaseDto);
/**
- * 鍜ㄨ甯�-娴佸け瀹㈡埛
+ * 鍜ㄨ甯�-娴佸け瀹㈡埛鍒楄〃
*/
- @PostMapping("/admin/export/employee/loss/user/list")
- Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
+ @PostMapping("/admin/export/employee/user/lose/list")
+ Result userLoseList(@RequestBody UserReleaseDto userReleaseDto);
+
/**
- * 鍜ㄨ甯�-鏍稿績椤圭洰
+ * 鍜ㄨ甯�-娌夌潯瀹㈡埛鍒楄〃
*/
- @RequestMapping("/admin/export/employee/core/project/list")
- Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+ @PostMapping("/admin/export/employee/user/sleep/list")
+ Result userSleepList(@RequestBody UserReleaseDto userReleaseDto);
/**
- * 鍜ㄨ甯�-娌夌潯瀹㈡墽琛屼笟缁�
+ * 鍜ㄨ甯�-娌夌潯瀹㈡埛姣斾緥
*/
- @RequestMapping("/admin/export/employee/user/sleep/deduction/list")
- Result userSleepDeductionList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
+ @PostMapping("/admin/export/employee/user/sleep/proportion")
+ Result userSleepProportion(@RequestBody UserReleaseDto userReleaseDto);
/**
- * 鍜ㄨ甯�-鍖荤敓鎵ц鍗犳瘮鏁版嵁鍒楄〃
+ * 鍜ㄨ甯�-浼氬憳绛夌骇鍒嗗竷鍒楄〃
*/
- @RequestMapping("/admin/export/employee/user/doctor/deduction/list")
- Result userDoctorDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
+ @PostMapping("/admin/export/employee/user/member/distribution")
+ Result memberDistribution(@RequestBody UserReleaseDto userReleaseDto);
+ /**
+ * 鍜ㄨ甯�-浼氬憳绛夌骇鍒嗘瘮渚�
+ */
+ @PostMapping("/admin/export/employee/user/member/distribution/proportion")
+ Result memberDistributionProportion(@RequestBody UserReleaseDto userReleaseDto);
}
--
Gitblit v1.8.0