From 5a8278faefaefaa90cbe438c1643c987da2f473b Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 08 十二月 2023 11:27:08 +0800
Subject: [PATCH] Changes
---
app/src/main/java/com/dayu/recharge/utils/ExcelUtil.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/utils/ExcelUtil.java b/app/src/main/java/com/dayu/recharge/utils/ExcelUtil.java
index e270cca..4ac6e11 100644
--- a/app/src/main/java/com/dayu/recharge/utils/ExcelUtil.java
+++ b/app/src/main/java/com/dayu/recharge/utils/ExcelUtil.java
@@ -129,27 +129,23 @@
List<String> list = new ArrayList<>();
if (objList.get(j) instanceof RechargeBean) {
RechargeBean projectBean = (RechargeBean) objList.get(j);
-// list.add(projectBean.getVillageNum());
-// list.add(projectBean.getUserName());
-// list.add(projectBean.getUserNum());
-// list.add(DateUtil.dateToStamp(projectBean.getDate(), DateUtil.type2));
-// list.add(projectBean.getMorny());
-// list.add(projectBean.getBalance());
+ list.add(projectBean.getSerial());
+ list.add(projectBean.getUserName());
+ if (projectBean.getUserId() != null) {
+ list.add(projectBean.getUserId());
+ } else {
+ list.add("");
+ }
+ list.add(DateUtil.dateToStamp(projectBean.getDate(), DateUtil.type2));
+ list.add(projectBean.getMorny());
+ list.add(projectBean.getBalance());
} else {
-// UserCardBean userCardBean = (UserCardBean) objList.get(j);
-// list.add(userCardBean.getVillageNum());
-// list.add(userCardBean.getUserName());
-// list.add(userCardBean.getUserNum());
-// list.add(DateUtil.dateToStamp(userCardBean.getDate(), DateUtil.type2));
-// list.add(userCardBean.getPhone());
-// list.add(userCardBean.getWaterNum());
-// list.add(userCardBean.getMushu());
-// if (userCardBean.getSt() == 0) {
-// list.add("绌洪棽");
-// } else {
-// list.add("浣跨敤");
-// }
-
+ UserCardBean userCardBean = (UserCardBean) objList.get(j);
+ list.add(userCardBean.getSerial());
+ list.add(userCardBean.getUserName());
+ list.add(userCardBean.getUserID());
+ list.add(DateUtil.dateToStamp(userCardBean.getDate(), DateUtil.type2));
+ list.add(userCardBean.getPhone());
}
for (int i = 0; i < list.size(); i++) {
--
Gitblit v1.8.0