|
@@ -154,7 +154,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
|
|
|
} else {
|
|
|
row.setHasYesFirstAnswer("否");
|
|
|
}
|
|
|
- if(row.getHasInstrumentsId() == null){
|
|
|
+ if(row.getInstrumentsId() == null){
|
|
|
row.setHasInstrumentsId("否");
|
|
|
}else {
|
|
|
row.setHasInstrumentsId("是");
|
|
@@ -164,7 +164,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
|
|
|
OutputStream outputStream = response.getOutputStream();
|
|
|
HSSFWorkbook workbook = null;
|
|
|
try {
|
|
|
- String[] header = {"分部", "合作单位编号", "合作单位", "学员编号", "学员姓名", "联系电话", "声部", "品牌", "型号", "是否参与校赛", "是否置换乐器"};
|
|
|
+ String[] header = {"分部", "合作单位编号", "合作单位", "学员编号", "学员姓名", "联系电话", "声部", "品牌", "型号", "是否参与市赛", "是否置换乐器"};
|
|
|
String[] body = {"organName", "cooperationOrganId", "cooperationOrganName", "userId", "userName", "mobileNo", "subjectName", "brand", "specification","hasYesFirstAnswer","hasInstrumentsId"};
|
|
|
workbook = POIUtil.exportExcel(header, body, pageList.getRows());
|
|
|
response.setContentType("application/octet-stream");
|