央美本次优化

src/cn/hmsoft/art/control/score/ScoreYmControl.java

@@ -77,13 +77,16 @@ public class ScoreYmControl extends ArtControl {
 	@RequestMapping("score/ymfirst/page")
 	public Ajax ymfirstPage(String query, Integer limit, Integer start, String order, String type) {
 		String sql = "select * from sc_score_ym ym where batch='first'";
+		if(StringHelper.isEmpty(order)) {
+			order = "aspect_name";
+		}
 		QueryOrder qr = this.getQueryOrder(order, type);
 		if (StringHelper.isEmpty(query)) {
-			sql += " order by apply_msg desc,check_flag desc";
+//			sql += " order by apply_msg desc,check_flag desc";
 			return new Ajax(this.daoStd.pageMapBySql(qr, start, limit, sql));
 		}
 		sql = sql + " and ( ym.cert_id =? or ym.ticket_no=? or  ym.aspect_name=? or ym.std_name like ? )";
-		sql += " order by apply_msg desc,check_flag desc";
+//		sql += " order by apply_msg desc,check_flag desc";
 		return new Ajax(this.daoStd.pageMapBySql(qr, start, limit, sql, query, query, query, "%" + query + "%"));
 	}
 	

src/cn/hmsoft/art/control/score/ScoreYmService.java

@@ -209,9 +209,8 @@ public class ScoreYmService extends ArtService {
 		}
 
 		// 更新准考证号
-		String sql = "update sc_score_ym s ,std_enrol e set s.ticket_no=e.aspect_ticket_num  where s.std_id=e.std_id "
-				+ " and s.aspect_name=e.aspect_name and s.batch='first'";
-		this.daoEnrol.update(sql);
+		String sql = "update sc_score_ym s ,ly_std_ticket e set s.ticket_no=e.ticket_no  where s.std_id=e.std_id and s.batch='first' ";
+		this.daoEnrol.updateBySql(sql);
 
 		FrameThreadHelper.completeThread(thread, "导入成功：已处理【" + total + "】条初试成绩信息");
 		this.log(optr, ArtOptrLogType.StdScore_Import.toString(), values.size());

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

@@ -82,7 +82,7 @@ public abstract class DecisionHelper {
             Text stdName = new Text("  " + score.get("std_name") + "  ").setUnderline();
             Text stdSex = new Text("  " + score.get("std_sex") + "  ").setUnderline();
             Text certId = new Text("  " + score.get("cert_id") + "  ").setUnderline();
-            Text province = new Text("  " + score.get("province_name")).setUnderline();
+            Text province = new Text("  " + score.get("province_name") + "  ").setUnderline();
             Text aspectName = new Text("  " + score.get("aspect_name")+ "  ").setUnderline();
             Text ticketNo = new Text("  " + score.get("ticket_no") + "  ").setUnderline();
             Text examId = new Text("  " + score.get("exam_id") + "  ").setUnderline();
@@ -177,7 +177,7 @@ public abstract class DecisionHelper {
             doc.setFont(font);
             Paragraph p1;
 
-            float fontSize = 17f;
+            float fontSize = 16f;
             float lineHeight = 1.65f;
             p1 = new Paragraph("中央美术学院" + ArtParamHelper.ArtYear + "年本科招生线上考试\n违规处理告知书")
                     .setFontSize(22).setBold().setTextAlignment(TextAlignment.CENTER);
@@ -195,7 +195,7 @@ public abstract class DecisionHelper {
             Text stdName = new Text("  " + score.get("std_name") + "  ").setUnderline();
             Text stdSex = new Text("  " + score.get("std_sex") + "  ").setUnderline();
             Text certId = new Text("  " + score.get("cert_id") + "  ").setUnderline();
-            Text province = new Text("  " + score.get("province_name")).setUnderline();
+            Text province = new Text("  " + score.get("province_name")+ "  " ).setUnderline();
             Text aspectName = new Text("  " + score.get("aspect_name")+ "  ").setUnderline();
             Text ticketNo = new Text("  " + score.get("ticket_no") + "  ").setUnderline();
             Text examId = new Text("  " + score.get("exam_id") + "  ").setUnderline();
@@ -247,6 +247,7 @@ public abstract class DecisionHelper {
                     .setMultipliedLeading(lineHeight).setFirstLineIndent(30f);
             doc.add(p1);
 
+            doc.add(new Paragraph(""));
             doc.add(new Paragraph(""));
             doc.add(new Paragraph("中央美术学院").setFontSize(fontSize).setTextAlignment(TextAlignment.RIGHT).setPaddingRight(30f));
             doc.add(new Paragraph(ArtParamHelper.getParamValue("HandleNoticeDay", "2025年4月15日"))

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

@@ -77,7 +77,7 @@ public class Ticket10047 extends TicketHelper {
 	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);
-		Table headTable = new Table(new float[] { 2, 5 });
+		Table headTable = new Table(new float[] { 1.3f, 6f });
 		headTable.setWidthPercent(100).setBorder(null);
 		imgStdUpload.scaleAbsolute(75f, 75f);
 		Image imageLogo = null;
@@ -87,7 +87,7 @@ public class Ticket10047 extends TicketHelper {
 					+ File.separator + "100472.png";
 			String scissor_path = SpringHelper.WebServletContext.getRealPath("/") + "fonts" + File.separator 
 					+ File.separator + "scissor.png";
-			imageLogo = new Image(ImageDataFactory.create(path)).scaleAbsolute(120, 70);
+			imageLogo = new Image(ImageDataFactory.create(path)).scaleAbsolute(70, 55);
 			scissorImg = new Image(ImageDataFactory.create(scissor_path)).scaleAbsolute(15, 15);
 		} catch (Exception e) {
 			LogHelper.error(e.getMessage());
@@ -96,7 +96,7 @@ public class Ticket10047 extends TicketHelper {
 				.setHorizontalAlignment(HorizontalAlignment.CENTER).setBorder(null));
 		headTable.addCell(new Cell(1, 1).add("").setBorder(null));
 		// 添加标题
-		headTable.addCell(new Cell(1, 1).add(new Paragraph("中央美术学院" + ArtParamHelper.ArtYear + "年本科招生线上考试\n准考证").setFontSize(18)
+		headTable.addCell(new Cell(1, 1).add(new Paragraph("中央美术学院" + ArtParamHelper.ArtYear + "年本科招生线上考试\n准考证").setFontSize(22)
 				.setTextAlignment(TextAlignment.CENTER)).setBorder(null).setBold().setMarginLeft(-20));
 		headTable.addCell(new Cell(1, 1)
 				.add(new Paragraph("").setFontSize(25).setBold().setTextAlignment(TextAlignment.CENTER))
@@ -223,7 +223,7 @@ public class Ticket10047 extends TicketHelper {
 		doc.add(firstTab.setMarginTop(12).setMarginRight(20));
 
 		Text noticeText = new Text("考生须知：").setFontSize(std_font);
-		Text noticeRemarkText = new Text("本次考试属国家教育考试的组成部分，考生应自觉遵守国家教育考试相关法律法规和要求，诚信应考。考生不遵守考场纪律，违背考试公平、公正，违反《中央美术学院2025年本科招生线上考试考场规则》，将按《中华人民共和国教育法》《国家教育考试违规处理办法》进行处理。").setFontSize(10.6f);
+		Text noticeRemarkText = new Text("本次考试属国家教育考试的组成部分，考生应自觉遵守国家教育考试相关法律法规和要求，诚信应考。考生不遵守考场纪律，违背考试公平、公正，违反《中央美术学院2025年本科招生线上考试考场规则》，将按照《国家教育考试违规处理办法》进行处理。").setFontSize(11.85f);
 		Paragraph p1 = new Paragraph(noticeText).add(noticeRemarkText).setMarginLeft(22).setMarginTop(1);
 		doc.add(p1);