From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java | 18 +++++++++++++++++-
1 files changed, 17 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 48bb0f4..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,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;
@@ -48,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);
/**
@@ -106,6 +114,14 @@
* @return
*/
@PostMapping(value = "/project/list/by/type")
- List<Map<String, Object>> getProjectByTypeId(@RequestBody ProjectDto projectDto);
+ 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