|
@@ -1843,17 +1843,38 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<UserSubscribeSignExportVo> listSignExport(UserSubscribeQueryBo bo) {
|
|
|
+ public Map<String,Object> listSignExport(UserSubscribeQueryBo bo) {
|
|
|
+ Map<String,Object> map = new HashMap<>();
|
|
|
List<UserSubscribeVo> list = baseMapper.listSignExport(bo);
|
|
|
List<UserSubscribeSignExportVo> list1 = new ArrayList<>();
|
|
|
+ List<FileBean> fileBeanList = new ArrayList<>(); //图片列表
|
|
|
for(UserSubscribeVo vo : list){
|
|
|
UserSubscribeSignExportVo item = BeanUtil.toBean(vo, UserSubscribeSignExportVo.class);
|
|
|
if(Validator.isNotEmpty(vo.getWisdomReportTime())){
|
|
|
item.setWisdomReportTime(DateUtils.timestampToDateFormat(vo.getWisdomReportTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
|
|
|
}
|
|
|
+ item.setApplySiteExamDate(DateUtils.timestampToDateFormat(vo.getApplySiteExamTime(),DateUtils.YYYY_MM_DD));
|
|
|
+ item.setApplySiteExamTime(vo.getApplySiteStartTime()+" - "+vo.getApplySiteEndTime());
|
|
|
list1.add(item);
|
|
|
+ if(Validator.isNotEmpty(vo.getSnapPictures())){
|
|
|
+ FileBean f = new FileBean();
|
|
|
+ f.setPath(vo.getSnapPictures());
|
|
|
+ f.setFileName(vo.getIdCard() + ".jpg");
|
|
|
+ fileBeanList.add(f);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ String filename = FileUtils.encodingZipFilename("考试照片");
|
|
|
+ String zipFile = FileUtils.getZipAbsoluteFile(filename);
|
|
|
+ try {
|
|
|
+ ZipOutputStream outStream = new ZipOutputStream(new FileOutputStream(zipFile));
|
|
|
+ ossService.zipWisdomDownload(fileBeanList,outStream);
|
|
|
+ outStream.close();
|
|
|
+ }
|
|
|
+ catch (IOException e) {
|
|
|
}
|
|
|
- return list1;
|
|
|
+ map.put("list", list1);
|
|
|
+ map.put("zip", AjaxResult.success(filename));
|
|
|
+ return map;
|
|
|
}
|
|
|
|
|
|
@Override
|