央美优化

src/cn/hmsoft/art/enrol/business/decision/DecisionHelper.java

@@ -111,7 +111,7 @@ public abstract class DecisionHelper {
             doc.add(p1);
 
             //第三段
-            Text text = new Text("根据《国家教育考试违规处理办法》及《中央美术学院2024年本科招生线上考试考场规则》相关规定，现给予你如下处理：");
+            Text text = new Text("根据《国家教育考试违规处理办法》及《中央美术学院2025年本科招生线上考试考场规则》相关规定，现给予你如下处理：");
             p1 = new Paragraph(text).setFontSize(fontSize).setTextAlignment(TextAlignment.LEFT).setFixedLeading(8)
                     .setMultipliedLeading(lineHeight).setFirstLineIndent(30f);
             doc.add(p1);
@@ -224,7 +224,7 @@ public abstract class DecisionHelper {
             doc.add(p1);
 
             //第三段
-            Text text = new Text("根据《国家教育考试违规处理办法》及《中央美术学院2024年本科招生线上考试考场规则》相关规定，拟对你作出如下处理：");
+            Text text = new Text("根据《国家教育考试违规处理办法》及《中央美术学院2025年本科招生线上考试考场规则》相关规定，拟对你作出如下处理：");
             p1 = new Paragraph(text).setFontSize(fontSize).setTextAlignment(TextAlignment.LEFT).setFixedLeading(8)
                     .setMultipliedLeading(lineHeight).setFirstLineIndent(30f);
             doc.add(p1);

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

@@ -74,7 +74,7 @@ public class Ticket10047 extends TicketHelper {
 	
 	
 	//央美本科准考证(初试)
-	protected void makePdfFile(LyStdTicketDao daoTicket, LyStdTicket ticket, StdReg std, LyAgent lyAgent, CfAgent agent,
+	protected void makePdfFile_BKCS(LyStdTicketDao daoTicket, LyStdTicket ticket, StdReg std, LyAgent lyAgent, CfAgent agent,
 			CfCategory category, Image imgStdUpload, Document doc, PdfFont pdfFont) {
 		doc.setMargins(30, 50, 20, 50);
 		Table headTable = new Table(new float[] { 1.3f, 6f });
@@ -502,7 +502,7 @@ public class Ticket10047 extends TicketHelper {
 	
 	
 	//本科准考证生成方法-复试
-	protected void makePdfFile_BKFS(LyStdTicketDao daoTicket, LyStdTicket ticket, StdReg std, LyAgent lyAgent, CfAgent agent,
+	protected void makePdfFile(LyStdTicketDao daoTicket, LyStdTicket ticket, StdReg std, LyAgent lyAgent, CfAgent agent,
 			CfCategory category, Image imgStdUpload, Document doc, PdfFont pdfFont) {
 		doc.setMargins(30, 50, 20, 50);
 		doc.setFont(getSchoolFont("10047"));
@@ -580,7 +580,9 @@ public class Ticket10047 extends TicketHelper {
 		//区分考点
         if (enrol != null && enrol.getAspect_name().equals("造型艺术")) {
             agentName = "中央美术学院燕郊校区";
-        }
+        } else {
+			agentName = "燕京理工学院";
+		}
 
         stdTable.addCell(new Cell(1, 1).add(std.getStd_name()).setFontSize(std_name_font).setBold().setMarginLeft(-5)
 				.setHorizontalAlignment(HorizontalAlignment.LEFT).setVerticalAlignment(VerticalAlignment.MIDDLE)

src/cn/hmsoft/art/service/ly/ticket/Ticket10047.java

@@ -50,7 +50,7 @@ public class Ticket10047 extends TicketHelper {
 			"select * from ly_std_ticket  where ly_agent_id=? and (category_id=? or 1=?)) b on a.std_id=b.std_id ) f where ticket_no is null     ";
 	
 	
-	@Override
+	/*@Override
 	protected void makeTicket(LyStdTicketDao daoTicket, LyAgent agent) {
 		CfCategory category = daoTicket.find(CfCategory.class, 1);
 		//建筑学和美术学-初试准考证不生成
@@ -70,7 +70,7 @@ public class Ticket10047 extends TicketHelper {
 
 			//大陆考生
 			List<StdReg> stdArray = daoTicket.listBySql(StdReg.class, LIST_STD, agent.getLy_agent_id(),  category.getCategory_id(),
-					category.getCategory_id() == null ? 1 : category.getCategory_id(), aspect.getAspect_id() , agent.getLy_agent_id(), category.getCategory_id(), 
+					category.getCategory_id() == null ? 1 : category.getCategory_id(), aspect.getAspect_id() , agent.getLy_agent_id(), category.getCategory_id(),
 							category.getCategory_id() == null ? 1 : category.getCategory_id());
 			for(StdReg std : stdArray) {
 				LyStdTicket ticket = new LyStdTicket();
@@ -82,7 +82,7 @@ public class Ticket10047 extends TicketHelper {
 				ticket.setTicket_no(ArtParamHelper.ArtYear.substring(2, 4) + aspect.getAspect_code() + "0"
 						+ StringHelper.leftPadding((++ticket_seq) + "", ticketLength, '0'));
 				daoTicket.insert(ticket);
-			}
+			}*/
 
 			
 
@@ -140,11 +140,10 @@ public class Ticket10047 extends TicketHelper {
 			}
 			 **/
 
-		}
-	}
+	/*	}
+	}*/
 	
 	
-	/**
 		//以下为复试准考证生成规则 --使用的是专业考号
 		// 普通高考where ticket_no is null 
 		private final static String LIST_STD_FS = " select distinct std_id from (select a.std_id,b.ticket_no from (                                    "+
@@ -178,14 +177,22 @@ public class Ticket10047 extends TicketHelper {
 			//复试的时候，注意美术学-中外合作办学(大陆考生不参加复试，只有非大陆考生才需要复试)
 			String sql = " select t.* from cf_major m,cf_aspect t where major_category_id=1 and m.major_id=t.aspect_major_id order by aspect_code ";
 			List<CfAspect> aspectArr = daoTicket.listBySql(CfAspect.class, sql);
-			int ticketLength = Integer.parseInt(CollectionHelper.getParamValue(AppHelper.GobalParamMap,
-					ArtParamName.LayoutTicketNoSeqLength, ""+3));
+			int ticketLength;
 			int num = 1;
+			int ticket_seq = 0;
+			int ticket_seq_gat = 0;
+			int ticket_num = 0;
+			String aspect_code = null;
 			for(CfAspect aspect : aspectArr) {
 				//大陆考生复试准考证(后4位开始)
 				ticketLength = 4;
-				int ticket_seq = 0;
-				List<StdReg> stdArray =new ArrayList<StdReg>();
+				List<StdReg> stdArray;
+
+				// 招考方向代码相同，准考证号连续
+				if (aspect_code == null || !aspect_code.equals(aspect.getAspect_code())) {
+					ticket_seq = 0;
+				}
+
 				//美术学中外合作办学
 				if(aspect.getAspect_id().intValue() != 22001) {
 					
@@ -205,7 +212,7 @@ public class Ticket10047 extends TicketHelper {
 						daoTicket.insert(ticket);
 					}
 					
-					//其他类型的考生的准考证号(后3位开始)
+					/*//其他类型的考生的准考证号(后3位开始)
 					ticketLength = 3;
 					ticket_seq=0;
 					
@@ -223,10 +230,12 @@ public class Ticket10047 extends TicketHelper {
 						ticket.setTicket_no("F" + ArtParamHelper.ArtYear.substring(2, 4) + "" + aspect.getAspect_code()+"S"
 								+ StringHelper.leftPadding((++ticket_seq) + "", ticketLength, '0'));
 						daoTicket.insert(ticket);
-					}
+					}*/
 				}
 				
-				int ticket_seq_gat=0;
+				if (aspect_code == null || !aspect_code.equals(aspect.getAspect_code())) {
+					ticket_seq_gat = 0;
+				}
 				ticketLength = 3;
 				//港澳台
 				stdArray = daoTicket.listBySql(StdReg.class, GAT_LIST_STD_FS, agent.getLy_agent_id(), category.getCategory_id(),
@@ -249,7 +258,11 @@ public class Ticket10047 extends TicketHelper {
 				stdArray = daoTicket.listBySql(StdReg.class, ZXWP_LIST_STD_FS, agent.getLy_agent_id(), category.getCategory_id(),
 						category.getCategory_id() == null ? 1 : 2, aspect.getAspect_id(), agent.getLy_agent_id(), category.getCategory_id(), 
 								category.getCategory_id() == null ? 1 : 2);
-				int ticket_num=0;
+
+				if (aspect_code == null || !aspect_code.equals(aspect.getAspect_code())) {
+					ticket_num = 0;
+				}
+
 				for(StdReg std : stdArray) {
 					LyStdTicket ticket = new LyStdTicket();
 					ticket.setCategory_id(category.getCategory_id());
@@ -261,11 +274,11 @@ public class Ticket10047 extends TicketHelper {
 							+ StringHelper.leftPadding((++ticket_num) + "", ticketLength, '0'));
 					daoTicket.insert(ticket);
 				}
-				
+
+				aspect_code = aspect.getAspect_code();
 			}
 		}
-	**/
-	
+
 	
 
 }