|
|
@@ -54,13 +54,20 @@ public class Ticket10047 extends TicketHelper {
|
|
|
protected void makeTicket(LyStdTicketDao daoTicket, LyAgent agent) {
|
|
|
CfCategory category = daoTicket.find(CfCategory.class, 1);
|
|
|
//建筑学和美术学-初试准考证不生成
|
|
|
- String sql = " select t.* from cf_major m,cf_aspect t where major_category_id=1 and m.major_id=t.aspect_major_id and t.aspect_id not in (20401,20701) order by aspect_code ";
|
|
|
+ String sql = " select t.* from cf_major m,cf_aspect t where major_category_id=1 and m.major_id=t.aspect_major_id and t.aspect_id not in (2070) order by aspect_code ";
|
|
|
List<CfAspect> aspectArr = daoTicket.listBySql(CfAspect.class, sql);
|
|
|
int ticketLength;
|
|
|
int num = 1;
|
|
|
+ String aspect_code = null;
|
|
|
+ int ticket_seq = 0;
|
|
|
for(CfAspect aspect : aspectArr) {
|
|
|
ticketLength = 4;
|
|
|
- int ticket_seq = 0;
|
|
|
+ // 招考方向代码相同，准考证号连续
|
|
|
+ if (aspect_code == null || !aspect_code.equals(aspect.getAspect_code())) {
|
|
|
+ ticket_seq = 0;
|
|
|
+ }
|
|
|
+ aspect_code = aspect.getAspect_code();
|
|
|
+
|
|
|
//大陆考生
|
|
|
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(),
|
|
|
@@ -76,9 +83,11 @@ public class Ticket10047 extends TicketHelper {
|
|
|
+ StringHelper.leftPadding((++ticket_seq) + "", ticketLength, '0'));
|
|
|
daoTicket.insert(ticket);
|
|
|
}
|
|
|
+
|
|
|
|
|
|
+
|
|
|
+ /*
|
|
|
ticket_seq=0;
|
|
|
-
|
|
|
//新疆少民
|
|
|
stdArray = daoTicket.listBySql(StdReg.class, XJSM_LIST_STD, agent.getLy_agent_id(), category.getCategory_id(),
|
|
|
category.getCategory_id() == null ? 1 : 2, aspect.getAspect_id(), agent.getLy_agent_id(), category.getCategory_id(),
|
|
|
@@ -93,7 +102,7 @@ public class Ticket10047 extends TicketHelper {
|
|
|
ticket.setTicket_no(ArtParamHelper.ArtYear.substring(2, 4) + aspect.getAspect_code() + "S"
|
|
|
+ StringHelper.leftPadding((++ticket_seq) + "", ticketLength, '0'));
|
|
|
daoTicket.insert(ticket);
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
// 初试-只有大陆考生和新疆少民的考生参加，港澳台和香港中学文凭考生 直接参加复试
|
|
|
/**
|
|
|
@@ -135,7 +144,7 @@ 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 ( "+
|
haogh