优化

src/cn/hmsoft/art/control/score/ScoreYmControl.java

@@ -120,7 +120,7 @@ public class ScoreYmControl extends ArtControl {
 	@CrossOrigin
 	@RequestMapping("score/ymfinal/upload")
 	public Ajax ymfinalUpload(MultipartFile file) throws Exception {
-		List<List<String>> values = ExcelReaderHelper.readSheet(file.getOriginalFilename(), file.getInputStream(), 1, 16);
+		List<List<String>> values = ExcelReaderHelper.readSheet(Objects.requireNonNull(file.getOriginalFilename()), file.getInputStream(), 1, 16);
 		final FrameOptr optr = this.getFrameOptr();
 		if (values.size() > 100) {
 			// 超过100条用 线程模式

src/cn/hmsoft/art/control/score/ScoreYmService.java

@@ -222,8 +222,9 @@ public class ScoreYmService extends ArtService {
 		FrameThreadHelper.updateThread(thread, 1, "复试成绩", FrameThreadStatus.Running);
 		int row = 2;
 		int total = 0;
-		List<Map<String, Object>> enrolList = this.daoEnrol.listMapBySql("select s.std_id,s.cert_id,e.aspect_ticket_num,e.aspect_name,e.aspect_id from std_enrol e,std_reg s where e.std_id=s.std_id");
-		Map<String, Map<String, Object>> enrolMap = new HashMap<String, Map<String, Object>>();
+		List<Map<String, Object>> enrolList = this.daoEnrol.listMapBySql(
+				"select s.std_id,s.cert_id,e.aspect_ticket_num,e.aspect_name,e.aspect_id from std_enrol e,std_reg s where e.std_id=s.std_id");
+		Map<String, Map<String, Object>> enrolMap = new HashMap<>();
 		for (Map<String, Object> map : enrolList) {
 			enrolMap.put(map.get("cert_id").toString(), map);
 		}
@@ -242,7 +243,7 @@ public class ScoreYmService extends ArtService {
 			String aspect_level = list.get(11) == null ? null : list.get(11).trim();//专业排名
 			String aspect_qualified = list.get(12) == null ? null : list.get(12).trim();//是否合格
 			String wei_gui = list.get(13) == null ? null : list.get(13).trim();//是否违规
-			String pdf = list.get(14) == null ? null : list.get(14).trim();//是否违规
+			String pdf = list.get(14) == null ? null : list.get(14).trim();//违规证据
 			String remark = list.get(15) == null ? null : list.get(15).trim();//成绩备注
 			
 			if (StringHelper.isEmpty(cert_id)) {
@@ -276,7 +277,7 @@ public class ScoreYmService extends ArtService {
 				score.setStd_id(Integer.valueOf(stdMap.get("std_id").toString()));
 				score.setCert_id(cert_id);
 				score.setStd_name(std_name);
-				score.setTicket_no(stdList != null && stdList.size()==1 ? stdList.get(0).getTicket_no() : null);
+				score.setTicket_no(stdList != null && stdList.size() == 1 ? stdList.get(0).getTicket_no() : null);
 				score.setAspect_name(aspect_name);
 				score.setAspect_score(aspect_score);
 				score.setAspect_level(aspect_level);