央美2025招生优化

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

@@ -877,7 +877,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 					
 					table.addCell(new Cell(1, 1).add("考试科目").setTextAlignment(TextAlignment.CENTER)
 							.setVerticalAlignment(VerticalAlignment.MIDDLE));
-					table.addCell(new Cell(1, 1).add(subject.getSubject_name()).setBold()
+					table.addCell(new Cell(1, 1).add(subject.getSubject_name().equals("书法创作1") ? "书法创作" : subject.getSubject_name()).setBold()
 							.setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontsize));
 					table.addCell(new Cell(1, 1).add("考试时间").setTextAlignment(TextAlignment.CENTER)
 							.setVerticalAlignment(VerticalAlignment.MIDDLE));
@@ -1564,14 +1564,16 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 			File tempFile = ArtFileHelper.createTempFile();
 			doc = pageModel.prepareDocument(tempFile);
 			doc.setBorder(null);
-			doc.setMargins(50, 60, 30, 60);
+			doc.setMargins(50, 60, 30, 30);
 			doc.setFont(getSchoolFont());
 			Paragraph p1 = null;
 			int height = 20;
 			int fontSize = 25;
 			int left = -10;
 			int marginTop = 20;
+			int roomNameMarginTop = 20;
 			int titleLeft = 30;
+			int roomNameFontSize = 25;
 			String agentName = getAgentName(group);
 			List<LyRoomWritten> roomArray = this.daoRoom.listRoom(group.getLy_group_id());
 			Map<LyRoomWritten, List<Map<String, Object>>> roomStdMap = new LinkedHashMap<LyRoomWritten, List<Map<String, Object>>>();
@@ -1587,6 +1589,18 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 			while(itRoom.hasNext()) {
 				index++;
 				LyRoomWritten room = itRoom.next();
+				if(room.getRoom_name().length() > 13 && room.getRoom_name().length() < 16) {
+					roomNameFontSize = 24;
+					roomNameMarginTop = 21;
+				}
+				if(room.getRoom_name().length() == 16) {
+					roomNameFontSize = 23;
+					roomNameMarginTop = 23;
+				}
+				if(room.getRoom_name().length() > 16) {
+					roomNameFontSize = 21;
+					roomNameMarginTop = 24;
+				}
 				if (room.getReal_std_total() < 1) continue;
 				
 				p1 = new Paragraph("中央美术学院").setFontSize(40).setBold().setTextAlignment(TextAlignment.CENTER);
@@ -1600,7 +1614,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(20).setMarginTop(25).setBold().setBorder(Border.NO_BORDER).setTextAlignment(TextAlignment.LEFT).setMarginLeft(left).setHeight(height));
+				stdTable.addCell(new Cell(1,1).add(room.getRoom_name()).setFontSize(roomNameFontSize).setMarginTop(roomNameMarginTop).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));