From 83e8981accbc513b287184ca4094a50b5e5299ca Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 02 七月 2026 19:33:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index 8d60d0d..9221d31 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -75,11 +75,15 @@
DateFormat format = new SimpleDateFormat("yyyyMMdd");
String time1 = format.format(date);
String fileName =name+"报名信息.xls";
- String[] title = new String[] {"姓名","性别","联系电话","身份证号","状态"};
+ String[] title = new String[] {"姓名","性别","注册电话","联系电话","身份证号","状态"};
GetPeopleQuery query = new GetPeopleQuery();
query.setId(id);
query.setState(state);
- List<CompetitionUser> list = competitionClient.getPeoples(query);
+ // todo 临时处理 因为只能更新后台
+ Page<CompetitionUser> page = competitionClient.getPeopleFromId1(new GetPeopleQuery(999, 0, id, state));
+ List<CompetitionUser> list = page.getRecords();
+// List<CompetitionUser> list = competitionClient.getPeoples(query);
+ System.err.println("导出查询人员列表"+ list);
String[][] values = new String[list.size()][];
for (int i = 0; i < list.size(); i++) {
CompetitionUser d = list.get(i);
@@ -95,15 +99,17 @@
}else {
values[i][1] = "未知";
}
- values[i][2] = d.getPhone();
- values[i][3] = d.getIdCard();
+ values[i][2] = d.getRegisterPhone();
+
+ values[i][3] = d.getPhone();
+ values[i][4] = d.getIdCard();
Integer state1 = d.getState();
if(1 == state1){
- values[i][4] = "正常";
+ values[i][5] = "正常";
}else if(2 == state1){
- values[i][4] = "冻结";
+ values[i][5] = "正常";
}else {
- values[i][4] = "删除";
+ values[i][5] = "已取消";
}
}
HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook("Variance"+time1, title, values, null);
--
Gitblit v1.7.1