From a44c47bc7f37245612635866adaddf5c98d41747 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 16 八月 2024 11:03:49 +0800
Subject: [PATCH] 添加补打逻辑 联调修复bug
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java
index 15e946c..b71122b 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/MyActivity.java
@@ -91,6 +91,7 @@
startActivity(new Intent(MyActivity.this, NewCardListActivity.class));
}
});
+ //寮�鍗¤褰�
myBinding.myNewCardOut.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -98,6 +99,7 @@
beginDatePicker.show(System.currentTimeMillis());
}
});
+ //鍏呭�艰褰�
myBinding.myRechargeOut.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -147,7 +149,7 @@
List listData = new ArrayList();
try {
if (isRechargeList) {
- listData = asynchBaseDao.rechargeDao().ansyFindByTime(beginTime, endTime);
+ listData = asynchBaseDao.rechargeDao().ansyFindByTime(QHOnLineApplication.getInstance().adminId, beginTime, endTime);
} else {
listData = asynchBaseDao.userCardDao().findByTime(beginTime, endTime);
}
@@ -165,10 +167,10 @@
return;
}
if (isRechargeList) {
- title = new String[]{"璁惧搴忓垪鍙�", "鐢ㄦ埛鍚�", "鍗″彿", "鍏呭�兼棩鏈�", "鍏呭�奸噾棰濓紙鍏冿級", "鍓╀綑閲戦锛堝厓锛�"};
+ title = new String[]{"璁惧搴忓垪鍙�", "鐢ㄦ埛鍚�", "鍗″彿", "鍏呭�兼棩鏈�", "鍏呭�奸噾棰濓紙鍏冿級", "鍓╀綑閲戦锛堝厓锛�","鍏呭�肩數閲忥紙搴︼級","鍓╀綑鐢甸噺锛堝害锛�","鐢ㄦ埛缂栧彿"};
fileName = file.toString() + "/" + ExcelUtil.outRechargePathName;
} else {
- title = new String[]{"璁惧搴忓垪鍙�", "鐢ㄦ埛鍚�", "韬唤璇佸彿", "鍗″彿", "娉ㄥ唽鏃ユ湡", "鐢佃瘽"};
+ title = new String[]{"璁惧搴忓垪鍙�", "鐢ㄦ埛鍚�", "韬唤璇佸彿", "鍗″彿", "娉ㄥ唽鏃ユ湡", "鐢佃瘽","鐢ㄦ埛缂栧彿"};
fileName = file.toString() + "/" + ExcelUtil.outUserPathName;
}
ExcelUtil.initExcel(fileName, title);
--
Gitblit v1.8.0