From b8e4e247e557166e1942d980af5e412d23476904 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 26 Oct 2020 14:51:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E6=8A=A5=E5=90=8D=E4=BA=BA=E5=91=98=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ActUserRelationResultDTO.java | 14 ++- .../controller/ActUserRelationController.java | 49 +++++++++- .../activity/excel/ActUserRelationExcel.java | 55 ++--------- .../mapper/activity/ActUserRelationDao.xml | 4 +- .../controller/VolunteerInfoController.java | 41 ++++++++- .../esua/epdc/excel/VolunteerInfoExcel.java | 91 ++++--------------- .../resources/mapper/VolunteerInfoDao.xml | 2 +- 7 files changed, 128 insertions(+), 128 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java index def66efa..3dd7800b 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java @@ -113,4 +113,16 @@ public class ActUserRelationResultDTO implements Serializable { */ private String actStatus; -} \ No newline at end of file + // 虚字段 + + /** + * 审核时间 "2020-10-15 10:56:20" + * 字段，用于报名人员导出Excle + */ + private String auditTimeString; + + /** + * 报名时间 "2020-10-15 10:56:20" + */ + private String signupTimeString; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java index b71d136c..296f5e03 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java @@ -30,10 +30,13 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.modules.activity.excel.ActUserRelationExcel; import com.elink.esua.epdc.modules.activity.service.ActUserRelationService; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import java.util.Map; @@ -94,8 +97,48 @@ public class ActUserRelationController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = actUserRelationService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ActUserRelationExcel.class); + Date currentTime = new Date(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); + String fileName = "报名人员-" + formatter.format(currentTime); + + PageData page = actUserRelationService.getActUserRelationPageFromPC(params); + List list = formatConversion(page.getList()); + ExcelUtils.exportExcelToTarget(response, fileName, list, ActUserRelationExcel.class); } -} \ No newline at end of file + /** + * 活动报名管理导出 报名人员 + * 对报名人员性别、状态，进行文字转换 + * + * @param sourceList + * @return java.util.List + * @Author zhangyong + * @Date 14:07 2020-10-26 + **/ + public ListformatConversion(List sourceList){ + for (int i = 0; i < sourceList.size(); i++){ + if ("0".equals(sourceList.get(i).getSex())){ + sourceList.get(i).setSex("女"); + } else if ("1".equals(sourceList.get(i).getSex())){ + sourceList.get(i).setSex("男"); + } + + if ("0".equals(sourceList.get(i).getStatus())){ + sourceList.get(i).setStatus("报名"); + } else if ("1".equals(sourceList.get(i).getStatus())){ + sourceList.get(i).setStatus("审核通过"); + } else if ("2".equals(sourceList.get(i).getStatus())){ + sourceList.get(i).setStatus("打卡"); + } else if ("3".equals(sourceList.get(i).getStatus())){ + sourceList.get(i).setStatus("取消报名"); + } else if ("4".equals(sourceList.get(i).getStatus())){ + sourceList.get(i).setStatus("审核不通过"); + } else if ("5".equals(sourceList.get(i).getStatus())){ + sourceList.get(i).setStatus("确认加积分"); + } else if ("6".equals(sourceList.get(i).getStatus())){ + sourceList.get(i).setStatus("拒绝加积分"); + } + } + return sourceList; + } +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java index 89fd60f8..2d9de806 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java @@ -31,28 +31,10 @@ import java.util.Date; @Data public class ActUserRelationExcel { - @Excel(name = "主键") - private String id; - - @Excel(name = "活动ID") - private String actId; - - @Excel(name = "用户ID") - private String userId; - - @Excel(name = "用户昵称") - private String nickname; - - @Excel(name = "用户头像") - private String faceImg; - - @Excel(name = "党员标识（0-否，1-是）") - private String partyFlag; - - @Excel(name = "报名人真实姓名") + @Excel(name = "报名人") private String realName; - @Excel(name = "性别(0-女，1-男)") + @Excel(name = "性别") private String sex; @Excel(name = "年龄") @@ -64,32 +46,15 @@ public class ActUserRelationExcel { @Excel(name = "身份证号") private String identityNo; - @Excel(name = "当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）") - private String status; - - @Excel(name = "未通过原因（仅当未通过时录入，并读取）") - private String failureReason; - - @Excel(name = "审核时间") - private Date auditTime; - @Excel(name = "报名时间") - private Date signupTime; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; + private String signupTimeString; - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; + @Excel(name = "状态") + private String status; + @Excel(name = "审核时间") + private String auditTimeString; -} \ No newline at end of file + @Excel(name = "原因") + private String failureReason; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml index 5aae7748..a7988b4e 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml @@ -82,7 +82,9 @@ relation.FAILURE_REASON, relation.AUDIT_TIME, relation.SIGNUP_TIME, - eai.ACT_STATUS + eai.ACT_STATUS, + date_format(relation.SIGNUP_TIME,'%Y-%m-%d %H:%i:%S') signupTimeString, + date_format(relation.AUDIT_TIME,'%Y-%m-%d %H:%i:%S') auditTimeString FROM epdc_act_user_relation relation left join epdc_act_info eai on eai.ID = relation.ACT_ID diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java index 9527018c..84bffab7 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; @@ -35,6 +36,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; +import java.util.Collection; +import java.util.Date; import java.util.List; import java.util.Map; @@ -136,8 +140,41 @@ public class VolunteerInfoController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = volunteerInfoService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, VolunteerInfoExcel.class); + Date currentTime = new Date(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); + String fileName = "志愿者-" + formatter.format(currentTime); + + PageData page = volunteerInfoService.volunteerInfo(params); + List list = formatConversion(page.getList()); + ExcelUtils.exportExcelToTarget(response, fileName, list, VolunteerInfoExcel.class); + } + + /** + * 对志愿者性别、审批状态、认证时间，进行文字转换 + * @param sourceList + * @return java.util.List + * @Author zhangyong + * @Date 11:13 2020-10-26 + **/ + public List formatConversion(List sourceList){ + for (int i = 0; i < sourceList.size(); i++){ + if ("0".equals(sourceList.get(i).getSex())){ + sourceList.get(i).setSex("女"); + } else if ("1".equals(sourceList.get(i).getSex())){ + sourceList.get(i).setSex("男"); + } + + if ("0".equals(sourceList.get(i).getAuditStatus())){ + sourceList.get(i).setAuditStatus("自动通过"); + } else if ("1".equals(sourceList.get(i).getAuditStatus())){ + sourceList.get(i).setAuditStatus("手动审核通过"); + } else if ("2".equals(sourceList.get(i).getAuditStatus())){ + sourceList.get(i).setAuditStatus("手动审核不通过"); + } else if ("3".equals(sourceList.get(i).getAuditStatus())){ + sourceList.get(i).setAuditStatus("已拉入黑名单"); + } + } + return sourceList; } /** diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java index 2ffc31dd..e2333441 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java @@ -32,95 +32,36 @@ import java.util.Date; @Data public class VolunteerInfoExcel { - @Excel(name = "主键") - private String id; - - @Excel(name = "用户ID") - private String userId; - @Excel(name = "姓名") private String realName; - @Excel(name = "性别(0-女，1-男)") + @Excel(name = "昵称") + private String volunteerNickname; + + @Excel(name = "性别") private String sex; @Excel(name = "出生日期") - private Date birthday; + private String birthdayString; - @Excel(name = "手机号") + @Excel(name = "联系电话") private String mobile; @Excel(name = "身份证") private String identityNo; - @Excel(name = "爱心时长(单位：分钟)") - private BigDecimal kindnessTime; - - @Excel(name = "参加活动次数") - private Integer participationNum; - - @Excel(name = "积分") - private Integer points; - - @Excel(name = "网格ID") - private Long gridId; - - @Excel(name = "父所有部门ID") - private String parentDeptIds; - - @Excel(name = "父所有部门名称") - private String parentDeptNames; - - @Excel(name = "所有部门ID") - private String allDeptIds; - - @Excel(name = "所有部门名称") - private String allDeptNames; - - @Excel(name = "所属道路") - private String road; - - @Excel(name = "小区名称") - private String villageName; + @Excel(name = "认证时间") + private String registTimeString; - @Excel(name = "住处") - private String dwellingPlace; - - @Excel(name = "居住地址") - private String address; - - @Excel(name = "自我介绍") - private String introduce; - - @Excel(name = "志愿者注册时间") - private Date registTime; - - @Excel(name = "审核状态（0-未审核，1-审核通过，2-审核不通过）") + @Excel(name = "状态") private String auditStatus; - @Excel(name = "审核不通过的原因") - private String failureReason; - - @Excel(name = "审核时间") - private Date auditTime; - - @Excel(name = "审核人") - private Long auditor; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; + @Excel(name = "爱心时长 (h)") + private BigDecimal kindnessTime; + @Excel(name = "积分") + private Integer points; -} \ No newline at end of file + @Excel(name = "排序") + private Integer volunteerOrder; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index 6e38f270..f59dfbec 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -53,7 +53,7 @@ v.IDENTITY_NO identityNo, v.KINDNESS_TIME kindnessTime, u.POINTS points, - date_format(v.REGIST_TIME,'%Y.%m.%d %H.%i') registTimeString, + date_format(v.REGIST_TIME,'%Y-%m-%d %H:%i:%S') registTimeString, v.REGIST_TIME registTime, v.AUDIT_STATUS auditStatus, v.VOLUNTEER_ORDER volunteerOrder