elink-star
/
esua-epdc-js
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

志愿者管理、报名人员增加导出功能

feature/syp_points
zhangyongzhangyong 5 years ago
parent
3daba90bf4
commit
b8e4e247e5
7 changed files with 128 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java
  2. 49
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java
  3. 55
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java
  4. 4
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
  5. 41
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
  6. 91
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java
  7. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

14
esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java
View File

@ -113,4 +113,16 @@ public class ActUserRelationResultDTO implements Serializable {
*/
private String actStatus;
}
// 虚字段
/**
* 审核时间 "2020-10-15 10:56:20"
* 字段，用于报名人员导出Excle
*/
private String auditTimeString;
/**
* 报名时间 "2020-10-15 10:56:20"
*/
private String signupTimeString;
}

49
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java
View File

@ -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<String, Object> params, HttpServletResponse response) throws Exception {
List<ActUserRelationDTO> 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<ActUserRelationResultDTO> page = actUserRelationService.getActUserRelationPageFromPC(params);
List<ActUserRelationResultDTO> list = formatConversion(page.getList());
ExcelUtils.exportExcelToTarget(response, fileName, list, ActUserRelationExcel.class);
}
}
/**
* 活动报名管理导出 报名人员
* 对报名人员性别、状态，进行文字转换
*
* @param sourceList
* @return java.util.List<com.elink.esua.epdc.activity.result.ActUserRelationResultDTO>
* @Author zhangyong
* @Date 14:07 2020-10-26
**/
public List<ActUserRelationResultDTO>formatConversion(List<ActUserRelationResultDTO> 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;
}
}

55
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java
View File

@ -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;
}
@Excel(name = "原因")
private String failureReason;
}

4
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
View File

@ -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

41
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
View File

@ -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<String, Object> params, HttpServletResponse response) throws Exception {
List<VolunteerInfoDTO> 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<VolunteerInfoDTO> page = volunteerInfoService.volunteerInfo(params);
List<VolunteerInfoDTO> list = formatConversion(page.getList());
ExcelUtils.exportExcelToTarget(response, fileName, list, VolunteerInfoExcel.class);
}
/**
* 对志愿者性别、审批状态、认证时间，进行文字转换
* @param sourceList
* @return java.util.List<com.elink.esua.epdc.dto.VolunteerInfoDTO>
* @Author zhangyong
* @Date 11:13 2020-10-26
**/
public List<VolunteerInfoDTO> formatConversion(List<VolunteerInfoDTO> 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;
}
/**

91
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java
View File

@ -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;
}
@Excel(name = "排序")
private Integer volunteerOrder;
}

2
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
View File

@ -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

Write Preview
Loading…
Cancel
Save