From bc798685f11aeec95e64c25b0a4594d8876d881d Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 02 八月 2024 14:25:12 +0800
Subject: [PATCH] Merge branch 'master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 ffc34d8..963981e 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,12 +4,14 @@
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;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
+import java.util.Map;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -47,6 +49,13 @@
* @return Result
*/
@PostMapping(value = "/project/page/list")
+ Result getProjectList(@RequestBody ProjectFindVo projectFindVo);
+
+ /**
+ * 鑾峰彇椤圭洰鍒楄〃锛堝洜涓轰唬鐮佺殑闂锛岃繖涓帴鍙ｄ繚瀛樹笅鏉ワ級
+ * @return Result
+ */
+ @PostMapping(value = "/project/page/list2")
Result getProjectList(@RequestBody PageDto pageDto);
/**
@@ -99,4 +108,20 @@
@PostMapping(value = "/project/check/medical")
Result checkMedicalIitems(@RequestBody ProjectDto projectDto);
+ /**
+ * his鍔╂墜锛岄棬搴楀姪鎵� 寮�鍗曟椂 浣跨敤鏌ヨ椤圭洰鍒楄〃
+ * @param projectDto
+ * @return
+ */
+ @PostMapping(value = "/project/list/by/type")
+ Result getProjectByTypeId(@RequestBody ProjectDto projectDto);
+
+ /**鏌ヨ椤圭洰绉垎鎶垫墸鐜伴噾鐨勬瘮渚�*/
+ @PostMapping(value = "/project/integral/cash/rate")
+ Result getIntegralCashRate(@RequestBody ProjectDto projectDto);
+
+ /**鏌ヨ鏄犲皠椤圭洰妯″潡鏍戝瀷涓夌骇*/
+ @PostMapping(value = "/project/item/relation/list")
+ Result projectItemList(@RequestBody ProjectDto projectDto);
+
}
\ No newline at end of file
--
Gitblit v1.8.0