Commit f9f55c08 authored by licc's avatar licc

修改方案上传

parent 18bc39ab
......@@ -246,16 +246,16 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
}
//6保存用户方案记录、志愿之间的关联关系,扣减查询次数
R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
if (null != bool && bool.getCode() == 500) {
return R.error(bool.getMessage());
}
// R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
// if (null != bool && bool.getCode() == 500) {
// return R.error(bool.getMessage());
// }
//排序
list.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
volunteerVo.setUserId(user.getId());
assert bool != null;
volunteerVo.setRecordId(bool.getData());
// assert bool != null;
// volunteerVo.setRecordId(bool.getData());
volunteerVo.setVolunteers(list);
volunteerVo.setTotal(list.size());
return R.ok(volunteerVo);
......
......@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
......@@ -64,8 +65,11 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer
VolunteerListener excelListener = new VolunteerListener();
//2.读取数据进行入库操作
EasyExcel.read(file.getInputStream(), Volunteer.class, new VolunteerListener()).sheet().doRead();
EasyExcel.read(file.getInputStream(), Volunteer.class,excelListener).sheet().doRead();
List<Volunteer> list = excelListener.getList();
if (CollectionUtils.isEmpty(list)) {
throw new BaseException("写入方案数据失败!");
}
//3、保存方案和志愿信息
SchemeInfo schemeInfo = new SchemeInfo();
......@@ -97,8 +101,8 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer
//3、保存方案和志愿信息
SchemeInfo schemeInfo = new SchemeInfo();
schemeInfo.setSchemeName("专科文学编导一批");
schemeInfo.setType(7);
schemeInfo.setSchemeName("本科文化一批");
schemeInfo.setType(1);
schemeInfo.setUploadTime(new Date());
schemeInfo.setIsDelete(0);
......@@ -106,6 +110,14 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer
log.info("导入方案数据成功!");
}
@Override
public void excelTemplate(HttpServletResponse response) throws IOException {
//构造假数据
List<Volunteer> residents = this.mockData();
//excel导出
this.download(response, Volunteer.class, residents, "居民管理模板", "居民管理");
}
/**
* 判断文件类型
*
......
......@@ -57,6 +57,7 @@ public class SchemeController {
public R excelAdd(@RequestParam("file") MultipartFile file, @RequestParam("type") Integer type,
@RequestParam("schemeName") String schemeName,
@RequestParam("fileUrl") String fileUrl, HttpServletResponse response) throws IOException {
log.info("volunteer-service[]SchemeController[]excelAdd[]input.param.file:" + file);
if (file == null || file.isEmpty() || null == type || StringUtils.isBlank(schemeName) ||
StringUtils.isBlank(fileUrl)) {
throw new BaseException("操作错误");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment