央美2025招生优化

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

@@ -485,8 +485,9 @@ public abstract class DecisionHelper {
             doc.add(p1.setMarginTop(15f));
 
             doc.add(new Paragraph("\n"));
-            doc.add(new Paragraph("中央美术学院").setFontSize(fontSize).setTextAlignment(TextAlignment.RIGHT).setPaddingRight(30f));
-            doc.add(new Paragraph(getExamDate(LocalDate.now()))
+            doc.add(new Paragraph("中央美术学院").setFontSize(fontSize).setTextAlignment(TextAlignment.RIGHT).setPaddingRight(20f));
+            //getExamDate(LocalDate.now())
+            doc.add(new Paragraph("2025年1月23日")
                     .setFontSize(fontSize).setTextAlignment(TextAlignment.RIGHT).setPaddingRight(16f));
 
             ItextPdfHelper.closePdf(doc);

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

@@ -27,12 +27,11 @@ public class AspectNo10047 extends AspectNoHelper {
 		private final static String XJSM_LIST_STD = "select distinct s.std_id from std_reg s,std_enrol e where s.std_id=e.std_id and e.agent_id=?  and e.pay_status='Active'   and (e.category_id=? or 1=?)  and s.std_province=66 and e.aspect_id=? and e.back_note=1";
 		
 		//华侨港澳台联招
-		private final static String GAT_LIST_STD = "select distinct s.std_id from std_reg s,std_enrol e where s.std_id=e.std_id and e.agent_id=?  and e.pay_status='Active'   and (e.category_id=? or 1=?)  and s.std_province > 70  and s.std_province!=80 and e.aspect_id=? and e.back_note=1";
+		private final static String GAT_LIST_STD = "select distinct s.std_id,s.std_province from std_reg s,std_enrol e where s.std_id=e.std_id and e.agent_id=?  and e.pay_status='Active'   and (e.category_id=? or 1=?)  and s.std_province > 70  and s.std_province!=80 and e.aspect_id=? and e.back_note=1 order by s.std_province ";
 		
 		//香港中学文凭
 		private final static String ZXWP_LIST_STD = " select distinct s.std_id from std_reg s,std_enrol e where s.std_id=e.std_id and e.agent_id=?  and e.pay_status='Active'   and (e.category_id=? or 1=?)  and s.std_province=80 and e.aspect_id=? and e.back_note=1";
 		
-		
 		//查找报考
 		private final static String STD_ENROL = " select * from std_enrol where std_id=? and aspect_id = ? ";
 
@@ -43,10 +42,18 @@ public class AspectNo10047 extends AspectNoHelper {
 		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;
+		String aspect_code = null;
+		int ticket_seq = 0;
+
 		for(CfAspect aspect : aspectArr) {
 			ticketLength = 4;
 			List<StdReg> stdArray;
-			int ticket_seq = 0;
+
+			// 招考方向代码相同，准考证号连续
+			if (aspect_code == null || !aspect_code.equals(aspect.getAspect_code())) {
+				ticket_seq = 0;
+			}
+
 			//美术学中外合作办学
 			if(aspect.getAspect_id() != 22001) {
 				//大陆考生
@@ -58,7 +65,8 @@ public class AspectNo10047 extends AspectNoHelper {
 							+ StringHelper.leftPadding((++ticket_seq) + "", ticketLength, '0'));
 					daoTicket.update(enrol);
 				}
-				ticketLength = 3;
+
+				/*ticketLength = 3;
 				ticket_seq = 0;
 				//新疆少民
 				stdArray = daoTicket.listBySql(StdReg.class, XJSM_LIST_STD, agent.getLy_agent_id(), category.getCategory_id(),
@@ -68,34 +76,37 @@ public class AspectNo10047 extends AspectNoHelper {
 					enrol.setAspect_ticket_num('F' +ArtParamHelper.ArtYear.substring(2, 4) + aspect.getAspect_code() +"S"
 							+ StringHelper.leftPadding((++ticket_seq) + "", ticketLength, '0'));
 					daoTicket.update(enrol);
-				}
+				}*/
 			}
-			
-			ticketLength = 3;
-			int ticket_seq_gat = 0;
+
 			//港澳台
 			stdArray = daoTicket.listBySql(StdReg.class, GAT_LIST_STD, agent.getLy_agent_id(), category.getCategory_id(),
 					category.getCategory_id() == null ? 1 : 2, aspect.getAspect_id());
-			
+
 			for(StdReg std : stdArray) {
 				StdEnrol enrol = daoTicket.findBySql(StdEnrol.class, STD_ENROL, std.getStd_id(), aspect.getAspect_id());
-				enrol.setAspect_ticket_num('F' +ArtParamHelper.ArtYear.substring(2, 4) + aspect.getAspect_code() +"H"
-						+ StringHelper.leftPadding((++ticket_seq_gat) + "", ticketLength, '0'));
+				enrol.setAspect_ticket_num('F' +ArtParamHelper.ArtYear.substring(2, 4) + aspect.getAspect_code()
+						+ StringHelper.leftPadding((++ticket_seq) + "", ticketLength, '0'));
 				daoTicket.update(enrol);
 			}
-			
-			int ticket_num=0;
+
+
 			//香港中学文凭考生
 			stdArray = daoTicket.listBySql(StdReg.class, ZXWP_LIST_STD, agent.getLy_agent_id(), category.getCategory_id(),
 					category.getCategory_id() == null ? 1 : 2, aspect.getAspect_id());
 			for(StdReg std : stdArray) {
 				StdEnrol enrol = daoTicket.findBySql(StdEnrol.class, STD_ENROL, std.getStd_id(), aspect.getAspect_id());
-				enrol.setAspect_ticket_num('F' +ArtParamHelper.ArtYear.substring(2, 4) + aspect.getAspect_code() +"D"
-						+ StringHelper.leftPadding((++ticket_num) + "", ticketLength, '0'));
+				enrol.setAspect_ticket_num('F' +ArtParamHelper.ArtYear.substring(2, 4) + aspect.getAspect_code()
+						+ StringHelper.leftPadding((++ticket_seq) + "", ticketLength, '0'));
 				daoTicket.update(enrol);
 			}
 			
-			
+//			ticketLength = 3;
+//			int ticket_seq_gat = 0;
+//			int ticket_num=0;
+
+
+			aspect_code = aspect.getAspect_code();
 		}
 
 	}

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

@@ -158,11 +158,11 @@ public class Ticket10047 extends TicketHelper {
 				") a left join  (                                                                                                                      "+
 				"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
-		private final static String GAT_LIST_STD_FS = " select distinct std_id from (select a.std_id,b.ticket_no from (                                   "+
-				" select s.std_id from std_reg s,std_enrol e where s.std_id=e.std_id and e.agent_id=? and s.ticket_order=0 and e.pay_status='Active'      "+
+		private final static String GAT_LIST_STD_FS = " select distinct std_id,std_province from (select a.std_id,b.ticket_no,std_province from (        "+
+				" select s.std_id,s.std_province from std_reg s,std_enrol e where s.std_id=e.std_id and e.agent_id=? and s.ticket_order=0 and e.pay_status='Active'   "+
 				" and (e.category_id=? or 1=?)  and s.std_province > 70  and s.std_province!=80  and e.aspect_id=?   and e.back_note=1                    "+
 				") a left join  (                                                                                                                         "+
-				"select * from ly_std_ticket  where ly_agent_id=? and (category_id=? or 1=?)) b on a.std_id=b.std_id ) f      ";
+				"select * from ly_std_ticket  where ly_agent_id=? and (category_id=? or 1=?)) b on a.std_id=b.std_id ) f   order by std_province  ";
 		//香港中学文凭where ticket_no is null 
 		private final static String ZXWP_LIST_STD_FS = " select distinct std_id from (select a.std_id,b.ticket_no from (                                "+
 				" select s.std_id from std_reg s,std_enrol e where s.std_id=e.std_id and e.agent_id=? and s.ticket_order=0 and e.pay_status='Active'    "+
@@ -232,16 +232,13 @@ public class Ticket10047 extends TicketHelper {
 						daoTicket.insert(ticket);
 					}*/
 				}
-				
-				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(),
-						category.getCategory_id() == null ? 1 : 2, aspect.getAspect_id(), agent.getLy_agent_id(), category.getCategory_id(), 
-								category.getCategory_id() == null ? 1 : 2);
-				
+						category.getCategory_id() == null ? 1 : 2, aspect.getAspect_id(), agent.getLy_agent_id(), category.getCategory_id(),
+						category.getCategory_id() == null ? 1 : 2);
+
 				for(StdReg std : stdArray) {
 					LyStdTicket ticket = new LyStdTicket();
 					ticket.setCategory_id(category.getCategory_id());
@@ -249,19 +246,20 @@ public class Ticket10047 extends TicketHelper {
 					ticket.setStd_id(std.getStd_id());
 					ticket.setTicket_batch(2);
 					ticket.setTicket_seq(num++);
-					ticket.setTicket_no("F" + ArtParamHelper.ArtYear.substring(2, 4) + "" + aspect.getAspect_code()+"H"
-							+ StringHelper.leftPadding((++ticket_seq_gat) + "", ticketLength, '0'));
+					ticket.setTicket_no("F" + ArtParamHelper.ArtYear.substring(2, 4) + aspect.getAspect_code()
+							+ StringHelper.leftPadding((++ticket_seq) + "", ticketLength, '0'));
 					daoTicket.insert(ticket);
 				}
-				
+
+
 				//香港中学文凭考生
 				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);
+						category.getCategory_id() == null ? 1 : 2, aspect.getAspect_id(), agent.getLy_agent_id(), category.getCategory_id(),
+						category.getCategory_id() == null ? 1 : 2);
 
-				if (aspect_code == null || !aspect_code.equals(aspect.getAspect_code())) {
+				/*if (aspect_code == null || !aspect_code.equals(aspect.getAspect_code())) {
 					ticket_num = 0;
-				}
+				}*/
 
 				for(StdReg std : stdArray) {
 					LyStdTicket ticket = new LyStdTicket();
@@ -270,11 +268,16 @@ public class Ticket10047 extends TicketHelper {
 					ticket.setStd_id(std.getStd_id());
 					ticket.setTicket_batch(2);
 					ticket.setTicket_seq(num++);
-					ticket.setTicket_no("F" + ArtParamHelper.ArtYear.substring(2, 4) + "" + aspect.getAspect_code()+"D"
-							+ StringHelper.leftPadding((++ticket_num) + "", ticketLength, '0'));
+					ticket.setTicket_no("F" + ArtParamHelper.ArtYear.substring(2, 4) + aspect.getAspect_code()
+							+ StringHelper.leftPadding((++ticket_seq) + "", ticketLength, '0'));
 					daoTicket.insert(ticket);
 				}
 
+				/*if (aspect_code == null || !aspect_code.equals(aspect.getAspect_code())) {
+					ticket_seq_gat = 0;
+				}
+				ticketLength = 3;*/
+
 				aspect_code = aspect.getAspect_code();
 			}
 		}