From b492f36e34ac11e4579bdbc0303ddd06004b1682 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 14 四月 2023 16:55:48 +0800
Subject: [PATCH] 员工日报表
---
phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java | 25 ++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 82 +++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 25 ++++----
3 files changed, 119 insertions(+), 13 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
new file mode 100644
index 0000000..8090bbb
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
@@ -0,0 +1,25 @@
+package com.hz.his.dto.report;
+
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍜ㄨ甯堟姤琛ㄦ墿灞�
+ * @author fwq
+ * */
+@Data
+public class UserReleaseDto extends PageDto {
+ /**鍛樺伐鏍囪瘑*/
+ private String employeeId;
+ /**褰撳墠鏃堕棿*/
+ private String nowTime;
+ /**椤堕儴鍜ㄨ甯堝垪琛�*/
+ private List<String> topEmployeeIdList;
+ /**鍜ㄨ甯堝垪琛�*/
+ private List<String> employeeIdList;
+ /**绛夌骇鍒楄〃*/
+ private List<String> memberLevelList;
+}
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
new file mode 100644
index 0000000..c643bd3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
@@ -0,0 +1,82 @@
+package com.hz.his.feign.service.platform.bi;
+
+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;
+
+
+/**
+ * 鍜ㄨ甯堟棩琛�
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-day")
+public interface BiConsultantDayService {
+
+ /**
+ * 鍜ㄨ甯�-鍚勪笟缁╂寚鏍囨暟鎹�
+ */
+ @PostMapping("/admin/export/employee/indicators/list")
+ Result indicators(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-鍒濊瘖鎯呭喌
+ */
+ @PostMapping("/admin/export/employee/first/treat/list")
+ Result firstTreat(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鍜ㄨ甯�-鍒拌鏈垚浜ゅ悕鍗�
+ */
+ @PostMapping("/admin/export/employee/first/treat/user/list")
+ Result firstTreatUser(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鍜ㄨ甯�-鏍稿績椤圭洰鎸囨爣鏁版嵁
+ */
+ @PostMapping("/admin/export/employee/core/project/list")
+ Result coreProject(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鍜ㄨ甯�-鍏捣閲婃斁鍚嶅崟
+ */
+ @PostMapping("/admin/export/employee/user/release/list")
+ Result userReleaseList(@RequestBody UserReleaseDto userReleaseDto);
+
+ /**
+ * 鍜ㄨ甯�-娴佸け瀹㈡埛鍒楄〃
+ */
+ @PostMapping("/admin/export/employee/user/lose/list")
+ Result userLoseList(@RequestBody UserReleaseDto userReleaseDto);
+
+
+ /**
+ * 鍜ㄨ甯�-娌夌潯瀹㈡埛鍒楄〃
+ */
+ @PostMapping("/admin/export/employee/user/sleep/list")
+ Result userSleepList(@RequestBody UserReleaseDto userReleaseDto);
+
+ /**
+ * 鍜ㄨ甯�-娌夌潯瀹㈡埛姣斾緥
+ */
+ @PostMapping("/admin/export/employee/user/sleep/proportion")
+ Result userSleepProportion(@RequestBody UserReleaseDto userReleaseDto);
+
+ /**
+ * 鍜ㄨ甯�-浼氬憳绛夌骇鍒嗗竷鍒楄〃
+ */
+ @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);
+
+}
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 957fe39..ef01088 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
@@ -5,82 +5,81 @@
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-sale")
public interface BiConsultantSaleService {
/**
* 鍜ㄨ甯�-涓氱哗鎬诲垪琛�
*/
- @PostMapping("/admin/export/employee/deduction/total/list")
+ @PostMapping("/admin/consultant/report/deduction/total/list")
Result deductionList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-鎵ц涓氱哗蹇姤
*/
- @PostMapping("/admin/export/employee/deduction/detail/list")
+ @PostMapping("/admin/consultant/report/deduction/detail/list")
Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-鍒濊瘖绠�鎶�
*/
- @PostMapping("/admin/export/employee/first/treat/list")
+ @PostMapping("/admin/consultant/report/first/treat/list")
Result firstTreatList(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-棰勭害鍒拌瘖
*/
- @PostMapping("/admin/export/employee/appointment/arrive/list")
+ @PostMapping("/admin/consultant/report/appointment/arrive/list")
Result appointmentArriveList(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-鑰佸甫鏂扮畝鎶�
*/
- @PostMapping("/admin/export/employee/old/new/list")
+ @PostMapping("/admin/consultant/report/old/new/list")
Result oldLeadNew(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-浼氬憳鍙樺姩鏁版嵁
*/
- @PostMapping("/admin/export/employee/level/change/list")
+ @PostMapping("/admin/consultant/report/level/change/list")
Result levelChangeList(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-瀛ｅ害娲昏穬瀹㈡埛
*/
- @PostMapping("/admin/export/employee/active/user/list")
+ @PostMapping("/admin/consultant/report/active/user/list")
Result activeUserList(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-娴佸け瀹㈡埛
*/
- @PostMapping("/admin/export/employee/loss/user/list")
+ @PostMapping("/admin/consultant/report/loss/user/list")
Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-鏍稿績椤圭洰
*/
- @RequestMapping("/admin/export/employee/core/project/list")
+ @PostMapping("/admin/consultant/report/core/project/list")
Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-娌夌潯瀹㈡墽琛屼笟缁�
*/
- @RequestMapping("/admin/export/employee/user/sleep/deduction/list")
+ @PostMapping("/admin/consultant/report/user/sleep/deduction/list")
Result userSleepDeductionList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-鍖荤敓鎵ц鍗犳瘮鏁版嵁鍒楄〃
*/
- @RequestMapping("/admin/export/employee/user/doctor/deduction/list")
+ @PostMapping("/admin/consultant/report/user/doctor/deduction/list")
Result userDoctorDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
--
Gitblit v1.8.0