管理端充值卡导出功能修改

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeRecordMapper.java

@@ -52,4 +52,11 @@ public interface SchemeRecordMapper extends BaseMapper<SchemeQueryRecord> {
      */
     List<SchemeQueryRecord> getByUserId(@Param("userId") Integer userId, @Param("startNum") Integer startNum,
                                         @Param("endNum") Integer endNum);
+
+    /**
+     *
+     * @param id 方案查询记录id
+     * @return 查询方案信息
+     */
+    SchemeQueryRecord getById(@Param("id") Integer id);
 }

wisenergy-mapper/src/main/resources/mapper/CardMapper.xml

@@ -101,7 +101,6 @@
         <include refid="table"/>
         <where>
             batch_Number=#{batchNumber}
-            and status=0
             and is_delete=0
         </where>
     </select>

wisenergy-mapper/src/main/resources/mapper/SchemeRecordMapper.xml

@@ -101,4 +101,13 @@
         </where>
     </select>
 
+    <select id="getById" resultMap="recordMap">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            id=#{id}
+        </where>
+    </select>
 </mapper>

wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java

@@ -2,6 +2,7 @@ package cn.wisenergy.model.app;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentLoopMerge;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -141,6 +142,7 @@ public class Volunteer  implements Serializable {
      */
     @ApiModelProperty(value = "方案查询时间",name = "queryTime")
     @TableField(exist = false)
+    @ContentLoopMerge(eachRow = 4,columnExtend=4)
     private Date queryTime;
 
 

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ExportCardDto.java

@@ -2,14 +2,17 @@ package cn.wisenergy.model.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentLoopMerge;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 充值卡子卡导出实体类dto
@@ -28,9 +31,21 @@ public class ExportCardDto implements Serializable {
 
     private static final long serialVersionUID = 2062796530315436172L;
 
+    /**
+     * 卡号
+     */
     @ExcelProperty(value = "卡号")
     private String cardNumber;
 
+    /**
+     * 密码
+     */
     @ExcelProperty(value = "密码")
     private String secretKey;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private String status;
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BannerServiceImpl.java

@@ -39,7 +39,7 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> impleme
         } else {
             advertising.setIsHaveImage(0);
         }
-        advertising.setStatus(0);
+        advertising.setStatus(1);
 
         //数据添加
         int count = bannerMapper.add(advertising);

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RefillCardServiceImpl.java

@@ -144,7 +144,7 @@ public class RefillCardServiceImpl implements RefillCardService {
                         return ExportCardDto.builder()
                                 .cardNumber(t.getCardNumber())
                                 .secretKey(t.getSecretKey())
-
+                                .status(t.getStatus()==0?"未使用":"已使用")
                                 .build();
                     }).collect(Collectors.toList());
 

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeRecordServiceImpl.java

 package cn.wisenergy.service.app.impl;
 
 import cn.wisenergy.common.constant.CommonAttributes;
+import cn.wisenergy.common.utils.DateUtil;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.SchemeRecordMapper;
 import cn.wisenergy.mapper.UserVolunteerMapper;
@@ -28,6 +29,7 @@ import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -132,6 +134,10 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
     @Override
     public R<Boolean> export(Integer userId, Integer recordId, HttpServletResponse response) {
         log.info("volunteer-service[]SchemeRecordServiceImpl[]export[]input.param.userId,recordId:" + userId);
+
+        //查询时间
+        String format=null;
+
         if (null == userId || null == recordId) {
             return R.error("入参为空!");
         }
@@ -141,10 +147,19 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("scheme_record_id", recordId);
         List<UserVolunteer> list = userVolunteerMapper.selectList(queryWrapper);
+        SchemeQueryRecord schemeQueryRecord = schemeRecordMapper.getById(recordId);
         if (CollectionUtils.isEmpty(list)) {
             return R.error("数据为空");
         }
 
+        //获取方案查询时间
+        if (null!=schemeQueryRecord) {
+             format = DateUtil.convertDateToStr(schemeQueryRecord.getUpdateTime(), "yyyy-MM-dd HH:mm:SS");
+        }else {
+             format = DateUtil.convertDateToStr(new Date(), "yyyy-MM-dd HH:mm:SS");
+        }
+
+
         List<Integer> ids = list.stream().map(UserVolunteer::getVolunteerId).collect(Collectors.toList());
         List<Volunteer> result = volunteerMapper.getListByIds(ids);
         result.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
@@ -165,7 +180,7 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
 
             // 4.向文档中添加内容
             PdfUtil pdfUtil = new PdfUtil();
-            pdfUtil.generatePDF(document, result);
+            pdfUtil.generatePDF(document, result,format);
 
             // 5.关闭文档
             document.close();
@@ -196,6 +211,9 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
     public R<Boolean> createExcel(Integer userId, Integer recordId, HttpServletResponse response) {
         log.info("SchemeRecordServiceImpl[].createExcel[].input.param:userId,recordId"+userId,recordId);
 
+        //查询时间
+        String format=null;
+
         if (null == userId || null == recordId) {
             return R.error("入参为空!");
         }
@@ -205,10 +223,17 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("scheme_record_id", recordId);
         List<UserVolunteer> list = userVolunteerMapper.selectList(queryWrapper);
+        SchemeQueryRecord schemeQueryRecord = schemeRecordMapper.getById(recordId);
         if (CollectionUtils.isEmpty(list)) {
             return R.error("数据为空");
         }
 
+        //获取方案查询时间
+        if (null!=schemeQueryRecord) {
+            format = DateUtil.convertDateToStr(schemeQueryRecord.getUpdateTime(), "yyyy-MM-dd HH:mm:SS");
+        }else {
+            format = DateUtil.convertDateToStr(new Date(), "yyyy-MM-dd HH:mm:SS");
+        }
         List<Integer> ids = list.stream().map(UserVolunteer::getVolunteerId).collect(Collectors.toList());
         List<Volunteer> result = volunteerMapper.getListByIds(ids);
         result.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());

wisenergy-service/src/main/java/cn/wisenergy/service/common/PdfUtil.java

 package cn.wisenergy.service.common;
 
+import cn.wisenergy.model.app.SchemeQueryRecord;
 import cn.wisenergy.model.app.Volunteer;
-import com.itextpdf.text.Document;
-import com.itextpdf.text.Element;
-import com.itextpdf.text.Font;
-import com.itextpdf.text.Phrase;
+import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.BaseFont;
 import com.itextpdf.text.pdf.PdfPCell;
 import com.itextpdf.text.pdf.PdfPTable;
@@ -46,12 +44,12 @@ public class PdfUtil implements Serializable {
 
 
     // 生成PDF文件
-    public  void  generatePDF(Document document, List<Volunteer> list) throws Exception {
+    public  void  generatePDF(Document document, List<Volunteer> list, String queryRecordTime) throws Exception {
 
 
         // 表格
         PdfPTable table = createTable(new float[] { 40,80,80, 80, 80, 80, 80, 80, 40, 40, 40 });
-        table.addCell(createCell("普通类", headfont, Element.ALIGN_CENTER, 11, false));
+        table.addCell(createCell("查询时间："+queryRecordTime,headfont,Element.ALIGN_LEFT, 11, false));
         table.addCell(createCell("序号", keyfont, Element.ALIGN_CENTER));
         table.addCell(createCell("专业", keyfont, Element.ALIGN_CENTER));
         table.addCell(createCell("院校", keyfont, Element.ALIGN_CENTER));