广开文字修改

src/cn/hmsoft/art/data/dao/std/StdEnrolDao.java

@@ -412,7 +412,7 @@ private final static String LIST_STD_ENROL_ZX = "select distinct a.*,b.bill_no,b
 		sql.append(" 	cf_agent_appointment ap                                           ");
 		sql.append(" WHERE                                                                ");
 		sql.append(" 	e.agent_id = a.agent_id                                           ");
-		sql.append(" 	AND ap.id = e.appointment_id                                      ");
+		sql.append(" 	AND ap.id = e.appointment_id  AND e.pay_status='Active'           ");
 		sql.append(" GROUP BY                                                             ");
 		sql.append(" 	e.agent_id,                                                       ");
 		sql.append(" 	a.agent_name,                                                     ");

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

@@ -125,51 +125,51 @@ public class TicketGkxw extends TicketHelper {
 
 		// 添加须知
 		Table noticeTable = new Table(1);
-		noticeTable.setFontSize(14f);
+		noticeTable.setFontSize(13f);
 		noticeTable
 				.addCell(new Cell(1, 1).add("考生须知").setFontSize(18).setTextAlignment(TextAlignment.CENTER).setBold());
 
 		Paragraph p1 = new Paragraph(
 				"一、本次考试为闭卷机考。考生需携带身份证（或有效的临时身份证）和准考证（两证必须齐全）至少提前30分钟进入考场，无证件或证件不齐者不得入场。开考30分钟后不得入场。")
-						.setFixedLeading(10).setMultipliedLeading(1.5f).setFirstLineIndent(20);
+						.setFixedLeading(10).setMultipliedLeading(1.5f).setFirstLineIndent(25);
 		noticeTable.addCell(
 				new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorderTop(null).setBorderBottom(null));
 		p1 = new Paragraph("二、考生须通过身份验证后进入考场。为顺利通过人脸识别，考试当天请勿化浓妆；考试过程中，如因特殊原因中途离场，返回考场时，须再次进行人脸识别。").setMarginTop(0)
-				.setFixedLeading(10).setMultipliedLeading(1.5f).setFirstLineIndent(20);
+				.setFixedLeading(10).setMultipliedLeading(1.5f).setFirstLineIndent(25);
 		noticeTable.addCell(
 				new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorderTop(null).setBorderBottom(null));
 
 		p1 = new Paragraph(
 				"三、考生一律不得将纸、笔带入考场；禁止将手机、智能手表、移动存储设备、电脑、计算器、电子记事本、通讯工具等电子用品或与考试相关的资料带入座位。如发现通过USB接口将电子设备插入考试主机，视为考试作弊。")
-						.setMarginTop(0).setFixedLeading(10).setMultipliedLeading(1.5f).setFirstLineIndent(20);
+						.setMarginTop(0).setFixedLeading(10).setMultipliedLeading(1.5f).setFirstLineIndent(25);
 		noticeTable.addCell(
 				new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorderTop(null).setBorderBottom(null));
 
-		p1 = new Paragraph("四、考生入座后可登陆考试系统等待考试正式开始").add(new Text("（登陆名为身份证号，密码为“Gd+身份证后六位”）").setUnderline().setBold())
+		p1 = new Paragraph("四、考生入座后可登陆考试系统等待考试正式开始").add(new Text("（登陆名为身份证号，密码为“gd+身份证后六位”）").setUnderline().setBold())
 				/*
 				 * .add(new Text("Gd" + std.getCert_id().substring(std.getCert_id().length() -
 				 * 6)).setUnderline() .setBold())
 				 */
 				.add("。考试开始后30分钟内不得提前交卷及离开考场。").setMarginTop(0).setFixedLeading(10).setMultipliedLeading(1.5f)
-				.setFirstLineIndent(20);
+				.setFirstLineIndent(25);
 		noticeTable.addCell(
 				new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorderTop(null).setBorderBottom(null));
 		p1 = new Paragraph("五、考点停车位紧张，请尽量选择公共交通前往。").setMarginTop(0).setFixedLeading(10).setMultipliedLeading(1.5f)
-				.setFirstLineIndent(20).setFirstLineIndent(20);
+				.setFirstLineIndent(25);
 		noticeTable.addCell(
 				new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorderTop(null).setBorderBottom(null));
 		p1 = new Paragraph("六、考生遇到系统故障、死机、死循环或供电故障等意外情况时，可以向监考人员举手请求帮助。为避免个人或考点损失，考生需按照规范操作流程进行处理。").setMarginTop(0)
-				.setFixedLeading(10).setMultipliedLeading(1.5f).setFirstLineIndent(20);
+				.setFixedLeading(10).setMultipliedLeading(1.5f).setFirstLineIndent(25);
 		noticeTable.addCell(
 				new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorderTop(null).setBorderBottom(null));
 
 		p1 = new Paragraph("七、考生须诚信应考，遵守学校规章制度，对考试违纪者学校将严格按照相关规定处理。").setMarginTop(0).setFixedLeading(10)
-				.setMultipliedLeading(1.5f).setFirstLineIndent(20);
+				.setMultipliedLeading(1.5f).setFirstLineIndent(25);
 		noticeTable.addCell(
 				new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorderTop(null).setBorderBottom(null));
 
-		p1 = new Paragraph("八、5月9日起，考生可在学生空间查询成绩。").setMarginTop(0).setFixedLeading(10).setMultipliedLeading(1.5f)
-				.setFirstLineIndent(20);
+		p1 = new Paragraph("八、11月6日起，考生可登陆学校主页“服务大厅-微服务-学位外语成绩单”下载学位外语考试成绩单。").setMarginTop(0).setFixedLeading(10).setMultipliedLeading(1.5f)
+				.setFirstLineIndent(25);
 
 		noticeTable.addCell(new Cell(1, 1).add(p1).setTextAlignment(TextAlignment.LEFT).setBorderTop(null));
 

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

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import cn.hmsoft.art.data.model.cf.CfAgent;
 import com.itextpdf.kernel.color.Color;
 import com.itextpdf.kernel.color.DeviceRgb;
 import com.itextpdf.layout.Document;
@@ -624,8 +625,8 @@ public class WrittenMaterialDefault extends WrittenMaterialHelper {
 						// 判断分页
 						if ((stdIndex + 1) % pageStdCount == 0) {
 							doc.add(mainTable.setMarginTop(10));
-							doc.add(new Paragraph("监考教师核对完毕后签名：______________________").setFontSize(12).setBold()
-									.setTextAlignment(TextAlignment.RIGHT).setFixedPosition(470, 10, 300));
+							doc.add(new Paragraph("监考员1签名：____________          监考员2签名：____________").setFontSize(12).setBold()
+									.setTextAlignment(TextAlignment.RIGHT).setFixedPosition(420, 10, 350));
 							// 判断本考场是否还有考生
 							if (stdIndex != array.size() - 1) {
 								doc.add(new AreaBreak());
@@ -643,8 +644,8 @@ public class WrittenMaterialDefault extends WrittenMaterialHelper {
 								doc.add(mainTable);
 								hasStd = false;
 								mainTable = new Table(new float[] { 1, 1, 1 }).setWidthPercent(100).setBorder(null);
-								doc.add(new Paragraph("监考教师核对完毕后签名：______________________").setFontSize(12).setBold()
-										.setTextAlignment(TextAlignment.RIGHT).setFixedPosition(470, 10, 300));
+								doc.add(new Paragraph("监考员1签名：____________          监考员2签名：____________").setFontSize(12).setBold()
+										.setTextAlignment(TextAlignment.RIGHT).setFixedPosition(420, 10, 350));
 							}
 						}
 
@@ -659,8 +660,8 @@ public class WrittenMaterialDefault extends WrittenMaterialHelper {
 				}
 				if (!hasStd && roomIndex == roomStdMap.keySet().size() - 1) {
 					doc.add(mainTable);
-					doc.add(new Paragraph("监考教师核对完毕后签名：______________________").setFontSize(12).setBold()
-							.setTextAlignment(TextAlignment.RIGHT).setFixedPosition(470, 10, 300));
+					doc.add(new Paragraph("监考员1签名：____________          监考员2签名：____________").setFontSize(12).setBold()
+							.setTextAlignment(TextAlignment.RIGHT).setFixedPosition(420, 10, 350));
 
 				}
 				if (roomIndex < roomStdMap.keySet().size() - 1)
@@ -945,13 +946,18 @@ public class WrittenMaterialDefault extends WrittenMaterialHelper {
 		// if(FrameStatus.InActive.toString().equals(param.getGroup_name_flag()))
 		v = subjectArray.get(0).getSubject_name();
 		LogHelper.info(v);
-		String title = "学位英语签到表";
+		String title = ArtParamHelper.ArtYear+ "年秋季学士学位外语考试签到表  考试日期：2024年10月26日  考试语种：";
+		if(group.getGroup_name().contains("日语")) {
+			title += "日语  ";
+		} else {
+			title += "英语  ";
+		}
 		if (group.getGroup_name().contains("上午场")) {
 			title += "  上午场（9:00-11:00）";
 		} else if (group.getGroup_name().contains("下午场")) {
 			title += "  下午场（13:00-15:00）";
 		} else {
-			title += "上午场（9:00-11:00）";
+			title += "  上午场（9:00-11:00）";
 		}
 		Paragraph p1 = new Paragraph(title).setFontSize(param.getSubject_name_font()).setBold()
 				.setTextAlignment(TextAlignment.CENTER);
@@ -972,7 +978,11 @@ public class WrittenMaterialDefault extends WrittenMaterialHelper {
 	private void createSeatNewPage(Document doc, LyGroup group, LyMaterialWrittenParam param,
 			ItextDocumentModel pageModel, LyRoomWritten room) {
 		param.setRoom_addr_font(12);
+		CfAgent agent = daoGroup.find(CfAgent.class, group.getLy_agent_id());
 		String title = "学位英语桌贴";
+		if(group.getGroup_name().contains("日语")) {
+			title = "学位日语桌贴";
+		}
 		if (group.getGroup_name().contains("上午场")) {
 			title += "  上午场（9:00-11:00）";
 		} else if (group.getGroup_name().contains("下午场")) {
@@ -987,7 +997,7 @@ public class WrittenMaterialDefault extends WrittenMaterialHelper {
 		if (FrameStatus.Active.toString().equals(param.getTicket_aspect_num())) {
 			ticket_value = room.getMin_aspect_ticket_num() + " --- " + room.getMax_aspect_ticket_num();
 		}
-		String value = "考场序号：" + room.getRoom_seq() + "           考场地址：" + room.getRoom_addr() + "           考生数量："
+		String value = "考场序号：" + room.getRoom_seq() + "           考场地址：" + agent.getAgent_name() + room.getRoom_addr() + "           考生数量："
 				+ room.getReal_std_total() + "           准考证号：" + ticket_value;
 
 		p1 = new Paragraph(value).setFontSize(param.getRoom_addr_font()).setBold().setTextAlignment(TextAlignment.LEFT)