卡导出格式调整

ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzCardsController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.dz;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ValidationException;
 
@@ -10,12 +11,14 @@ import com.ruoyi.common.enums.ExamType;
 import com.ruoyi.common.enums.UserRegStatus;
 import com.ruoyi.common.utils.NumberUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.dz.domain.DzAgent;
 import com.ruoyi.dz.service.IDzAgentService;
 import com.ruoyi.enums.CardAction;
 import com.ruoyi.enums.CardType;
 import com.ruoyi.enums.UserTypeEnum;
 import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.web.domain.DzCardExport;
 import com.ruoyi.web.service.SysLoginService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -62,6 +65,12 @@ public class DzCardsController extends BaseController
     @ApiOperation("列表")
     public TableDataInfo list(DzCards dzCards)
     {
+        startPage();
+        List<DzCards> list = dzCardsService.selectDzCardsList(prepare(dzCards));
+        return getDataTable(list);
+    }
+
+    private DzCards prepare(DzCards dzCards) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         String userType = sysUser.getUserType();
         if(UserTypeEnum.isInstitution(userType)){
@@ -80,10 +89,7 @@ public class DzCardsController extends BaseController
                 }
             }
         }
-
-        startPage();
-        List<DzCards> list = dzCardsService.selectDzCardsList(dzCards);
-        return getDataTable(list);
+        return dzCards;
     }
 
     /**
@@ -94,9 +100,17 @@ public class DzCardsController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, DzCards dzCards)
     {
-        List<DzCards> list = dzCardsService.selectDzCardsList(dzCards);
-        ExcelUtil<DzCards> util = new ExcelUtil<DzCards>(DzCards.class);
-        util.exportExcel(response, list, "学习卡数据");
+        List<DzCards> list = dzCardsService.selectDzCardsList(prepare(dzCards));
+        for(DzCards dc : list) {
+            dc.getDeptId();
+
+        }
+        ExcelUtil<DzCardExport> util = new ExcelUtil<DzCardExport>(DzCardExport.class);
+        util.exportExcel(response, list.stream().map(t -> {
+            DzCardExport exp = new DzCardExport();
+            BeanUtils.copyProperties(t, exp);
+            return exp;
+        }).collect(Collectors.toList()), "学习卡数据");
     }
 
     /**

ie-admin/src/main/java/com/ruoyi/web/domain/DzCardExport.java

@@ -0,0 +1,67 @@
+package com.ruoyi.web.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DzCardExport {
+    /** 账号 */
+    @Excel(name = "卡号")
+    private String cardNo;
+    @Excel(name = "密码")
+    private String password;
+    @Excel(name = "姓名")
+    private String nickName;
+    @Excel(name = "手机")
+    private String phonenumber;
+    @Excel(name = "机构")
+    private Long deptName;
+    @Excel(name = "省份")
+    private Long location;
+    @Excel(name = "代理商")
+    private String agentName;
+    @Excel(name = "单招年份")
+    private Integer endYear;
+    @Excel(name = "注册学校")
+    private String schoolName;
+    @Excel(name = "注册班级")
+    private String className;
+    @Excel(name = "培训校区")
+    private String campusName;
+    @Excel(name = "培训班级")
+    private String campusClassName;
+    @Excel(name = "考生类型（注册）")
+    private String examType;
+    @Excel(name = "卡类型", readConverterExp = "2=机构VIP,6=vip卡,7=电子卡,8=测试卡,9=体验卡")
+    private Integer type;
+    @Excel(name = "分配状态", readConverterExp = "0=未分配,1=已分配")
+    private Integer distributeStatus;
+    @Excel(name = "使用状态", readConverterExp = "0=未开卡,1=已开卡,2=已激活")
+    private Integer status;
+    @Excel(name = "过期状态", readConverterExp = "9=已过期,10=已关卡,11=已失效")
+    private Integer timeStatus;
+    @Excel(name = "缴费状态", readConverterExp = "0=未缴费,1=已缴费,2=已退费")
+    private Integer payStatus;
+    @Excel(name = "结算状态", readConverterExp = "0=未结算,1=已结算")
+    private Integer isSettlement;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分配时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date distributeTime;
+    /** 激活时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "激活时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date activeTime;
+
+    /** 到期时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "到期时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date outDate;
+
+    /** 缴费时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "缴费时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date payTime;
+}

ie-system/src/main/java/com/ruoyi/dz/domain/DzCards.java

@@ -86,6 +86,9 @@ public class DzCards extends BaseEntity
     @Excel(name = "分配考生类型")
     private String assignExamType;
 
+    @Excel(name = "分配考生类型")
+    private String examType;
+
     /** 分配学校 */
     @Excel(name = "分配学校")
     private Long assignSchoolId;
@@ -166,10 +169,13 @@ public class DzCards extends BaseEntity
     private String schoolName;
     /** 校区班级ID */
     private String className;
+    private String campusClassName;
 
     private String nickName;
     private String phonenumber;
 
+    private String location;
+
 
 
 
@@ -475,6 +481,14 @@ public class DzCards extends BaseEntity
         this.assignExamType = assignExamType;
     }
 
+    public String getExamType() {
+        return examType;
+    }
+
+    public void setExamType(String examType) {
+        this.examType = examType;
+    }
+
     public String getDeptName() {
         return deptName;
     }
@@ -571,6 +585,22 @@ public class DzCards extends BaseEntity
         this.campusClassId = campusClassId;
     }
 
+    public String getCampusClassName() {
+        return campusClassName;
+    }
+
+    public void setCampusClassName(String campusClassName) {
+        this.campusClassName = campusClassName;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzCardsServiceImpl.java

@@ -89,6 +89,9 @@ public class DzCardsServiceImpl implements IDzCardsService
             if(null != c.getClassId()) {
                 classIdSet.add(c.getClassId());
             }
+            if(null != c.getCampusClassId()) {
+                classIdSet.add(c.getCampusClassId());
+            }
             if(null != c.getAssignSchoolId()) {
                 schoolIdSet.add(c.getAssignSchoolId());
             }
@@ -116,6 +119,7 @@ public class DzCardsServiceImpl implements IDzCardsService
 
         for(DzCards c : list) {
             c.setClassName(classesMap.get(c.getClassId()));
+            c.setCampusClassName(classesMap.get(c.getCampusClassId()));
             c.setAssignSchoolName(schoolMap.get(c.getAssignSchoolId()));
             c.setSchoolName(schoolMap.get(c.getSchoolId()));
             c.setCampusName(schoolMap.get(c.getCampusId()));
@@ -125,8 +129,11 @@ public class DzCardsServiceImpl implements IDzCardsService
                 c.setAgentName(null != c.getLeafAgentId() && !c.getLeafAgentId().equals(c.getAgentId()) ? agentMap.get(c.getLeafAgentId()) + "(" + name + ")" : name);
             }
             if (userMap.containsKey(c.getCardId())) {
-                c.setPhonenumber(userMap.get(c.getCardId()).getPhonenumber());
-                c.setNickName(userMap.get(c.getCardId()).getNickName());
+                SysUser user = userMap.get(c.getCardId());
+                c.setPhonenumber(user.getPhonenumber());
+                c.setNickName(user.getNickName());
+                c.setExamType(user.getExamType().title());
+                c.setLocation(user.getLocation());
             }
         }
         return list;