央美2025招生优化

src/cn/hmsoft/art/enrol/business/ticket/Ticket10047.java

@@ -614,7 +614,7 @@ public class Ticket10047 extends TicketHelper {
 		stdTable.addCell(
 				new Cell(1, 3).add(std.getCert_id()).setFontSize(std_font).setBold().setMarginLeft(-5).setBorder(null));
 		
-		stdTable.addCell(new Cell(1, 1).add("省         份：").setFontSize(std_font)
+		stdTable.addCell(new Cell(1, 1).add("生  源  地：").setFontSize(std_font)
 				.setVerticalAlignment(VerticalAlignment.MIDDLE).setHorizontalAlignment(HorizontalAlignment.RIGHT)
 				.setTextAlignment(TextAlignment.LEFT).setBorder(null));
 		stdTable.addCell(
@@ -804,31 +804,31 @@ public class Ticket10047 extends TicketHelper {
 
 		// 添加须知
 		Table noticeTable = new Table(1).setBorder(null);
-		noticeTable.setFontSize(9);
+		noticeTable.setFontSize(10);
 		noticeTable.addCell(new Cell(1, 1).add("考生须知").setFontSize(bFontSize).setTextAlignment(TextAlignment.LEFT)
 				.setBold().setBorder(null));
 
 		Paragraph p1 = new Paragraph(
-				"1.考生凭《准考证》和有效身份证原件按规定时间和地点参加考试，《准考证》正、反两面在考试期间不得书写或涂画。").setFixedLeading(8)
+				"一、考生凭《准考证》和有效身份证原件按规定时间和地点参加考试，《准考证》正、反两面在考试期间不得书写或涂画。").setFixedLeading(8)
 				.setMultipliedLeading(1.2f);
 		noticeTable.addCell(new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorder(null));
-		p1 = new Paragraph("2.线上考试合格的考生在参加第一科考试入场时将线上考试纸质试卷交给所在考场的监考员。").setMarginTop(0)
+		p1 = new Paragraph("二、线上考试合格的考生在参加第一科考试入场时将线上考试纸质试卷交给所在考场的监考员。").setMarginTop(0)
 				.setFixedLeading(8).setMultipliedLeading(1.2f);
 		noticeTable.addCell(new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorder(null));
 		p1 = new Paragraph(
-				"3.考生只准携带绘画工具、画板、画架、颜料、黑色签字笔、铅笔、橡皮、笔、墨工具及毡子等考试规定的考试用品参加笔试。不得携带任何书刊、报纸、稿纸、图片、资料、具有通讯功能的工具（如手机、智能手表（手环）、智能眼镜和照相、扫描等设备）或者有存储、编程、查询功能的电子用品以及涂改液、修正带等物品进入考场。").setMarginTop(
+				"三、考生只准携带绘画工具、画板、画架、颜料、黑色签字笔、铅笔、橡皮、笔、墨、毛毡等考试规定的考试用品参加笔试。不得携带任何书刊、报纸、稿纸、图片、资料、具有通讯功能的工具（如手机、智能手表（手环）、智能眼镜和照相、扫描等设备）或者有存储、编程、查询功能的电子用品以及涂改液、修正带等物品进入考场。").setMarginTop(
 				0).setFixedLeading(8).setMultipliedLeading(1.2f);
 		noticeTable.addCell(new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorder(null));
 		p1 = new Paragraph(
-				"4.考美术学类(造型艺术)、中国画(造型基础类)专业考生上、下午入场时抽签确定座位，中国画(造型基础类)专业速写科目座位同专业写生。抽签位置为前排的考生在使用画架时，高度以不遮挡后排考生为原则。中国画(笔墨基础类)、书法学、美术学类(实验与科技)、设计学类(艺术设计)、艺术设计学、设计学类(城市艺术设计)、文物保护与修复、建筑学、美术学、美术学(中外合作办学)专业考生严禁使用画架。 ")
+				"四、美术学类(造型艺术)、中国画(造型基础类)专业考生上、下午入场时抽签确定座位，中国画(造型基础类)专业《速写》科目座位同《专业写生》科目。抽签位置为前排的考生在使用画架时，高度以不遮挡后排考生为原则。中国画(笔墨基础类)、书法学、美术学类(实验与科技)、设计学类(艺术设计)、艺术设计学、设计学类(城市艺术设计)、文物保护与修复、建筑学、美术学、美术学(中外合作办学)专业考生按《准考证》显示座位号入座，使用桌椅类考场考试，严禁使用画架。 ")
 				.setMarginTop(0).setFixedLeading(8).setMultipliedLeading(1.2f);
 		noticeTable.addCell(new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorder(null));
 		p1 = new Paragraph(
-				"5.开考15分钟后，迟到考生不得进入考场参加考试。美术学类(造型艺术)、中国画(造型基础类)专业考生交卷出场时间不得早于考试结束前60分钟，其他专业不得提前交卷。 ").setMarginTop(
+				"五、开考15分钟后，迟到考生不得进入考场参加考试。美术学类(造型艺术)、中国画(造型基础类)专业考生交卷出场时间不得早于考试结束前60分钟，其他专业不得提前交卷。 ").setMarginTop(
 						0).setFixedLeading(8)
 				.setMultipliedLeading(1.2f);
 		noticeTable.addCell(new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorder(null));
-		p1 = new Paragraph("6.本次考试属国家教育考试的组成部分，考生应自觉遵守考场纪律，服从考试安排。考生不遵守考场规则，不服从考务工作人员管理，有违纪、作弊等行为的，将按照《中华人民共和国教育法》及《国家教育考试违规处理办法》进行处理，并按规定记入国家教育考试考生诚信档案；涉嫌违法的，移送司法机关，依照《中华人民共和国刑法》等追究法律责任。").setMarginTop(0).setFixedLeading(8).setMultipliedLeading(1.2f);
+		p1 = new Paragraph("六、本次考试属国家教育考试的组成部分，考生应自觉遵守考场纪律，服从考试安排。考生不遵守考场规则，不服从考务工作人员管理，有违纪、作弊等行为的，将按照《中华人民共和国教育法》以及《国家教育考试违规处理办法》进行处理，并按规定记入国家教育考试考生诚信档案；涉嫌违法的，移送司法机关，依照《中华人民共和国刑法》等追究法律责任。").setMarginTop(0).setFixedLeading(8).setMultipliedLeading(1.2f);
 		noticeTable.addCell(new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorder(null));
 		/*p1 = new Paragraph("7.考生交卷出场时间不得早于考试结束前60分钟，交卷出场后不得再进场续考，也不得在考点规定的区域逗留或者交谈。").setMarginTop(0)
 				.setFixedLeading(8).setMultipliedLeading(1.2f);

src/cn/hmsoft/art/service/ly/material/written/WrittenMaterial10047.java

@@ -639,6 +639,9 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 							std.containsKey("std_image") ? std.get("std_image").toString() : "cert.jpg");
 
 					int row_margin = -2;
+					if(group.getGroup_name().contains("中国画")) {
+						row_margin = -4;
+					}
 
 					stdTable.addCell(new Cell(1, 2).setBorder(null).add(imgStdUpload.scaleAbsolute(72, 90))
 							.setMarginTop(0).setHorizontalAlignment(HorizontalAlignment.CENTER)
@@ -650,7 +653,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 							.setBorder(null)).setTextAlignment(TextAlignment.CENTER).setBold()
 							.setVerticalAlignment(VerticalAlignment.MIDDLE);
 					// 准考证号
-					stdTable.addCell(new Cell(1, 1).add(" 准考证：").setBorder(null).setMarginTop(row_margin)
+					stdTable.addCell(new Cell(1, 1).add(" 准考号：").setBorder(null).setMarginTop(row_margin)
 							.setHorizontalAlignment(HorizontalAlignment.RIGHT)
 							.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(8).setMarginLeft(6));
 					stdTable.addCell(new Cell(1, 1).add(std.get("aspect_ticket_num").toString()).setBorder(null)
@@ -675,25 +678,35 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 							.setBold().setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(10)
 							.setTextAlignment(TextAlignment.LEFT));
 					
-					if(group.getGroup_name().contains("美术鉴赏与写作（美术学）")) {
-						stdTable.addCell(new Cell(1, 2).add(group.getShow_aspect_name()+"：").setBorder(null).setMarginTop(2)
+					if(group.getGroup_name().contains("美术鉴赏与写作")) {
+//						stdTable.addCell(new Cell(1, 2).add(group.getShow_aspect_name()+"：").setBorder(null).setMarginTop(2)
+//								.setHorizontalAlignment(HorizontalAlignment.CENTER)
+//								.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(8));
+						stdTable.addCell(new Cell(1, 2).add("科目1：______________").setBorder(null).setMarginTop(2)
 								.setHorizontalAlignment(HorizontalAlignment.CENTER)
 								.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(8));
-						stdTable.addCell(new Cell(1, 2).add("________________").setBorder(null).setMarginTop(0)
+					} else if(group.getGroup_name().contains("美术鉴赏（美术学中外综合办学）")){
+						stdTable.addCell(new Cell(1, 2).add("科目1：______________").setBorder(null).setMarginTop(2)
 								.setHorizontalAlignment(HorizontalAlignment.CENTER)
 								.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(8));
-					} else if(group.getGroup_name().contains("美术鉴赏（美术学中外综合办学）")){
-						stdTable.addCell(new Cell(1, 2).add("笔试：________________").setBorder(null).setMarginTop(2)
+						stdTable.addCell(new Cell(1, 2).add("科目2：______________").setBorder(null).setMarginTop(2)
+								.setHorizontalAlignment(HorizontalAlignment.CENTER)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(8));
+					}else if(group.getGroup_name().contains("中国画")){
+						stdTable.addCell(new Cell(1, 2).add("科目1：______________").setBorder(null).setMarginTop(row_margin)
+								.setHorizontalAlignment(HorizontalAlignment.CENTER)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(8));
+						stdTable.addCell(new Cell(1, 2).add("科目2：______________").setBorder(null).setMarginTop(row_margin)
 								.setHorizontalAlignment(HorizontalAlignment.CENTER)
 								.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(8));
-						stdTable.addCell(new Cell(1, 2).add("面试：________________").setBorder(null).setMarginTop(2)
+						stdTable.addCell(new Cell(1, 2).add("科目3：______________").setBorder(null).setMarginTop(row_margin)
 								.setHorizontalAlignment(HorizontalAlignment.CENTER)
 								.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(8));
-					}else {
-						stdTable.addCell(new Cell(1, 2).add("上午：________________").setBorder(null).setMarginTop(2)
+					} else {
+						stdTable.addCell(new Cell(1, 2).add("科目1：______________").setBorder(null).setMarginTop(2)
 								.setHorizontalAlignment(HorizontalAlignment.CENTER)
 								.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(8));
-						stdTable.addCell(new Cell(1, 2).add("下午：________________").setBorder(null).setMarginTop(2)
+						stdTable.addCell(new Cell(1, 2).add("科目2：______________").setBorder(null).setMarginTop(2)
 								.setHorizontalAlignment(HorizontalAlignment.CENTER)
 								.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(8));
 					}
@@ -1009,7 +1022,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 			pageModel.rotate();
 			
 			String agentName;
-			if(group.getGroup_name().equals("素描（造型艺术）") || group.getGroup_name().equals("色彩（造型艺术）")) {
+			if(group.getGroup_name().equals("素描（造型艺术）") || group.getGroup_name().equals("色彩（造型艺术）") || group.getGroup_name().contains("中国画")) {
 				agentName = "中央美术学院燕郊校区";
 			} else {
 				agentName = "燕京理工学院";
@@ -1022,11 +1035,12 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 			List<CfAspect> aspectArray = this.daoGroup.listBySql(CfAspect.class, sql, group.getLy_group_id());
 			String aspect_names = CollectionHelper.join(aspectArray, "aspect_name", "、"); */
 			List<LySubject> subjectArray = this.daoGroup.listBySql(LySubject.class,
-					"select cf.subject_name,s.exam_start_time,cf.subject_id from cf_subject cf,ly_subject s where cf.subject_id=s.subject_id and s.ly_group_id=? order by exam_start_time",
+					"select cf.subject_name,s.exam_start_time,cf.subject_id,s.exam_end_time from cf_subject cf,ly_subject s where cf.subject_id=s.subject_id and s.ly_group_id=? order by exam_start_time",
 					group.getLy_group_id());
 			List<LyRoomWritten> roomArray = this.daoRoom.listRoom(group.getLy_group_id());
 			int index = 0;
 			int fontSize = 9;
+			int roomNameFontSize = 9;
 			int subjectFontSize;
 			int sum = 0;
 			if (group.getShow_aspect_name().length() > 8) {
@@ -1034,6 +1048,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 			} else {
 				subjectFontSize = 9;
 			}
+
 			for (LySubject subject : subjectArray) {
 				if (index > 0) {
 					doc.add(new AreaBreak());
@@ -1052,14 +1067,14 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 					
 					titleTable.addCell(new Cell(1,1).add("考点名称：").setTextAlignment(TextAlignment.LEFT).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(11).setBold().setBorder(null)).setMarginLeft(0);
 					titleTable.addCell(new Cell(1,1).add(agentName).setTextAlignment(TextAlignment.LEFT).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(11).setBorder(null).setPaddingLeft(-90));
-					titleTable.addCell(new Cell(1,1).add("考试日期：").setTextAlignment(TextAlignment.RIGHT).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(11).setBold().setBorder(null).setPaddingRight(-120));
-					titleTable.addCell(new Cell(1,1).add(getExamDate(subject.getExam_start_time())+getExamDateType(subject.getExam_start_time())).setTextAlignment(TextAlignment.RIGHT)
+					titleTable.addCell(new Cell(1,1).add("考试日期：").setTextAlignment(TextAlignment.RIGHT).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(11).setBold().setBorder(null).setPaddingRight(-90));
+					titleTable.addCell(new Cell(1,1).add(getExamDate(subject.getExam_start_time())+" "+getExamStartAndEndTime(subject.getExam_start_time(), subject.getExam_end_time())).setTextAlignment(TextAlignment.RIGHT)
 							.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(11).setBorder(null).setPaddingRight(0));
 
 					doc.add(titleTable);
 					
 					
-					Table table = new Table(new float[] { 2.4f, 1.7f, 1.5f,0.9f, 2.5f, 1, 1, 1, 1, 1, 1,1}).setWidthPercent(100);
+					Table table = new Table(new float[] { 2.7f, 1.7f, 1.5f,0.8f, 2.3f, 1, 1, 1, 1, 1, 1,1}).setWidthPercent(100);
 					table.addCell(new Cell(2, 1).add("考场编号").setTextAlignment(TextAlignment.CENTER)
 							.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold());
 					table.addCell(new Cell(2, 1).add("考试科目").setTextAlignment(TextAlignment.CENTER)
@@ -1091,30 +1106,34 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 						sum += room.getReal_std_total();
 						if (room.getReal_std_total() < 1)
 							continue;
-						table.addCell(new Cell(1, 1).add(room.getRoom_name()).setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize));
+						if(room.getRoom_name().length() > 15) {
+							roomNameFontSize = 8;
+						}
+						table.addCell(new Cell(1, 1).add(room.getRoom_name()).setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(roomNameFontSize));
 						table.addCell(new Cell(1, 1).add(group.getShow_aspect_name()).setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(subjectFontSize));
 						table.addCell(new Cell(1, 1).add(room.getRoom_addr()).setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize));
 						table.addCell(new Cell(1, 1).add(room.getReal_std_total()+"").setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize));
 						//不同类型的考生号段
-						Map<String,Object> mainStd = this.daoRoom.getTicketSerailNum(room.getLy_room_id(),1);
-						Map<String,Object>  hkStd = this.daoRoom.getTicketSerailNum(room.getLy_room_id(),2);
-						Map<String,Object>  otherStd = this.daoRoom.getTicketSerailNum(room.getLy_room_id(),3);
-						int num = 0;
-						if (StringHelper.isNotEmpty(mainStd))
-							num++;
-						if (StringHelper.isNotEmpty(hkStd))
-							num++;
-						if (StringHelper.isNotEmpty(otherStd))
-							num++;
+						Map<String,Object> mainStd = this.daoRoom.getTicketSerailNum(room.getLy_room_id(),0);
+//						Map<String,Object>  hkStd = this.daoRoom.getTicketSerailNum(room.getLy_room_id(),2);
+//						Map<String,Object>  otherStd = this.daoRoom.getTicketSerailNum(room.getLy_room_id(),3);
+//						int num = 0;
+//						if (StringHelper.isNotEmpty(mainStd))
+//							num++;
+//						if (StringHelper.isNotEmpty(hkStd))
+//							num++;
+//						if (StringHelper.isNotEmpty(otherStd))
+//							num++;
 						String value = "";
 						
 
-						if(num == 1) {
+//						if(num == 1) {
 							value =  room.getMin_ticket_no() + " --- " + room.getMax_ticket_no();
 							if (FrameStatus.Active.toString().equals(group.getAspect_num_flag())) {
 								value =   room.getMin_aspect_ticket_num() + " --- " + room.getMax_aspect_ticket_num();
 							}
-						} else if(num == 2) {
+//						}
+					/*	else if(num == 2) {
 							if(StringHelper.isNotEmpty(mainStd) && StringHelper.isNotEmpty(hkStd)) {
 								value =  mainStd.get("start_num") + (mainStd.get("start_num").equals(mainStd.get("end_num")) ? "\n" : "---" + mainStd.get("end_num")+"\n");
 								value += hkStd.get("start_num") + (hkStd.get("start_num").equals(hkStd.get("end_num")) ? "" : "---" + hkStd.get("end_num"));
@@ -1132,7 +1151,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 							value =  mainStd.get("start_num") + (mainStd.get("start_num").equals(mainStd.get("end_num")) ? "\n" : "---" + mainStd.get("end_num")+"\n");
 							value += hkStd.get("start_num") + (hkStd.get("start_num").equals(hkStd.get("end_num")) ? "\n" : "---" + hkStd.get("end_num")+"\n");
 							value += otherStd.get("start_num") + (otherStd.get("start_num").equals(otherStd.get("end_num")) ? "" : "---" + otherStd.get("end_num"));
-						}
+						}*/
 
 						table.addCell(new Cell(1, 1).add(value).setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE)
 								.setFontSize(fontSize));
@@ -1200,7 +1219,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 	private void createSignNewPage(Document doc, LyAgent agent, LyGroup group, List<LySubject> subjectArray,
 			LyRoomWritten room) {
 		String agentName;
-		if(group.getGroup_name().equals("素描（造型艺术）") || group.getGroup_name().equals("色彩（造型艺术）")) {
+		if (group.getGroup_name().equals("素描（造型艺术）") || group.getGroup_name().equals("色彩（造型艺术）") || group.getGroup_name().contains("中国画")) {
 			agentName = "中央美术学院燕郊校区";
 		} else {
 			agentName = "燕京理工学院";
@@ -1209,7 +1228,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 		Paragraph p1 = new Paragraph("中央美术学院" + ArtParamHelper.ArtYear + "年本科招生现场考试考生签到单").setFontSize(16).setBold()
 				.setTextAlignment(TextAlignment.CENTER);
 		doc.add(p1);
-		Table table = new Table(new float[] { 0.8f, 1.9f, 0.7f, 2f,0.7f, 1.7f, 1f, 1.9f }).setWidthPercent(100);
+		Table table = new Table(new float[] { 0.9f, 1.9f, 0.7f, 2.7f,0.7f, 1.4f, 1f, 1.8f }).setWidthPercent(100);
 		/*table.addCell(new Cell(1,1).add("考点名称：").setTextAlignment(TextAlignment.RIGHT).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(11).setBold().setBorder(null));
 		table.addCell(new Cell(1,1).add("中央美术学院燕郊校区").setTextAlignment(TextAlignment.LEFT).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(11).setBorder(null));
 		table.addCell(new Cell(1,1).add("布展地点：").setTextAlignment(TextAlignment.RIGHT).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(11).setBold().setBorder(null));
@@ -1291,10 +1310,25 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 			return "(下午)";
 		}
 	}
-	
+
+	private String getExamStartAndEndTime(LocalDateTime start_time, LocalDateTime end_time) {
+		DateTimeFormatter start = DateTimeFormatter.ofPattern("HH:mm");
+		DateTimeFormatter end = DateTimeFormatter.ofPattern("HH:mm");
+		if(start_time != null && end_time != null) {
+			return start_time.format(start)+"-" + end_time.format(end);
+		}
+		return null;
+	}
+
+	/**
+	 *  造型艺术和中国画在 中央美术学院燕郊校区，其他专业在 燕京理工学院
+	 * @param group 分组
+	 * @return 考点名称
+	 */
 	private String getAgentName(LyGroup group) {
 		String agentName = "";
-		if(group.getGroup_name().equals("素描（造型艺术）") || group.getGroup_name().equals("色彩（造型艺术）")) {
+		if(group.getGroup_name().equals("素描（造型艺术）") || group.getGroup_name().equals("色彩（造型艺术）")
+				|| group.getGroup_name().contains("中国画")) {
 			agentName = "中央美术学院燕郊校区";
 		} else {
 			agentName = "燕京理工学院";
@@ -1352,7 +1386,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 				doc.add(p1);
 				
 				//标题
-				Table titleTable = new Table(new float[] {1,2,1,2,1,2}).setWidthPercent(100).setBorder(null);
+				Table titleTable = new Table(new float[] {1,2,1,2.5f,1,1.5f}).setWidthPercent(100).setBorder(null);
 				titleTable.addCell(new Cell(1,1).add("考点名称：").setFontSize(titleSize).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
 				titleTable.addCell(new Cell(1,1).add(agentName).setFontSize(titleSize).setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.LEFT).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
 				titleTable.addCell(new Cell(1,1).add("考场编号：").setFontSize(titleSize).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
@@ -1371,13 +1405,13 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 				titleTable.addCell(new Cell(1,1).add("    张").setFontSize(titleSize).setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
 				doc.add(titleTable);
 				
-				Table stdTable = new Table(new float[] {0.6f,1.5f,1.3f,1.5f,1.3f,1.7f,1.5f}).setWidthPercent(100).setBorder(null);
+				Table stdTable = new Table(new float[] {0.6f,1.5f,1.3f,1.5f,0.9f,2.1f,1.5f}).setWidthPercent(100).setBorder(null);
 				stdTable.addCell(new Cell(1,1).add("序号").setFontSize(titleSize).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
-				stdTable.addCell(new Cell(1,1).add("现场考试准考证").setFontSize(titleSize).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
+				stdTable.addCell(new Cell(1,1).add("现场考试准考号").setFontSize(titleSize).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
 				stdTable.addCell(new Cell(1,1).add("姓名").setFontSize(titleSize).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
-				stdTable.addCell(new Cell(1,1).add("线上考试准考证").setFontSize(titleSize).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
-				stdTable.addCell(new Cell(1,1).add("交回").setFontSize(titleSize).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
-				stdTable.addCell(new Cell(1,1).add("未交原因及承诺交回时间").setFontSize(8).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
+				stdTable.addCell(new Cell(1,1).add("线上考试准考号").setFontSize(titleSize).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
+				stdTable.addCell(new Cell(1,1).add("交回打✓").setFontSize(titleSize).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
+				stdTable.addCell(new Cell(1,1).add("未交原因及承诺交回时间").setFontSize(titleSize).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
 				stdTable.addCell(new Cell(1,1).add("未交考生签字").setFontSize(titleSize).setBold().setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
 				
 				
@@ -1495,7 +1529,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 			File tempFile = ArtFileHelper.createTempFile();
 			doc = pageModel.prepareDocument(tempFile);
 			doc.setBorder(null);
-			doc.setMargins(50, 80, 30, 80);
+			doc.setMargins(50, 60, 30, 60);
 			doc.setFont(getSchoolFont());
 			Paragraph p1 = null;
 			int height = 20;
@@ -1531,7 +1565,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 				stdTable.addCell(new Cell(1,1).add("考点名称：").setMarginTop(30).setFontSize(fontSize).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.CENTER).setMarginLeft(titleLeft).setHeight(height));
 				stdTable.addCell(new Cell(1,1).add(agentName).setMarginTop(30).setFontSize(fontSize).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.LEFT).setMarginLeft(left).setHeight(height));
 				stdTable.addCell(new Cell(1,1).add("考场编号：").setFontSize(fontSize).setMarginTop(marginTop).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.CENTER).setMarginLeft(titleLeft).setHeight(height));
-				stdTable.addCell(new Cell(1,1).add(room.getRoom_name()).setFontSize(fontSize).setMarginTop(marginTop).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.LEFT).setMarginLeft(left).setHeight(height));
+				stdTable.addCell(new Cell(1,1).add(room.getRoom_name()).setFontSize(20).setMarginTop(25).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.LEFT).setMarginLeft(left).setHeight(height));
 				stdTable.addCell(new Cell(1,1).add("考场位置：").setFontSize(fontSize).setMarginTop(marginTop).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.CENTER).setMarginLeft(titleLeft).setHeight(height));
 				stdTable.addCell(new Cell(1,1).add(room.getRoom_addr()).setFontSize(fontSize).setMarginTop(marginTop).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.LEFT).setMarginLeft(left).setHeight(height));
 				stdTable.addCell(new Cell(1,1).add("准  考  证：").setFontSize(fontSize).setBold().setMarginTop(marginTop).setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.CENTER).setMarginLeft(titleLeft).setHeight(height));
@@ -1544,7 +1578,11 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 				if(group.getGroup_name().equals("篆刻创作（书法学）") || group.getGroup_name().equals("书法创作")) {
 					stdTable.addCell(new Cell(1,1).add(room.getReal_std_total()*2 + "     张").setFontSize(fontSize).setMarginTop(marginTop).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.LEFT).setMarginLeft(left).setHeight(height));
 				} else {
-					stdTable.addCell(new Cell(1,1).add(room.getReal_std_total() + "     张").setFontSize(fontSize).setMarginTop(marginTop).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.LEFT).setMarginLeft(left).setHeight(height));
+					if(room.getReal_std_total() < 10) {
+						stdTable.addCell(new Cell(1,1).add(room.getReal_std_total() + "       张").setFontSize(fontSize).setMarginTop(marginTop).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.LEFT).setMarginLeft(left).setHeight(height));
+					} else {
+						stdTable.addCell(new Cell(1,1).add(room.getReal_std_total() + "     张").setFontSize(fontSize).setMarginTop(marginTop).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.LEFT).setMarginLeft(left).setHeight(height));
+					}
 				}
 				
 				stdTable.addCell(new Cell(1,1).add("实        收：").setFontSize(fontSize).setMarginTop(marginTop).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.CENTER).setMarginLeft(titleLeft).setHeight(height));