From 41ada81c2e7c81f5b8eaede775065c39a6855a5d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 六月 2023 15:07:50 +0800
Subject: [PATCH] 未执行明细划扣快照
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java | 5 +++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java | 12 ++++++++++++
3 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
index cb909f0..27b5038 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
@@ -14,6 +14,10 @@
private Date startTime;
/**寮�鍗曠粨鏉熸椂闂�*/
private Date endTime;
+ /**璁㈠崟鏀粯寮�濮�*/
+ private Date orderPayStartTime;
+ /**璁㈠崟鏀粯缁撴潫*/
+ private Date orderPayEndTime;
/**璁㈠崟鍙�*/
private String orderNo;
/**鎵�灞為棬搴�*/
@@ -24,6 +28,14 @@
private Integer deductionStatus;
/**椤圭洰鍒嗙被*/
private String typeId;
+ /**鍝侀」鍒嗙被*/
+ private String goodsClassify;
+ /**鏈堜唤鏃堕棿*/
+ private String monthTime;
+ /**鏈堜唤鏃堕棿寮�濮�*/
+ private String startMonthTime;
+ /**鏈堜唤鏃堕棿缁撴潫*/
+ private String endMonthTime;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
index 17fc49a..b3e6641 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
@@ -21,5 +21,10 @@
@PostMapping("/deduction/surface/list")
Result surfaceList(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+ /**
+ * 鏈墽琛屾槑缁嗗揩鐓у垪琛�
+ */
+ @PostMapping("/deduction/surface/list/data")
+ Result surfaceListData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
index e6207fc..e02dcc3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
@@ -34,5 +34,11 @@
@PostMapping(value = "/exp/deduction/surface")
Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+ /**
+ * 瀵煎嚭鍒掓墸蹇収鎶ヨ〃
+ * 杞崲鏃�
+ */
+ @PostMapping(value = "/exp/deduction/surface/data")
+ Result deductionSurfaceData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
\ No newline at end of file
--
Gitblit v1.8.0