From f7540c77c4598dcc0407d2ab56ef617b829fc47e Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 08 九月 2023 10:27:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into rx-0907-优惠券成本归属
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java | 14 ++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 3 ---
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 4 ++--
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 7 +++++++
4 files changed, 23 insertions(+), 5 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 8c3f597..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
@@ -25,7 +25,4 @@
private String costDeptName;
/**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
private String ascrCostDeptName;
-
- /**鍙戦�佺殑鐢ㄦ埛-蹇呭～*/
- private List<CouponSendUserDto> sendUserList;
}
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/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 3768939..64e4d71 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
@@ -1,7 +1,5 @@
package com.hz.his.dto.user;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -35,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);
+
}
--
Gitblit v1.8.0