央美2025招生优化

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

@@ -81,22 +81,25 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 				//考场地址和考场编号部分
 				int fontsize = 60;
 				String roomName = room.getRoom_name();
-				if (roomName.length() > 12 && roomName.length() < 16) {
+				System.out.println(roomName.length()+"***");
+				if (roomName.length() > 12 && roomName.length() <= 16) {
 					fontsize = 50;
 				} else if (roomName.length() > 16) {
-					fontsize = 43;
+					fontsize = 49;
 				}
-				p1 = new Paragraph(roomName).setFontSize(fontsize).setBold().setTextAlignment(TextAlignment.CENTER);
+				p1 = new Paragraph(roomName).setFontSize(fontsize).setBold().setTextAlignment(TextAlignment.CENTER).setMarginTop(10);
 				doc.add(p1);
+
+				int lineHeight = 20;
 				// 考场地址
-				p1 = new Paragraph(room.getRoom_addr()).setFontSize(40).setBold().setMarginTop(-10).setTextAlignment(TextAlignment.CENTER);
+				p1 = new Paragraph(room.getRoom_addr()).setFontSize(50).setBold().setMarginTop(lineHeight).setTextAlignment(TextAlignment.CENTER);
 				doc.add(p1);
-				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);
+				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 ticketFontSize = 40;
-				int num = 0;
+				int ticketFontSize = 50;
+			/*	int num = 0;
 				if (StringHelper.isNotEmpty(mainStd))
 					num++;
 				if (StringHelper.isNotEmpty(hkStd))
@@ -107,17 +110,17 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 					ticketFontSize = 35;
 				} else if (num == 3) {
 					ticketFontSize = 32;
-				}
+				}*/
 				// 准考证范围
 				if(StringHelper.isNotEmpty(mainStd)) {
 					if(!mainStd.get("start_num").equals(mainStd.get("end_num"))) {
-						p1 = new Paragraph(mainStd.get("start_num").toString()+"---"+mainStd.get("end_num")).setMarginTop(-10).setFontSize(ticketFontSize).setBold().setTextAlignment(TextAlignment.CENTER);
+						p1 = new Paragraph(mainStd.get("start_num").toString()+"---"+mainStd.get("end_num")).setMarginTop(lineHeight).setFontSize(ticketFontSize).setBold().setTextAlignment(TextAlignment.CENTER);
 					} else {
-						p1 = new Paragraph(mainStd.get("start_num").toString()).setMarginTop(-10).setFontSize(ticketFontSize).setBold().setTextAlignment(TextAlignment.CENTER);
+						p1 = new Paragraph(mainStd.get("start_num").toString()).setMarginTop(lineHeight).setFontSize(ticketFontSize).setBold().setTextAlignment(TextAlignment.CENTER);
 					}
 					doc.add(p1);
 				} 
-				if(StringHelper.isNotEmpty(hkStd)) {
+				/*if(StringHelper.isNotEmpty(hkStd)) {
 					if(!hkStd.get("start_num").equals(hkStd.get("end_num"))) {
 						p1 = new Paragraph(hkStd.get("start_num").toString()+"---"+hkStd.get("end_num")).setMarginTop(-20).setFontSize(ticketFontSize).setBold().setTextAlignment(TextAlignment.CENTER);
 					} else {
@@ -132,17 +135,17 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 						p1 = new Paragraph(otherStd.get("start_num").toString()).setMarginTop(-20).setFontSize(ticketFontSize).setBold().setTextAlignment(TextAlignment.CENTER);
 					}
 					doc.add(p1);
-				} 
+				} */
 				
 				//考试科目
-				String group_name = StringHelper.isEmpty(group.getShow_aspect_name()) ? group.getGroup_name(): group.getShow_aspect_name();
+				/*String group_name = StringHelper.isEmpty(group.getShow_aspect_name()) ? group.getGroup_name(): group.getShow_aspect_name();
 				p1 = new Paragraph(group_name).setFontSize(ticketFontSize).setBold().setTextAlignment(TextAlignment.CENTER).setMarginTop(-10);
 				doc.add(p1);
 				
 				//考试时间
 				LySubject subject = this.daoGroup.find(LySubject.class,"ly_group_id", group.getLy_group_id());
 				p1 = new Paragraph(getExamTime(subject.getExam_start_time(), subject.getExam_end_time())).setFontSize(ticketFontSize).setBold().setTextAlignment(TextAlignment.CENTER);;
-				doc.add(p1);
+				doc.add(p1);*/
 
 				if (roomIndex < roomArray.size() - 1) {
 					doc.add(new AreaBreak());
@@ -202,15 +205,21 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 					Image imgStdUpload = ArtFileHelper.generateStdImage(
 							std.containsKey("std_image") ? std.get("std_image").toString() : "cert.jpg");
 					
-					if(StringHelper.isEmpty(std.get("ly_room_seq"))) {
+					if(StringHelper.isEmpty(std.get("ly_room_seq")) || String.valueOf(std.get("ly_room_seq")).equals("0") ) {
 						rowNum = 4;
 						rowHeight = 27;
 					}
 					if(String.valueOf(std.get("room_name")).length()>10) {
-						imageLeft = -15;
+						imageLeft = 0;
+					}
+					if (String.valueOf(std.get("room_name")).length() > 15 && String.valueOf(std.get("room_name")).length() < 17) {
+						roomNameSize = 8;
 					}
-					if(String.valueOf(std.get("room_name")).length()>20) {
-						roomNameSize=5;
+					if (String.valueOf(std.get("room_name")).length() == 17) {
+						roomNameSize = 7;
+					}
+					if (String.valueOf(std.get("room_name")).length() > 20) {
+						roomNameSize = 6;
 					}
 					Table stdTable = new Table(new float[] { 1f,1.7f,1.3f }).setWidthPercent(100).setMarginTop(15).setBorder(null);
 					stdTable.addCell(new Cell(1, 1).add("考场编号:" )
@@ -231,9 +240,8 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 					stdTable.addCell(new Cell(1, 1).add(std.get("room_addr").toString()).setBold()
 							.setMarginBottom(0).setMarginLeft(left).setFontSize(fontSize)
 							.setTextAlignment(TextAlignment.LEFT).setVerticalAlignment(VerticalAlignment.MIDDLE).setBorder(null));
-					
-					
-					if(StringHelper.isNotEmpty(std.get("ly_room_seq"))){
+
+					if(StringHelper.isNotEmpty(std.get("ly_room_seq")) && !String.valueOf(std.get("ly_room_seq")).equals("0")){
 						stdTable.addCell(new Cell(1, 1).add("座  位  号:" )
 								.setBold().setMarginBottom(0).setFontSize(fontSize) 
 								.setTextAlignment(TextAlignment.LEFT).setMarginLeft(20)
@@ -786,12 +794,12 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 					"select cf.subject_name,s.exam_start_time,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());
-			String agentName;
-			if(group.getGroup_name().equals("素描（造型艺术）") || group.getGroup_name().equals("色彩（造型艺术）")) {
+			String agentName = getAgentName(group);
+			/*if(group.getGroup_name().equals("素描（造型艺术）") || group.getGroup_name().equals("色彩（造型艺术）")) {
 				agentName = "中央美术学院燕郊校区";
 			} else {
 				agentName = "燕京理工学院";
-			}
+			}*/
 			int index = 0;
 			subjectArray = subjectArray.subList(0, 1);
 			for (LySubject subject : subjectArray) {
@@ -815,25 +823,46 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 									.setBold().setTextAlignment(TextAlignment.CENTER).setMarginTop(-2);
 					doc.add(p1);
 					
-					int fontsize = 12;
+					int fontsize = 11;
 					int marginLeft = 0;
 					if(room.getRoom_name().length()>15) {
-						fontsize = 10;
 						marginLeft = -25;
 					}
+
 					
 					Table tableTitle;
 					if(agentName.equals("中央美术学院燕郊校区")) {
-						tableTitle= new Table(new float[] { 1.2f, 1.4f, 1.2f}).setWidthPercent(100);
+						tableTitle= new Table(new float[] { 1.2f, 1.7f, 1.1f}).setWidthPercent(100);
+					} else {
+						tableTitle= new Table(new float[] { 1.1f, 1.6f, 1.2f}).setWidthPercent(100);
+					}
+
+					if(room.getRoom_name().length()>20) {
+						fontsize = 11;
+						marginLeft = -30;
+						tableTitle= new Table(new float[] { 1f, 2f, 1f}).setWidthPercent(100);
+
+						tableTitle.addCell(new Cell(1, 1).add("考点：" + agentName).setTextAlignment(TextAlignment.LEFT)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(11).setMarginLeft(32));
+						tableTitle.addCell(new Cell(1, 1).add("考场编号：" + room.getRoom_name()).setTextAlignment(TextAlignment.CENTER)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(fontsize)).setMarginLeft(marginLeft);
+						tableTitle.addCell(new Cell(1, 1).add("考场位置：" + room.getRoom_addr()).setTextAlignment(TextAlignment.RIGHT)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(11));
+					} else if(room.getRoom_name().length() > 15) {
+						tableTitle.addCell(new Cell(1, 1).add("考点：" + agentName).setTextAlignment(TextAlignment.LEFT)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(11).setMarginLeft(22));
+						tableTitle.addCell(new Cell(1, 1).add("考场编号：" + room.getRoom_name()).setTextAlignment(TextAlignment.CENTER)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(fontsize)).setMarginLeft(marginLeft);
+						tableTitle.addCell(new Cell(1, 1).add("考场位置：" + room.getRoom_addr()).setTextAlignment(TextAlignment.RIGHT)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(11));
 					} else {
-						tableTitle= new Table(new float[] { 1.1f, 1.5f, 1.2f}).setWidthPercent(100);
+						tableTitle.addCell(new Cell(1, 1).add("考点：" + agentName).setTextAlignment(TextAlignment.LEFT)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(11));
+						tableTitle.addCell(new Cell(1, 1).add("考场编号：" + room.getRoom_name()).setTextAlignment(TextAlignment.CENTER)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(fontsize)).setMarginLeft(marginLeft);
+						tableTitle.addCell(new Cell(1, 1).add("考场位置：" + room.getRoom_addr()).setTextAlignment(TextAlignment.RIGHT)
+								.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(11));
 					}
-					tableTitle.addCell(new Cell(1, 1).add("考点：" + agentName).setTextAlignment(TextAlignment.LEFT)
-							.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(12));
-					tableTitle.addCell(new Cell(1, 1).add("考场编号：" + room.getRoom_name()).setTextAlignment(TextAlignment.CENTER)
-							.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(fontsize)).setMarginLeft(marginLeft);
-					tableTitle.addCell(new Cell(1, 1).add("考场位置：" + room.getRoom_addr()).setTextAlignment(TextAlignment.RIGHT)
-							.setVerticalAlignment(VerticalAlignment.MIDDLE).setBold().setBorder(null).setFontSize(12));
 					doc.add(tableTitle);
 
 					
@@ -896,24 +925,25 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 							+ "	( select subject_id from ly_subject where ly_group_id=?) and ts.aspect_id=p.aspect_id", group.getLy_group_id());
 					
 					//准考证号段
-					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> mainStd = this.daoRoom.getTicketSerailNum(room.getLy_room_id(),0);
+					int height =25;
+					/*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;
-					int height =25;
 					if (StringHelper.isNotEmpty(mainStd))
 						num++;
 					if (StringHelper.isNotEmpty(hkStd))
 						num++;
 					if (StringHelper.isNotEmpty(otherStd))
-						num++;
+						num++;*/
 					String value = "";
-					if(num ==1) {
+//					if(num ==1) {
 						value = aspect.getAspect_name()+" "+room.getMin_ticket_no() + " --- " + room.getMax_ticket_no();
 						if (FrameStatus.Active.toString().equals(group.getAspect_num_flag())) {
 							value =  aspect.getAspect_name()+" "+room.getMin_aspect_ticket_num() + " --- " + room.getMax_aspect_ticket_num();
 						}
-					} else if(num == 2) {
+//					}
+					/*else if(num == 2) {
 						height = 23;
 						if(StringHelper.isNotEmpty(mainStd) && StringHelper.isNotEmpty(hkStd)) {
 							value =  aspect.getAspect_name() + " " + mainStd.get("start_num") + (mainStd.get("start_num").equals(mainStd.get("end_num")) ? "\n" : "---" + mainStd.get("end_num")+"\n");
@@ -933,7 +963,7 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 						value =  aspect.getAspect_name() + " " + mainStd.get("start_num") + (mainStd.get("start_num").equals(mainStd.get("end_num")) ? "\n" : "---" + mainStd.get("end_num")+"\n");
 						value += aspect.getAspect_name() + " " + hkStd.get("start_num") + (hkStd.get("start_num").equals(hkStd.get("end_num")) ? "\n" : "---" + hkStd.get("end_num")+"\n");
 						value += aspect.getAspect_name() + " " + otherStd.get("start_num") + (otherStd.get("start_num").equals(otherStd.get("end_num")) ? "" : "---" + otherStd.get("end_num"));
-					}
+					}*/
 					
 					table.addCell(new Cell(1, 5).add(value).setTextAlignment(TextAlignment.LEFT)
 							.setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(10).setBold());
@@ -957,8 +987,8 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 							.setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height)));
 					table2.addCell((new Cell(1, 1).add("姓名")
 							.setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height)));
-					
-					for(int temp = 0;temp<=4;temp++) {
+
+					for (int temp = 0; temp <= 4; temp++) {
 						table2.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
 						table2.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
 						table2.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
@@ -973,15 +1003,15 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 							.setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE)));
 					table2.addCell((new Cell(1, 1).add("姓名")
 							.setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE)));
-					table2.addCell((new Cell(1, 3).add("违规行为")
-							.setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE)));
-					table2.addCell((new Cell(1, 1).add("考生签字")
+					table2.addCell((new Cell(1, 4).add("违规行为")
 							.setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE)));
+					/*table2.addCell((new Cell(1, 1).add("考生签字")
+							.setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE)));*/
 					for (int temp = 0; temp <= 4; temp++) {
 						table2.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
 						table2.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
-						table2.addCell(new Cell(1, 3).add(" ").setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
-						table2.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
+						table2.addCell(new Cell(1, 4).add(" ").setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
+//						table2.addCell(new Cell(1, 1).add(" ").setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setHeight(height));
 					}
 					
 					table2.addCell(new Cell(1, 6).add("考场情况").setPaddingLeft(10)
@@ -1197,14 +1227,19 @@ public class WrittenMaterial10047 extends WrittenMaterialDefault {
 	
 	
 	private void createSeatTitle(Document doc, LyGroup group, LyRoomWritten room) {
-		String agentName;
-		if(group.getGroup_name().equals("素描（造型艺术）") || group.getGroup_name().equals("色彩（造型艺术）")) {
+		String agentName = getAgentName(group);
+		/*if(group.getGroup_name().equals("素描（造型艺术）") || group.getGroup_name().equals("色彩（造型艺术）")) {
 			agentName = "中央美术学院燕郊校区";
 		} else {
 			agentName = "燕京理工学院";
+		}*/
+		Table table;
+		if(agentName.equals("中央美术学院燕郊校区")) {
+			table = new Table(new float[] { 1.3f, 1.9f, 1f, 2f,1f, 1.5f }).setWidthPercent(100);
+		} else {
+			table = new Table(new float[] { 1.3f, 1.5f, 1f, 2.3f,1f, 1.4f }).setWidthPercent(100);
 		}
-		int fontSize = 11;
-		Table table = new Table(new float[] { 1.3f, 1.9f, 1f, 2f,1f, 1.5f }).setWidthPercent(100);
+		int fontSize = 10;
 		table.addCell(new Cell(1,1).add("考点名称：").setTextAlignment(TextAlignment.RIGHT).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setBold().setBorder(null).setMarginLeft(20).setMarginTop(10));
 		table.addCell(new Cell(1,1).add(agentName).setTextAlignment(TextAlignment.LEFT).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setBorder(null).setMarginTop(10));
 		table.addCell(new Cell(1,1).add("考场编号：").setTextAlignment(TextAlignment.RIGHT).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(fontSize).setBold().setBorder(null).setMarginTop(10));