Merge remote-tracking branch 'remotes/origin/dev_1.0.0' into release_1.0.0

src/main/java/cn/com/qmth/mps/controller/PaperController.java

@@ -115,12 +115,13 @@ public class PaperController extends BaseController {
 					row.createCell(0, CellType.STRING).setCellValue(getStringVal(vo.getCourseCode()));
 					row.createCell(1, CellType.STRING).setCellValue(getStringVal(vo.getCourseName()));
 					row.createCell(2, CellType.STRING).setCellValue(getStringVal(vo.getDetailName()));
-					row.createCell(3, CellType.STRING).setCellValue(getStringVal(vo.getDetailNumber()));
-					row.createCell(4, CellType.STRING).setCellValue(getStringVal(vo.getUnitNumber()));
-					row.createCell(5, CellType.STRING).setCellValue(getStringVal(vo.getScore()));
-					row.createCell(6, CellType.STRING).setCellValue(getStringVal(vo.getScoreStep()));
-					row.createCell(7, CellType.STRING).setCellValue(getStringVal(vo.getGroupNumber()));
-					for(int i=0;i<8;i++) {
+					row.createCell(3, CellType.STRING).setCellValue("");
+					row.createCell(4, CellType.STRING).setCellValue(getStringVal(vo.getDetailNumber()));
+					row.createCell(5, CellType.STRING).setCellValue(getStringVal(vo.getUnitNumber()));
+					row.createCell(6, CellType.STRING).setCellValue(getStringVal(vo.getScore()));
+					row.createCell(7, CellType.STRING).setCellValue(getStringVal(vo.getScoreStep()));
+					row.createCell(8, CellType.STRING).setCellValue(getStringVal(vo.getGroupNumber()));
+					for(int i=0;i<9;i++) {
 						row.getCell(i).setCellStyle(style);
 					}
 				}

src/main/java/cn/com/qmth/mps/service/impl/PaperServiceImpl.java

@@ -60,7 +60,7 @@ import cn.com.qmth.mps.vo.paper.StructDomain;
 public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> implements PaperService {
 	private static final String[] SUBJECT_EXCEL_HEADER = new String[] {"科目代码", "科目名称"};
 
-	private static final String[] SUBJECT_STRUCT_EXCEL_HEADER = new String[] {"科目代码*","科目名称","大题名称*","大题号(只能用小写数字)*","小题号(只能用小写数字)*","小题满分*","间隔分*","评卷分组(只能用小写数字)*","图片序号(用英文逗号分割)","双评比例(0~1)","仲裁阀值","合分策略(1-平均，2-最高，3-最低)","评卷模式(common-普通，track-轨迹)","试评数量(0-跳过试评)","选做题数量"};
+	private static final String[] SUBJECT_STRUCT_EXCEL_HEADER = new String[] {"科目代码*","科目名称","大题名称*","题目昵称","大题号(只能用小写数字)*","小题号(只能用小写数字)*","小题满分*","间隔分*","评卷分组(只能用小写数字)*","图片序号(用英文逗号分割)","双评比例(0~1)","仲裁阀值","合分策略(1-平均，2-最高，3-最低)","评卷模式(common-普通，track-轨迹)","试评数量(0-跳过试评)","选做题数量"};
 
 	@Autowired
 	private ExamService examService;
@@ -375,8 +375,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
 					msg.append("  大题名称不能超过50个字符");
 				}
 				imp.setDetailName(detailName);
-
-				String detailNumber = trimAndNullIfBlank(line.get(SUBJECT_STRUCT_EXCEL_HEADER[3]));
+				//第4列不处理
+				String detailNumber = trimAndNullIfBlank(line.get(SUBJECT_STRUCT_EXCEL_HEADER[4]));
 				if (StringUtils.isBlank(detailNumber)) {
 					msg.append("  大题号不能为空");
 				} else {
@@ -393,7 +393,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
 
 				}
 
-				String unitNumber = trimAndNullIfBlank(line.get(SUBJECT_STRUCT_EXCEL_HEADER[4]));
+				String unitNumber = trimAndNullIfBlank(line.get(SUBJECT_STRUCT_EXCEL_HEADER[5]));
 				if (StringUtils.isBlank(unitNumber)) {
 					msg.append("  小题号不能为空");
 				} else {
@@ -410,7 +410,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
 
 				}
 
-				String score = trimAndNullIfBlank(line.get(SUBJECT_STRUCT_EXCEL_HEADER[5]));
+				String score = trimAndNullIfBlank(line.get(SUBJECT_STRUCT_EXCEL_HEADER[6]));
 				if (StringUtils.isBlank(score)) {
 					msg.append("  小题满分不能为空");
 				} else {
@@ -431,7 +431,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
 
 				}
 
-				String scoreStep = trimAndNullIfBlank(line.get(SUBJECT_STRUCT_EXCEL_HEADER[6]));
+				String scoreStep = trimAndNullIfBlank(line.get(SUBJECT_STRUCT_EXCEL_HEADER[7]));
 				if (StringUtils.isBlank(scoreStep)) {
 					msg.append("  间隔分不能为空");
 				} else {