From 60195676aa5964aa5338aec87afa53c1d67679b3 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 08 九月 2023 10:42:39 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java | 14 ++++++++++++++
phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 7 ++++---
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 7 +++++++
7 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
index c1cf034..34912e0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
@@ -21,7 +21,8 @@
private String startTime;
/**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅～榛樿涓�涓湀*/
private String endTime;
-
- /**鍙戦�佺殑鐢ㄦ埛-蹇呭～*/
- private List<CouponSendUserDto> sendUserList;
+ /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
+ private String costDeptName;
+ /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
+ private String ascrCostDeptName;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java
new file mode 100644
index 0000000..d6c6ca6
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.employee;
+
+import lombok.Data;
+
+/**
+ * @author fwq
+ * */
+@Data
+public class EmpAuthDto{
+ /**鏉冮檺*/
+ private String tagName;
+ /**鐧诲綍鍛樺伐*/
+ private String empRoleId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
index e324612..cf27166 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -34,6 +34,8 @@
private String userShopId;
/**閿�鍞钩鍙�*/
private String sourceName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
index bb999f1..0e6a3c8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
@@ -29,4 +29,6 @@
private String operatorId;
/** 鎿嶄綔浜� */
private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 00da1d8..6d7ad5e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -33,6 +33,8 @@
private Integer isSelectShop = 0;
/**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
private Integer isSelectInvitee = 0;
+ /**鏄惁鏌ヨ璧勯噾淇℃伅:0鍚�1鏄�*/
+ private Integer isSelectMoney = 0;
/**鏄惁鏈夐棬搴�*/
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 4e4d24a..5393a67 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
+import com.hz.his.dto.employee.EmpAuthDto;
import com.hz.his.dto.employee.EmpDocDto;
import com.hz.his.dto.TimeDto;
import com.hz.his.dto.employee.EmployeeDto;
@@ -74,4 +75,10 @@
@PostMapping(value = "/emp/detail/name")
Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);
+ @PostMapping(value = "/emp/role/get/one")
+ Result getEmployeeByRoleId(@RequestBody(required = false) EmpAuthDto empAuthDto);
+
+ @PostMapping(value = "/emp/auth/check")
+ Result empAuthCheck(@RequestBody(required = false) EmpAuthDto empAuthDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
index 9840bb7..800cd06 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
@@ -39,6 +39,8 @@
private Date startCreateTime;
/**鍒涘缓鏃ユ湡*/
private Date endCreateTime;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
/**璇锋眰鎿嶄綔浜�*/
private String operatorId;
--
Gitblit v1.8.0