|
@@ -67,7 +67,6 @@ public class ReplacementInstrumentActivityController extends BaseController {
|
|
|
return failed("非法请求");
|
|
|
}
|
|
|
}
|
|
|
- queryInfo.setHasInstrumentsId(true);
|
|
|
return succeed(replacementInstrumentActivityService.getPageList(queryInfo));
|
|
|
}
|
|
|
|
|
@@ -114,7 +113,6 @@ public class ReplacementInstrumentActivityController extends BaseController {
|
|
|
throw new BizException("非法请求");
|
|
|
}
|
|
|
}
|
|
|
- queryInfo.setHasInstrumentsId(true);
|
|
|
queryInfo.setRows(99999);
|
|
|
PageInfo<ReplacementInstrumentActivityStatDto> pageList = replacementInstrumentActivityService.getPageList(queryInfo);
|
|
|
|
|
@@ -125,8 +123,8 @@ public class ReplacementInstrumentActivityController extends BaseController {
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
HSSFWorkbook workbook = null;
|
|
|
try {
|
|
|
- String[] header = {"合作单位编号", "合作单位", "学员编号", "学员姓名", "联系电话", "声部", "品牌", "型号"};
|
|
|
- String[] body = {"cooperationOrganId", "cooperationOrganName", "userId", "userName", "mobileNo", "subjectName", "brand", "specification"};
|
|
|
+ String[] header = {"分部","合作单位编号", "合作单位", "学员编号", "学员姓名", "联系电话", "声部", "品牌", "型号"};
|
|
|
+ String[] body = {"organName","cooperationOrganId", "cooperationOrganName", "userId", "userName", "mobileNo", "subjectName", "brand", "specification"};
|
|
|
workbook = POIUtil.exportExcel(header, body, pageList.getRows());
|
|
|
response.setContentType("application/octet-stream");
|
|
|
response.setHeader("Content-Disposition", "attachment;filename=replacement-" + DateUtil.getDate(new Date()) + ".xls");
|