From 0fe51f07bc3a16acc762d907cbf9d2c14cfbc47f Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 26 八月 2024 17:07:43 +0800
Subject: [PATCH] Merge branch 'master-rx-卡项促销活动分类' of http://1.15.4.62:80/r/~chenjiahe/phis-service-feign into master-jiayan-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index b0e0a1e..2c4a384 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
@@ -4,6 +4,7 @@
 import com.hz.his.dto.PageDto;
 import com.hz.his.dto.TimeDto;
 import com.hz.his.dto.project.ProjectDto;
+import com.hz.his.vo.project.ProjectFindVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,7 +16,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "project")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "project")
 public interface SProjectService {
 
     /**
@@ -48,6 +49,13 @@
      * @return Result
      */
     @PostMapping(value = "/project/page/list")
+    Result getProjectList(@RequestBody ProjectFindVo projectFindVo);
+
+    /**
+     * 鑾峰彇椤圭洰鍒楄〃锛堝洜涓轰唬鐮佺殑闂锛岃繖涓帴鍙d繚瀛樹笅鏉ワ級
+     * @return Result
+     */
+    @PostMapping(value = "/project/page/list2")
     Result getProjectList(@RequestBody PageDto pageDto);
 
     /**
@@ -116,4 +124,21 @@
     @PostMapping(value = "/project/item/relation/list")
     Result projectItemList(@RequestBody ProjectDto projectDto);
 
+    /**
+     * his鍔╂墜锛岄棬搴楀姪鎵� 寮�鍗曟椂 浣跨敤鏌ヨ鍗¢」鍒楄〃
+     * @param projectDto
+     * @return
+     */
+    @PostMapping(value = "/card/list/by/type")
+    Result getCardByTypeId(@RequestBody ProjectDto projectDto);
+
+
+    /**
+     * his鍔╂墜锛岄棬搴楀姪鎵� 寮�鍗曟椂 浣跨敤鏌ヨ淇冮攢鍒楄〃
+     * @param projectDto
+     * @return
+     */
+    @PostMapping(value = "/promotion/list/by/type")
+    Result getPromotionByTypeId(@RequestBody ProjectDto projectDto);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0