From 5cb82c45b0369db9e1dcfe312e93cf0e2acb6c52 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 26 九月 2024 18:53:01 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 8dc78b3..283c37e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -539,6 +539,13 @@
* @return
*/
public Map getReceipts(QoReceipt queryVo) {
+ if (queryVo.getTimeStart() != null && queryVo.getTimeStart() != ""){
+ queryVo.setTimeStart(queryVo.getTimeStart() + " 00:00:00");
+ }
+ if (queryVo.getTimeStop() != null && queryVo.getTimeStop() != ""){
+ queryVo.setTimeStop(queryVo.getTimeStop() + " 23:59:59");
+ }
+
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
DecimalFormat df = new DecimalFormat("#.00");
--
Gitblit v1.8.0