From ab46861e9ba1b01506d94afea430e5d9fc8a80de Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 06 七月 2023 14:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java | 8 +++++++-
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardMapVo.java | 15 +++++++++++++++
3 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
index cd2508f..585cc39 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
@@ -14,6 +14,8 @@
private String userId;
/**鍗″寘鏍囪瘑*/
private String cardBagId;
+ /**鍗″寘鏈夋晥鐘舵��*/
+ private Integer effectiveStatus;
/**鎿嶄綔鍛樺伐鏍囪瘑*/
private String opEmployeeId;
/**鎿嶄綔闂ㄥ簵鏍囪瘑*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
index 0fb33a9..3e6fbac 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
@@ -26,11 +26,17 @@
Result delayCardBag(@RequestBody CardBagDto cardBagDto);
/**
- * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵ｄ俊鎭�
+ * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵ｄ俊鎭紙鍗曟潯锛�
* @return 杞寲瀵硅薄UserCardVo
*/
@PostMapping(value = "/user/card/get/deduction-data")
Result deductionData(@RequestBody CardBagDto cardBagDto);
+ /**
+ * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵ｄ俊鎭紙闆嗗悎锛�
+ * @return 杞寲瀵硅薄userCardMapVo
+ */
+ @PostMapping(value = "/user/card/get/deduction-data/list")
+ Result deductionDataList(@RequestBody CardBagDto cardBagDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardMapVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardMapVo.java
new file mode 100644
index 0000000..1a96094
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardMapVo.java
@@ -0,0 +1,15 @@
+package com.hz.his.vo.user.card;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**鐢ㄦ埛鍗￠」淇℃伅
+ * @author CJH*/
+@Data
+public class UserCardMapVo {
+
+ /**鍗″寘鏁扮粍*/
+ private List<UserCardVo> userCardList;
+
+}
--
Gitblit v1.8.0