From 3de90089345a2bb8c18114885a8d7dcd58a432ce Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期日, 16 七月 2023 19:44:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 8 ++++++++
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 4 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 7 +++++++
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index b5515d1..afef51e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -29,4 +29,8 @@
private String endTime;
/**绫诲瀷*/
private Integer type;
+ /**鏄惁鏂颁細鍛�*/
+ private Integer isNewUser;
+ /**鏄惁棣栧ぉ*/
+ private Integer isBothOne;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index ab4bd11..9a99d32 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -19,6 +19,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
@@ -271,6 +273,12 @@
Result userInfoBaseInfo(@RequestParam("userId") String userId);
/**
+ * 鑾峰彇鍒扮敤鎴�
+ */
+ @PostMapping(value = "/user/sync/by/idList")
+ Result userSyncList(@RequestParam("hisIdList") List<String> hisIdList);
+
+ /**
* 鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛�
* @param userDto userId
* @return
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 cf291b0..a5677db 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
@@ -82,4 +82,11 @@
@PostMapping("/admin/export/employee/user/member/distribution/proportion")
Result memberDistributionProportion(@RequestBody UserReleaseDto userReleaseDto);
+ /**
+ * 鍜ㄨ甯�-鑰佸甫鏂颁笟缁�
+ * 杩斿洖鎺ュ彛Result.success(data); data鏄釜map,key涓哄憳宸ユ爣璇�,value鏄噾棰�
+ */
+ @PostMapping("/admin/export/employee/oldNew/report")
+ Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);
+
}
--
Gitblit v1.8.0