From 07e60bfa19de8bc7231b272872c5ba3fdf5fd82f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 03 一月 2024 16:11:24 +0800
Subject: [PATCH] Merge branch 'master-fwq组织架构优化' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrganizationDeptService.java |   13 +++++++++++++
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java                |    7 +++++--
 phis-feign/src/main/java/com/hz/his/dto/organize/OrganizeDto.java                    |   17 +++++++++++++++++
 3 files changed, 35 insertions(+), 2 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 4aae7d2..6469b17 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,10 +21,13 @@
     private String startTime;
     /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅~榛樿涓�涓湀*/
     private String endTime;
-    /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
-    private String costDeptName;
+    /**褰掑睘鎴愭湰閮ㄩ棬 -闈炲繀濉� */
+    private String ascrCostDeptId;
     /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
     private String ascrCostDeptName;
+    /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
+    private String costDeptName;
+
 
     /**鍙戞斁鍘熷洜 -闈炲繀濉� 鐩稿綋浜� 淇冩垚浜� 瀹㈣瘔 鎵撴澘 绫诲瀷*/
     private String sendReason;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/organize/OrganizeDto.java b/phis-feign/src/main/java/com/hz/his/dto/organize/OrganizeDto.java
new file mode 100644
index 0000000..166d0e0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/organize/OrganizeDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto.organize;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 缁勭粐鏋舵瀯
+ */
+@Data
+public class OrganizeDto extends PageDto {
+    /**鏍囪瘑*/
+    private String id;
+    /**鏄惁鏌ヨ鏈夎礋璐d汉鐨�,1鏌ヨ*/
+    private Integer selectLeader = 0;
+    /**鏌ユ壘鐖剁骇*/
+    private Integer selectParent = 0;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrganizationDeptService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrganizationDeptService.java
index 70e3e92..e114b18 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrganizationDeptService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrganizationDeptService.java
@@ -2,6 +2,7 @@
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.PageDto;
+import com.hz.his.dto.organize.OrganizeDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,4 +20,16 @@
     @PostMapping(value = "organization/dept/list")
     Result getList(@RequestBody(required = false) PageDto pageDto);
 
+    /**
+     * 鑾峰彇缁勭粐缁撴瀯鍒楄〃
+     */
+    @PostMapping(value = "/organize/get/list")
+    Result getOrganizeList(@RequestBody OrganizeDto organizeDto);
+
+    /**
+     * 鑾峰彇缁勭粐缁撴瀯璇︽儏
+     */
+    @PostMapping(value = "/organize/get/one")
+    Result getOrganizeDetail(@RequestBody OrganizeDto organizeDto);
+
 }

--
Gitblit v1.8.0