diff --git a/src/main/java/org/ccpit/business/registerManage/IndexController.java b/src/main/java/org/ccpit/business/registerManage/IndexController.java
index 42615a6..0efe549 100644
--- a/src/main/java/org/ccpit/business/registerManage/IndexController.java
+++ b/src/main/java/org/ccpit/business/registerManage/IndexController.java
@@ -175,26 +175,26 @@ public class IndexController extends BaseController {
@RequestMapping("/saveCertificateId")
public Object saveCertificateId(HttpServletRequest request){
String img1 = request.getParameter("img1");
- String img2 = request.getParameter("img2");
- String img3 = request.getParameter("img3");
+// String img2 = request.getParameter("img2");
+// String img3 = request.getParameter("img3");
String obj_id = request.getParameter("obj_id");
RegisterInfo registerInfo = registerService.queryRegisterById(Long.valueOf(obj_id));
Map<String,Object> map = new HashMap<String, Object>();
if(null != registerInfo){
registerInfo.setImg1(img1);
- registerInfo.setImg2(img2);
- registerInfo.setImg3(img3);
+// registerInfo.setImg2(img2);
+// registerInfo.setImg3(img3);
boolean result = registerService.updateRegisterInfo(registerInfo);
map.put("result", result);
}
- SubjectInfo subjectInfo = subjectInfoService.querySubjectInfoById(Long.valueOf(obj_id));
- if(null != subjectInfo){
- subjectInfo.setImg1(img1);
- subjectInfo.setImg2(img2);
- subjectInfo.setImg3(img3);
- boolean result = subjectInfoService.updateSubjectInfo(subjectInfo);
- map.put("result", result);
- }
+// SubjectInfo subjectInfo = subjectInfoService.querySubjectInfoById(Long.valueOf(obj_id));
+// if(null != subjectInfo){
+// subjectInfo.setImg1(img1);
+// subjectInfo.setImg2(img2);
+// subjectInfo.setImg3(img3);
+// boolean result = subjectInfoService.updateSubjectInfo(subjectInfo);
+// map.put("result", result);
+// }
return map;
}
@RequestMapping("/getObj")
@@ -205,10 +205,6 @@ public class IndexController extends BaseController {
if(null != registerInfo){
map.put("obj", registerInfo);
}
- SubjectInfo subjectInfo = subjectInfoService.querySubjectInfoById(Long.valueOf(obj_id));
- if(null != subjectInfo){
- map.put("obj", subjectInfo);
- }
return map;
}
@@ -375,6 +371,8 @@ public class IndexController extends BaseController {
}
subjectInfo.setRegisterInfo_id(registerInfo_id);
subjectInfo.setRegisterStatus(0);
+ subjectInfo.setPhaseId(phase.getId());
+ subjectInfo.setPhaseName(phase.getName());
RegisterInfo registerInfo = registerService.queryRegisterById(registerInfo_id);
boolean success = subjectInfoService.addSubjectInfo(subjectInfo);
if (success){
diff --git a/src/main/java/org/ccpit/business/registerManage/RegisterController.java b/src/main/java/org/ccpit/business/registerManage/RegisterController.java
index d377ffd..24e47ea 100644
--- a/src/main/java/org/ccpit/business/registerManage/RegisterController.java
+++ b/src/main/java/org/ccpit/business/registerManage/RegisterController.java
@@ -85,8 +85,9 @@ public class RegisterController extends BaseController {
if (StringUtils.isNotEmpty(operate)&&operate.equals("add")){
registerInfo.setCreator(getUserSession(request));
String flagExt = request.getParameter("flagExt");
- if (flagExt!=null&&flagExt.equals("0"))//如果是延考则在新增数据时把regType设为false表示延考或恢复
- registerInfo.setRegType(false);
+ if (flagExt!=null&&flagExt.equals("0")){
+ registerInfo.setRegType(false);//如果是延考则在新增数据时把regType设为false表示延考或恢复
+ }
registerInfo.setPhase(phaseService.getActivePhase());
success = registerService.addRegisterInfo(registerInfo);
}else if (StringUtils.isNotEmpty(operate)&&operate.equals("edit")){
@@ -313,9 +314,10 @@ public class RegisterController extends BaseController {
}
sb.append(" order by submitTime desc");
List<RegisterInfo> results = registerService.queryList(sb.toString());
+ List<RegisterInfo> reg_infos = registerService.query(Integer.parseInt(subject),phase);
+ results.addAll(reg_infos);
String[] props = StringUtils.split(fields, ",");
-
//文件导出路径
String excelName = "报名信息表"+new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
//转码防止乱码
@@ -330,7 +332,8 @@ public class RegisterController extends BaseController {
e1.printStackTrace();
}
}
-
+
+
}
diff --git a/src/main/java/org/ccpit/business/registerManage/RegisterInfo.java b/src/main/java/org/ccpit/business/registerManage/RegisterInfo.java
index d9e0ffa..54ff71e 100644
--- a/src/main/java/org/ccpit/business/registerManage/RegisterInfo.java
+++ b/src/main/java/org/ccpit/business/registerManage/RegisterInfo.java
@@ -116,13 +116,21 @@ public class RegisterInfo implements Serializable {
*/
private String gender_en;
/**
- *
+ *Family NAME
*/
private String name_en;
/**
+ * Given NAME
+ */
+ private String name_en_last;
+
+ /**
*
*/
private String company_en;
+
+
+
/**
*
*/
@@ -651,6 +659,21 @@ public class RegisterInfo implements Serializable {
public void setImg3(String img3) {
this.img3 = img3;
}
-
+
+ public String getTaxIssue() {
+ return taxIssue;
+ }
+
+ public void setTaxIssue(String taxIssue) {
+ this.taxIssue = taxIssue;
+ }
+
+ public String getName_en_last() {
+ return name_en_last;
+ }
+
+ public void setName_en_last(String name_en_last) {
+ this.name_en_last = name_en_last;
+ }
}
diff --git a/src/main/java/org/ccpit/business/registerManage/RegisterService.java b/src/main/java/org/ccpit/business/registerManage/RegisterService.java
index e67d6a3..80ba02f 100644
--- a/src/main/java/org/ccpit/business/registerManage/RegisterService.java
+++ b/src/main/java/org/ccpit/business/registerManage/RegisterService.java
@@ -48,9 +48,8 @@ import org.springframework.stereotype.Component;
* Date: 2015年11月10日 上午8:58:46 <br/>
*
* @author sunqipeng
- * @version
- * @since JDK 1.6
* @see
+ * @since JDK 1.6
*/
@Component
public class RegisterService {
@@ -75,6 +74,8 @@ public class RegisterService {
private RegisterDao registerDao;
@Resource
private MetadataService metadataService;
+ @Resource
+ private SubjectInfoDao subjectInfoDao;
@Transactional
public boolean addRegisterInfo(RegisterInfo registerInfo) {
@@ -116,22 +117,52 @@ public class RegisterService {
return registerDao.queryById(id);
}
-
- public RegisterInfo queryByEmail(String email,Long phaseId,Boolean regType){
+
+ public RegisterInfo queryByEmail(String email, Long phaseId, Boolean regType) {
String hql = "from RegisterInfo where email = ? and phase.id = ? ";
- if (regType!=null){
- hql+=" and regType= "+(regType?"1":"0");
+ if (regType != null) {
+ hql += " and regType= " + (regType ? "1" : "0");
}
- List<RegisterInfo> list = registerDao.query(hql,email, phaseId);
- if (list==null ||list.isEmpty()){
+ List<RegisterInfo> list = registerDao.query(hql, email, phaseId);
+ if (list == null || list.isEmpty()) {
return null;
}
return list.get(0);
}
+
public List<RegisterInfo> queryList(String hql) {
return registerDao.query(hql, null);
}
+ public List<RegisterInfo> query(int subject,long phase) {
+ String hql = "from SubjectInfo where registerStatus>=1 and subject = " + subject;
+ List<SubjectInfo> subjectInfos = subjectInfoDao.query(hql.toString());
+ List<RegisterInfo> registerInfos = new ArrayList<RegisterInfo>();
+ for (SubjectInfo s_info : subjectInfos) {
+ long registerInfo_id = s_info.getRegisterInfo_id();
+ List<RegisterInfo> registerInfoList = registerDao.query("from RegisterInfo where phase.id = '" + phase + "'");
+ for(RegisterInfo r_info : registerInfoList){
+ if(registerInfo_id == r_info.getId()){
+ r_info.setSubject(s_info.getSubject());
+ r_info.setRegisterStatus(s_info.getRegisterStatus());
+ r_info.setAppreciationTaxType(s_info.getAppreciationTaxType());
+ r_info.setInvoiceType(s_info.getInvoiceType());
+ r_info.setInvoiceTitle(s_info.getInvoiceTitle());
+ r_info.setTaxpayerNum(s_info.getTaxpayerNum());
+ r_info.setAddressName(s_info.getAddressName());
+ r_info.setTelephone(s_info.getTelephone());
+ r_info.setBankAddress(s_info.getBankAddress());
+ r_info.setBankAccount(s_info.getBankAccount());
+ r_info.setImg1(s_info.getImg1());
+ r_info.setTaxIssue(s_info.getTaxIssue());
+ r_info.setPayTime(s_info.getPayTime());
+ registerInfos.add(r_info);
+ }
+ }
+ }
+ return registerInfos;
+ }
+
public Page<RegisterInfo> queryMemberBaseInfos(PageRequest pageRequest) {
String hql = "from RegisterInfo order by createTime desc,sort asc";
return registerDao.findPage(pageRequest, hql, null);
@@ -155,6 +186,7 @@ public class RegisterService {
map.put("city_ne", RegisterInfo.getCity_en());
map.put("name", RegisterInfo.getName());
map.put("name_en", RegisterInfo.getName_en());
+ map.put("name_en_last", RegisterInfo.getName_en_last());
map.put("gender_en", RegisterInfo.getGender_en());
map.put("gender", "male".equals(RegisterInfo.getGender()) ? "男" : "女");
map.put("birthday", sdf01.format(RegisterInfo.getBirthday()));
@@ -182,7 +214,6 @@ public class RegisterService {
}
-
/**
* 根据选择的属性，导出数据到excel <功能详细描述>
*
@@ -195,11 +226,11 @@ public class RegisterService {
WritableWorkbook book = null;
try {
// book = Workbook.createWorkbook(out);
- WorkbookSettings workbookSettings=new WorkbookSettings();
+ WorkbookSettings workbookSettings = new WorkbookSettings();
//编码代码有：GB18030，UTF-8，ISO-8859-1 等
workbookSettings.setEncoding("GB2312"); //关键代码，解决中文乱码
- book = Workbook.createWorkbook(out,workbookSettings);
- jxl.write.WritableFont wfc = new jxl.write.WritableFont(WritableFont.ARIAL, 10, WritableFont.NO_BOLD, false,UnderlineStyle.NO_UNDERLINE, jxl.format.Colour.BLACK);
+ book = Workbook.createWorkbook(out, workbookSettings);
+ jxl.write.WritableFont wfc = new jxl.write.WritableFont(WritableFont.ARIAL, 10, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, jxl.format.Colour.BLACK);
jxl.write.WritableCellFormat wcfFC = new jxl.write.WritableCellFormat(wfc);
// 设置单元格样式
// wcfFC.setBackground(jxl.format.Colour.GRAY_25);// 单元格颜色
@@ -210,10 +241,10 @@ public class RegisterService {
List<String> opList = new ArrayList<String>();// 存放选择的属性的集合
Label label = null;
- for (int i = 0; i < optionPros.length; i++){
- opList.add(optionPros[i]);
+ for (int i = 0; i < optionPros.length; i++) {
+ opList.add(optionPros[i]);
}
- Map<String,String> mapProsHeader = null;
+ Map<String, String> mapProsHeader = null;
mapProsHeader = initProsHeader();
//System.out.println(opList);
for (int i = 0; i < opList.size(); i++) {
@@ -250,20 +281,22 @@ public class RegisterService {
}
}
- public Map<String,String> initProsHeader(){
- Map<String,String> mapProsHeader = new HashMap<String,String>();
- String[] enPros = {"id","submitTime","city","name","password","gender","birthday","telphone","mobileTel","email","company","address"
- ,"appreciationTaxType","invoiceTitle","invoiceType","taxpayerNum","addressName","telephone","bankAddress","bankAccount","title","dateOfBirth","gender_en","name_en","company_en","address_en"
- ,"country","dcNumber","payTime","phone","city_en","subject","subject2","registerStatus","sort","whetherDelete"
- ,"creator","createTime","modifyBy","modifyTime"};
- String[] cnPros = {"序号","提交时间","城市","姓名","密码","性别","出生日期","电话","手机","EMAIL","工作单位","联系地址","增值税发票类型","发票抬头","发票类型","纳税人识别号","公司地址","公司电话","开户行","银行账号"
- ,"TITLE","DATE OF BIRTH","GENDER","NAME","COMPANY NAME","ADDRESS","COUNTRY","DC/IFS NUMBER","缴费时间","PHONE","CITY SELECT"
- ,"考试科目","考试科目","报名状态","排序号","是否删除","创建人","创建时间","修改人","修改时间"};
- for(int i = 0;i<enPros.length;i++){
- mapProsHeader.put(enPros[i], cnPros[i]);
- }
- return mapProsHeader;
+
+ public Map<String, String> initProsHeader() {
+ Map<String, String> mapProsHeader = new HashMap<String, String>();
+ String[] enPros = {"id", "submitTime", "city", "name", "password", "gender", "birthday", "telphone", "mobileTel", "email", "company", "address"
+ , "appreciationTaxType", "invoiceTitle", "invoiceType", "taxpayerNum", "addressName", "telephone", "bankAddress", "bankAccount", "title", "dateOfBirth", "gender_en", "name_en","name_en_last", "company_en", "address_en"
+ , "country", "dcNumber", "payTime", "phone", "city_en", "subject", "subject2", "registerStatus", "sort", "whetherDelete"
+ , "creator", "createTime", "modifyBy", "modifyTime"};
+ String[] cnPros = {"序号", "提交时间", "城市", "姓名", "密码", "性别", "出生日期", "电话", "手机", "EMAIL", "工作单位", "联系地址", "增值税发票类型", "发票抬头", "发票类型", "纳税人识别号", "公司地址", "公司电话", "开户行", "银行账号"
+ , "TITLE", "DATE OF BIRTH", "GENDER", "Family NAME","Given NAME", "COMPANY NAME", "ADDRESS", "COUNTRY", "DC/IFS NUMBER", "缴费时间", "PHONE", "CITY SELECT"
+ , "考试科目", "考试科目", "报名状态", "排序号", "是否删除", "创建人", "创建时间", "修改人", "修改时间"};
+ for (int i = 0; i < enPros.length; i++) {
+ mapProsHeader.put(enPros[i], cnPros[i]);
+ }
+ return mapProsHeader;
}
+
/**
* 把要导出的数据整理到list集合中 <功能详细描述>
*
@@ -272,7 +305,7 @@ public class RegisterService {
* @see [类、类#方法、类#成员]
*/
@SuppressWarnings("finally")
- public List<String> getOutExcelList(List<RegisterInfo> listLike,String[] options) {
+ public List<String> getOutExcelList(List<RegisterInfo> listLike, String[] options) {
List<RegisterInfo> listInfo = listLike;// 查询注册信息的所有内容
for (int i = 0; i < listInfo.size(); i++) {
//System.out.println(listInfo.get(i));
@@ -282,12 +315,12 @@ public class RegisterService {
try {
List<String> optionPros = new ArrayList<String>();// 存放选择的属性的集合
- for (int i = 0; i < options.length; i++){
- optionPros.add(options[i]);
+ for (int i = 0; i < options.length; i++) {
+ optionPros.add(options[i]);
}
List<String> optionProsProxy = new ArrayList<String>();// 创建存放属性的代理，之后会用来作为判断是否包含某个属性
- for (int i = 0; i < options.length; i++){
- optionProsProxy.add(options[i]);
+ for (int i = 0; i < options.length; i++) {
+ optionProsProxy.add(options[i]);
}
// 获得所有属性，并让私有属性可以在类外使用
fields = listInfo.get(0).getClass().getDeclaredFields();
@@ -296,7 +329,7 @@ public class RegisterService {
fields[i].setAccessible(true);
listFields.add(fields[i].getName());
}
- Map<String,Map<String, String>> listMapPros = DataIdMapDataName(options, fields);
+ Map<String, Map<String, String>> listMapPros = DataIdMapDataName(options, fields);
// 通过反射获得方法，让方法invoke，调用。
String getMethodName = null;
Class tCls = null;
@@ -306,12 +339,12 @@ public class RegisterService {
if (optionProsProxy != null && listFields.contains(optionProsProxy.get(i))) {
getMethodName = "get" + optionProsProxy.get(i).substring(0, 1).toUpperCase() + optionProsProxy.get(i).substring(1);
tCls = listInfo.get(j).getClass();
- getMethod = tCls.getMethod(getMethodName,new Class[] {});
- Object value = getMethod.invoke(listInfo.get(j), new Object[] {});
+ getMethod = tCls.getMethod(getMethodName, new Class[]{});
+ Object value = getMethod.invoke(listInfo.get(j), new Object[]{});
// 把数据放入到新的list集合中，并最后把这个集合的内容导出到excel中
- formatData(listNew, value, optionProsProxy.get(i),listMapPros);
- if (optionProsProxy == null){
- break;
+ formatData(listNew, value, optionProsProxy.get(i), listMapPros);
+ if (optionProsProxy == null) {
+ break;
}
}
}
@@ -331,7 +364,7 @@ public class RegisterService {
*
* @see [类、类#方法、类#成员]
*/
- public void formatData(List<String> listNew, Object value,String propertyName,Map<String,Map<String, String>> listMapPros) {
+ public void formatData(List<String> listNew, Object value, String propertyName, Map<String, Map<String, String>> listMapPros) {
// private boolean whetherDelete; private Date modifyTime;private Date
// birthday;
// private User modifyBy; private Date createTime;private Date
@@ -351,7 +384,7 @@ public class RegisterService {
} else if (value instanceof Integer) {
// Integer类型的数值会代表不同的内容，所以通过数据库initMetadata()初始化Metadata的数据查出的
// List集合来分别代表不同的内容。
- textValue = DataIdToDataName(listMapPros, value,propertyName);
+ textValue = DataIdToDataName(listMapPros, value, propertyName);
} else {
if (value != null)
textValue = value.toString();
@@ -359,16 +392,16 @@ public class RegisterService {
listNew.add(textValue);
}
- public String DataIdToDataName(Map<String,Map<String, String>> listMapPros, Object value,String propertyName) {
+ public String DataIdToDataName(Map<String, Map<String, String>> listMapPros, Object value, String propertyName) {
return listMapPros.get(propertyName).get(String.valueOf(value));
}
// 根据属性名查出属性名由状态数字表示的真正属性名,并放到map映射中。
- public Map<String,Map<String, String>> DataIdMapDataName(String[] optionPros,Field[] fields) {
+ public Map<String, Map<String, String>> DataIdMapDataName(String[] optionPros, Field[] fields) {
List<Metadata> listMeta = new ArrayList<Metadata>();
// 把Integer状态转化为String的名字，先把需要转化的属性跳出来，然后放到一个List集合中，再把该集合中的每一个需要转化的属性的所有状态码与属性名的映射放到一个新的list中
- Map<String,Map<String, String>> mapMapPros = new HashMap<String,Map<String, String>>();
+ Map<String, Map<String, String>> mapMapPros = new HashMap<String, Map<String, String>>();
List<String> listPros = new ArrayList<String>();
for (String property : optionPros) {
for (Field field : fields) {
@@ -380,17 +413,17 @@ public class RegisterService {
}
}
for (String property1 : listPros) {
- if(property1.equals("registerStatus")){
+ if (property1.equals("registerStatus")) {
listMeta = metadataService.getMetadatasByType2("status");
- }else{
+ } else {
listMeta = metadataService.getMetadatasByType2(property1);
}
Map<String, String> mapData = new HashMap<String, String>();
for (Metadata meta : listMeta) {
mapData.put(meta.getDataNameId(), meta.getDataName());
}
- if(!mapData.isEmpty()){
- mapMapPros.put(property1,mapData);
+ if (!mapData.isEmpty()) {
+ mapMapPros.put(property1, mapData);
}
}
return mapMapPros;
diff --git a/src/main/java/org/ccpit/business/registerManage/SubjectInfo.java b/src/main/java/org/ccpit/business/registerManage/SubjectInfo.java
index f9f9e23..93950da 100644
--- a/src/main/java/org/ccpit/business/registerManage/SubjectInfo.java
+++ b/src/main/java/org/ccpit/business/registerManage/SubjectInfo.java
@@ -87,6 +87,14 @@ public class SubjectInfo implements Serializable {
*/
private String remark;
/**
+ * 期数id
+ */
+ private long phaseId;
+ /**
+ * 期数名称
+ */
+ private String phaseName;
+ /**
* 缴费时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -261,7 +269,25 @@ public class SubjectInfo implements Serializable {
return invoiceTitle;
}
+ public long getPhaseId() {
+ return phaseId;
+ }
+
+ public void setPhaseId(long phaseId) {
+ this.phaseId = phaseId;
+ }
+
+ public String getPhaseName() {
+ return phaseName;
+ }
+
+ public void setPhaseName(String phaseName) {
+ this.phaseName = phaseName;
+ }
+
public void setInvoiceTitle(String invoiceTitle) {
this.invoiceTitle = invoiceTitle;
}
+
+
}
diff --git a/src/main/webapp/WEB-INF/jsp/business/phaseListPage.jsp b/src/main/webapp/WEB-INF/jsp/business/phaseListPage.jsp
index 83397c8..d3c3c4f 100644
--- a/src/main/webapp/WEB-INF/jsp/business/phaseListPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/business/phaseListPage.jsp
@@ -80,7 +80,7 @@
</style>
</head>
<body style="overflow:hidden">
-<div class="easyui-panel" id="queryDiv" title="资讯查询" collapsed="false" collapsible="false">
+<div class="easyui-panel" id="queryDiv" title="查询" collapsed="false" collapsible="false">
<form method="post" id="queryFormId" name="queryForm">
<div class="querytable" align="left">
<tr>
@@ -115,7 +115,7 @@
<div class="edittable">
<div class="props">
<div>
- <label ><span>姓 名:<b style="color:red;font-weight:bold">*</b></span></label>
+ <label ><span>考试期数:<b style="color:red;font-weight:bold">*</b></span></label>
<div >
<input name='name' title="20字以内" class="easyui-validatebox" data-options="required:true"/>
</div>
diff --git a/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp b/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp
index b911430..7faa715 100644
--- a/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp
@@ -435,17 +435,23 @@
<td width="35%" align="left">
<input id="nameId" name="name" class="easyui-textbox" />
</td>
- <td width="15%" align="right"><span>姓名(英):</span></td>
- <td width="35%" align="left">
- <input id="postId" name='name_en' class="easyui-textbox" />
- </td>
- </tr>
+ </tr>
+ <tr>
+ <td width="15%" align="right"><span>Family NAME:</span></td>
+ <td width="35%" align="left">
+ <input id="name_enId" name="name_en" class="easyui-textbox" />
+ </td>
+ <td width="15%" align="right"><span>Given NAME:</span></td>
+ <td width="35%" align="left">
+ <input id="name_en_lastId" name='name_en_last' class="easyui-textbox" />
+ </td>
+ </tr>
<tr>
<td align="right"><span>性  别:</span></td>
<td align="left">
<input id="genderId" name="gender" class="easyui-combobox" />
</td>
- <td align="right"><span>性别(英):</span></td>
+ <td align="right"><span>Gender:</span></td>
<td align="left">
<input id="gender_enId" name='gender_en' class="easyui-combobox" />
</td>
@@ -455,7 +461,7 @@
<td align="left">
<input id="date1" name="birthday" type="text" class="easyui-datebox" />
</td>
- <td align="right"><span>生  日</span></td>
+ <td align="right"><span>Birthday</span></td>
<td align="left">
<input id="date2" name="dateOfBirth" type="text" class="easyui-datebox" />
</td>
@@ -465,7 +471,7 @@
<td align="left">
<input id="cityId" name="city" class="easyui-textbox" />
</td>
- <td align="right"><span>城市(英):</span></td>
+ <td align="right"><span>City:</span></td>
<td align="left">
<input id="city_enId" name='city_en' class="easyui-textbox" />
</td>
@@ -475,7 +481,7 @@
<td align="left">
<input id="companyId" name="company" class="easyui-textbox" />
</td>
- <td align="right"><span>公司(英):</span></td>
+ <td align="right"><span>Company:</span></td>
<td align="left">
<input id="company_enId" name='company_en' class="easyui-textbox" />
</td>
@@ -485,7 +491,7 @@
<td align="left">
<input id="addressId" name="address" class="easyui-textbox" />
</td>
- <td align="right"><span>地址(英):</span></td>
+ <td align="right"><span>Address:</span></td>
<td align="left">
<input id="address_enId" name='address_en' class="easyui-textbox" />
</td>
@@ -495,7 +501,7 @@
<td align="left">
<input id="telphoneId" name="telphone" class="easyui-textbox" />
</td>
- <td align="right"><span>称  谓:</span></td>
+ <td align="right"><span>Title:</span></td>
<td align="left">
<input id="titleId" name='title' class="easyui-textbox" />
</td>
@@ -505,7 +511,7 @@
<td align="left">
<input id="mobileTelId" name="mobileTel" class="easyui-textbox" />
</td>
- <td align="right"><span>手机(英):</span></td>
+ <td align="right"><span>CellPhone:</span></td>
<td align="left">
<input id="phoneId" name='phone' class="easyui-textbox" />
</td>
@@ -515,7 +521,7 @@
<td align="left">
<input id="emailId" name="email" class="easyui-textbox" />
</td>
- <td align="right"><span>邮箱(英):</span></td>
+ <td align="right"><span>Email:</span></td>
<td align="left">
<input id="email_enId" name='email_en' class="easyui-textbox" />
</td>
@@ -777,7 +783,7 @@
<option value="6">证书寄送</option>
</select>
</td>
- <td align="right"><span>DC  号:</span></td>
+ <td align="right"><span>LIBF NUMBER:</span></td>
<td align="left">
<input id="dcNumber_Id" name='dcNumber' class="easyui-textbox" />
</td>
diff --git a/src/main/webapp/WEB-INF/jsp/front/info.jsp b/src/main/webapp/WEB-INF/jsp/front/info.jsp
index ac40bc8..42c9bd1 100644
--- a/src/main/webapp/WEB-INF/jsp/front/info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/front/info.jsp
@@ -25,21 +25,19 @@
<script src="/resource/front/js/photoUpload.js"></script>
<script src="/resource/front/js/info.js"></script>
</head>
-<body>
<div class="wrapper">
<div id="top"><IMG src="/resource/front/img/banner.png" width=1024 height=204></div>
<div class="pp"></div>
-
<table width="" border="0" cellpadding="0" cellspacing="0" style="width:100%;min-height:612px;">
<tr>
<td>
<table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
<td align="center" class="title1">
- <yh:yh id="0_spanParticipantsRegistrationInformation"
- ENGLISH="Participants Registration Information"
- ISNOTNULL="0">考生信息查询</yh:yh>
- </td>
+ <yh:yh id="0_spanParticipantsRegistrationInformation"
+ ENGLISH="Participants Registration Information"
+ ISNOTNULL="0">考生信息查询</yh:yh>
+ </td>
</tr>
<tr>
<td>
@@ -48,12 +46,35 @@
</tr>
</table>
<table width="100%" border="0" cellspacing="2" cellpadding="0" align="center">
-
- <td height="25" colspan="2">
<!--开始 -->
<table class="body" border="0" cellpadding="0" cellspacing="2" width="100%" id="feijrr">
<tbody>
<tr>
+ <td class="title" background="/resource/front/img/dh.gif" height="24" colspan="3"> 重要须知</td>
+ </tr>
+ <tr>
+ <td class="name">1.</td>
+ <td colspan="3">
+ <p>考生如需修改以下注册信息，请联系负责老师:
+ </p>
+ <p>CDCS、CITF、CSDG、CertPAY--邓默   cdcschina@ccpit.org; 
+ citfchina@ccpit.org; csdgchina@ccpit.org; certpaychina@ccpit.org</p>
+ <p>CTFC、CSCF--隋梦箐  ctfcchina@ccpit.org; cscfchina@ccpit.org</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="name">2.</td>
+ <td colspan="3">
+ <p>本系统仅用于考试报名信息的采集工作，并于每年12月31日自动重置，次年1月1日后登录本系统需重新注册</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="name">3.</td>
+ <td colspan="3">
+ <p>考生可同时报名多项考试，请自行把握复习时间，缴费成功后，可登陆My LIBF系统查看报名情况并进行学习</p>
+ </td>
+ </tr>
+ <tr>
<td td="" colspan="3" class="title" align="left" background="/resource/front/img/dh.gif"
height="24"><yh:yh id="0_ParticipantsInformation"
english="Participant's Information"
@@ -66,7 +87,8 @@
<td>
<c:forEach items="${subjectInfos}" var="subj">
<c:forEach items="${subject}" var="s">
- <font style="font-size: 14px"><c:if test="${subj.subject == s.dataNameId}">${s.dataName} <br></c:if></font>
+ <font style="font-size: 17px;font-weight: bold"><c:if
+ test="${subj.subject == s.dataNameId}">${s.dataName} <br></c:if></font>
</c:forEach>
</c:forEach>
</td>
@@ -87,14 +109,14 @@
<tr name="">
<td class="name" width="25%">备注:</td>
<td style="font-size:16px;color:red;font-weight:bold">
- ${registerInfo.standby1}
+ ${registerInfo.standby1}
</td>
</tr>
</c:if>
<c:if test="${registerInfo.regType}">
<tr id="" name="trEmial">
<td class="name" width="25%">报名状态:</td>
- <td style="font-size:16px;color:red;font-weight:bold">
+ <td style="font-size:16px;color:red;font-weight:bold">
<c:forEach items="${status}" var="s">
<c:if test="${registerInfo.registerStatus == s.dataNameId}">${s.dataName} </c:if>
</c:forEach>
@@ -116,7 +138,7 @@
<c:if test="${!registerInfo.regType}">
<tr id="" name="trEmial">
<td class="name" width="25%">报名状态:</td>
- <td style="font-size:16px;color:red;font-weight:bold">
+ <td style="font-size:16px;color:red;font-weight:bold">
<c:forEach items="${status2}" var="s">
<c:if test="${registerInfo.registerStatus2 == s.dataNameId}">${s.dataName} </c:if>
</c:forEach>
@@ -169,8 +191,8 @@
<tr>
<td class="name">增值税发票:</td>
<td>
- <c:if test="${registerInfo.appreciationTaxType == 1}">增值税普通发票 </c:if>
- <c:if test="${registerInfo.appreciationTaxType == 2}">增值税专用发票 </c:if>
+ <c:if test="${registerInfo.appreciationTaxType == 1}">增值税普通发票 </c:if>
+ <c:if test="${registerInfo.appreciationTaxType == 2}">增值税专用发票 </c:if>
</td>
</tr>
<tr>
@@ -185,47 +207,46 @@
</c:forEach>
</td>
</tr>
+ <tr>
+ <td class="name">纳税人识别号:</td>
+ <td id="taxpayerNum_id">${registerInfo.taxpayerNum}</td>
+ </tr>
<c:if test="${registerInfo.appreciationTaxType == 2}">
- <tr>
- <td class="name">纳税人识别号:</td>
- <td id="taxpayerNum_id">${registerInfo.taxpayerNum}</td>
- </tr>
+ <tr>
+ <td class="name">公司地址:</td>
+ <td id="addressName_id">${registerInfo.addressName}</td>
+ </tr>
</c:if>
<c:if test="${registerInfo.appreciationTaxType == 2}">
- <tr>
- <td class="name">公司地址:</td>
- <td id="addressName_id">${registerInfo.addressName}</td>
- </tr>
+ <tr>
+ <td class="name">公司电话:</td>
+ <td id="telephone_id">${registerInfo.telephone}</td>
+ </tr>
</c:if>
<c:if test="${registerInfo.appreciationTaxType == 2}">
- <tr>
- <td class="name">公司电话:</td>
- <td id="telephone_id">${registerInfo.telephone}</td>
- </tr>
+ <tr>
+ <td class="name">开户行:</td>
+ <td id="bankAddress_id">${registerInfo.bankAddress}</td>
+ </tr>
</c:if>
<c:if test="${registerInfo.appreciationTaxType == 2}">
- <tr>
- <td class="name">开户行:</td>
- <td id="bankAddress_id">${registerInfo.bankAddress}</td>
- </tr>
- </c:if>
- <c:if test="${registerInfo.appreciationTaxType == 2}">
- <tr>
- <td class="name">银行账号:</td>
- <td id="bankAccount_id">${registerInfo.bankAccount}</td>
- </tr>
- </c:if>
- <tr>
- <td class="name">城市:</td>
- <td>${registerInfo.city}</td>
- </tr>
+ <tr>
+ <td class="name">银行账号:</td>
+ <td id="bankAccount_id">${registerInfo.bankAccount}</td>
+ </tr>
+ </c:if>
</c:if>
<tr>
- <td class="name">NAME:</td>
+ <td class="name">Family Name:</td>
<td>${registerInfo.name_en}</td>
</tr>
<tr>
+ <td class="name">Given Name:</td>
+ <td>${registerInfo.name_en_last}</td>
+
+ </tr>
+ <tr>
<td class="name">CITY SELECT:</td>
<td>${registerInfo.city_en}</td>
</tr>
@@ -263,134 +284,128 @@
<td>中国</td>
</tr>
<tr>
- <td class="title" background="/resource/front/img/dh.gif" height="24" colspan="3">查看/上传证书</td>
+ <td class="title" background="/resource/front/img/dh.gif" height="24" colspan="3">
+ 上传考生名片
+ </td>
</tr>
+<%-- <tr>--%>
+<%-- <td class="name">选择科目</td>--%>
+<%-- <td align="left" width="30%">--%>
+<%-- <select id="choose_subject_id">--%>
+<%-- <c:forEach items="${subjectInfos}" var="subj">--%>
+<%-- <option value="${subj.id}">--%>
+<%-- <c:forEach items="${subject}" var="s">--%>
+<%-- <c:if test="${subj.subject == s.dataNameId}">${s.dataName} </c:if>--%>
+<%-- </c:forEach>--%>
+<%-- </option>--%>
+<%-- </c:forEach>--%>
+<%-- </select>--%>
+<%-- </td>--%>
+<%-- </tr>--%>
<tr>
- <td class="name">选择科目</td>
+ <td class="name">考生名片:</td>
<td align="left" width="30%">
- <select id="choose_subject_id">
- <c:forEach items="${subjectInfos}" var="subj">
- <option value="${subj.id}">
- <c:forEach items="${subject}" var="s">
- <c:if test="${subj.subject == s.dataNameId}">${s.dataName} </c:if>
- </c:forEach>
- </option>
- </c:forEach>
- </select>
+ <input id="imageUrlId1" class="PhotoUpload" type="file" name='file'/>
+ </td>
+ <td align="left">
+ <input data-target="imageUrlId1" class="PhotoUploadButton" type="button" value="上传"
+ name="upload" style="width:80px;height:20px">
</td>
</tr>
<tr>
- <td class="name">证书照片1:</td>
- <td align="left" width="30%">
- <input id="imageUrlId1" class="PhotoUpload" type="file" name='file'/>
- </td>
- <td align="left">
- <input data-target="imageUrlId1" class="PhotoUploadButton" type="button" value="上传" name="upload" style="width:80px;height:20px">
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <div><img data-target="imageUrlId1" id="img1" src="${registerInfo.img1}" style="width:150px;height:100px"></div>
- </td>
- <td align="left" valign="top">
- <p style="color: #000000">图片支持式为：bmp、gif、jpeg、jpg、png,图片大小不要超过1M</p>
- <p style="color: red;font-size:16px">注意：报考CITF考生如曾考过CDCS/CSDG考试，请在此上传<font style="font-weight:900">CDCS/CSDG证书照片</font>，以作为享受优惠的证明资料，</p>
- <p style="color: red;font-size:16px">详情请见CITF考试报名通知</p>
- </td>
- </tr>
- <tr>
- <td class="name">证书照片2:</td>
- <td align="left" width="30%">
- <input id="imageUrlId2" class="PhotoUpload" type="file" name='file'/>
- </td>
- <td align="left">
- <input data-target="imageUrlId2" class="PhotoUploadButton" type="button" value="上传" name="upload" style="width:80px;height:20px">
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <div><img data-target="imageUrlId2" id="img2" src="${registerInfo.img2}" style="width:150px;height:100px"></div>
- </td>
- <td align="left" valign="top">
- <p style="color: #000000">图片支持式为：bmp、gif、jpeg、jpg、png,图片大小不要超过1M</p>
- <p style="color: red;font-size:16px">注意：报考CITF考生如曾考过CDCS/CSDG考试，请在此上传<font style="font-weight:900">CDCS/CSDG证书照片</font>，以作为享受优惠的证明资料，</p>
- <p style="color: red;font-size:16px">详情请见CITF考试报名通知</p>
- </td>
- </tr>
- <tr>
- <td class="name">证书照片3:</td>
- <td align="left" width="30%">
- <input id="imageUrlId3" class="PhotoUpload" type="file" name='file'/>
- </td>
- <td align="left">
- <input data-target="imageUrlId3" class="PhotoUploadButton" type="button" value="上传" name="upload" style="width:80px;height:20px">
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <div><img data-target="imageUrlId3" id="img3" src="${registerInfo.img3}" style="width:150px;height:100px"></div>
- </td>
- <td align="left" valign="top">
- <p style="color: #000000">图片支持式为：bmp、gif、jpeg、jpg、png,图片大小不要超过1M</p>
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <Button id="saveCertificateId" style="width:80px;height:20px">保存证书</Button>
- </td>
- </tr>
-
+ <td></td>
+ <td>
+ <div><img data-target="imageUrlId1" id="img1" src="${registerInfo.img1}"
+ style="width:150px;height:100px"></div>
+ </td>
+ <td align="left" valign="top">
+ <p style="color: #000000">图片支持式为：bmp、gif、jpeg、jpg、png,图片大小不要超过1M</p>
+ <p style="color: red;font-size:16px">如开具增值税专用发票，请考生上传个人名片，</p>
+ <p style="color: red;font-size:16px">或其他可证明考生供职于发票抬头所在单位的证明文件，如工牌、入职证明书（拍照即可）等</p>
+ </td>
+ </tr>
<tr>
- <td class=""></td>
- <td><a style="font-size:16px;" href="https://my.libf.ac.uk/Account/login.aspx?site=myifslearning&ReturnUrl=%2f" target="_blank">My LIBF 快捷登录</a></td>
+ <td></td>
+ <td>
+ <Button id="saveCertificateId" style="width:80px;height:20px">保存照片</Button>
+ </td>
+ </tr>
+ <tr>
+ <td class="title" background="/resource/front/img/dh.gif" height="24" colspan="3">My LIBF 登录
+ </td>
</tr>
<tr>
+ <td class=""></td>
+ <td><a style="font-size:16px;"
+ href="https://my.libf.ac.uk/Account/login.aspx?site=myifslearning&ReturnUrl=%2f"
+ target="_blank">
+ <button>My LIBF 快捷登录</button>
+ </a></td>
<td>
+ <p style="color: #000000">考生缴费成功后3到5个工作日，会收到LIBF的确认邮件，请考生登录My LIBF系统，激活账号用于学习</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="name"><font style="font-size: 14px;color: red">您是否要报考其他国际贸易金融6C专家考试？</font></td>
+ <td width="30%">
+ <select id="other_subject_id" style="width: 220px">
+ <option value="">请选择</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </select>
</td>
-
</tr>
</tbody>
</table>
- <tr>
- <td><hr></td>
- </tr>
- <form id="form">
- <table id="tabThesis" name="tabThesis" align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
- <tbody><tr>
- <td class="title" background="/resource/front/img/dh.gif" height="24">报名考试科目</td>
- </tr>
- <tr>
- <td class="body">
- <table border="0" cellpadding="3" cellspacing="3" width="100%">
- <tbody><tr>
- <td width="3%"> </td>
- <td id="tdBase" name="tdBase" width="97%"><table class="body" width="100%"><tbody>
- <tr valign="top">
- <c:forEach items="${subject}" var="g" varStatus="s">
- <c:if test="${s.index>0 && s.index%3==0}"> </tr><tr valign="top"></c:if>
- <td width="33%"><input <c:if test="${s.index==0}">checked="checked"</c:if> id="disid" name="subject" disid="23242AA2BE0E1782E050A8C0480173A9" rowindex="0" type="radio" value="${g.dataNameId}">${g.dataName}</td>
- </c:forEach>
- </tr>
- </tbody></table></td>
- </tr>
- </tbody></table>
- </td>
- </tr>
- </tbody></table>
<tr>
- <td><hr></td>
+ <td>
+ <hr>
+ </td>
</tr>
- <table id="subject_table">
- <tr>
- <td class="body">
+ <form id="form" >
+ <table id="tabThesis" name="tabThesis" align="center" border="0" cellpadding="0" cellspacing="0" width="100%" >
+ <tbody>
<tr>
- <td class="name"><span style="color: red;">*</span><yh:yh id="1_customitem6" english="Custom Item6:" isnotnull="0">增值税发票:</yh:yh></td>
- <td><select class="required" id="appreciationTaxTypeId" name="appreciationTaxType" style="width:220px">
+ <td class="title" colspan="4" background="/resource/front/img/dh.gif" height="24">报名考试科目 </td>
+ </tr>
+ <tr>
+ <td class="body" colspan="4">
+ <table border="0" cellpadding="3" cellspacing="3" width="100%">
+ <tbody>
+ <tr>
+ <td width="3%"> </td>
+ <td id="tdBase" name="tdBase" width="97%">
+ <table class="body" width="100%">
+ <tr valign="top">
+ <c:forEach items="${subject}" var="g" varStatus="s">
+ <c:if test="${s.index>0 && s.index%3==0}"> </tr>
+ <tr valign="top"></c:if>
+ <td width="33%"><input
+ <c:if test="${s.index==0}">checked="checked"</c:if>
+ id="disid" name="subject"
+ disid="23242AA2BE0E1782E050A8C0480173A9"
+ rowindex="0" type="radio"
+ value="${g.dataNameId}">${g.dataName}</td>
+ </c:forEach>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <hr>
+ </td>
+ </tr>
+ <tr>
+ <td class="name"><span style="color: red;">*</span>增值税发票:
+ </td>
+ <td><select class="required" id="appreciationTaxTypeId"
+ name="appreciationTaxType" style="width:220px">
<option value="">请选择</option>
<option value="1">增值税普通发票</option>
<option value="2">增值税专用发票</option>
@@ -399,82 +414,99 @@
</tr>
<tr name="trCompanyName" id="companyNameId" style="display :none">
<td class="name"><span style="color: red;">*</span>发票抬头:</td>
- <td><input id="companyNameId01" class="required" name="invoiceTitle" style="width:220px" type="text"></td>
+ <td><input id="companyNameId01" class="required" name="invoiceTitle"
+ style="width:220px" type="text"></td>
<td><span class="reg_body">请填写您的单位全称</span></td>
</tr>
<tr id="subjectNameId" name="trSubjectName" style="display :none">
<td class="name"><span style="color: red;">*</span>发票类型:</td>
<!-- <td><input id="subjectNameId01" class="required" name="subjectName" style="width:220px" type="text"></td> -->
<td>
- <select id="subjectNameId01" class="required" name="invoiceType" style="width:220px">
+ <select id="subjectNameId01" class="required" name="invoiceType"
+ style="width:220px">
<option value="">请选择</option>
<c:forEach items="${invoiceType}" var="g">
<option value="${g.dataNameId}">${g.dataName}</option>
</c:forEach>
</select>
</td>
- <td><span class="reg_body">请选择您的发票类型</span></td></div>
+ <td><span class="reg_body">请选择您的发票类型</span></td>
</tr>
<tr id="taxpayerNumId" name="trTaxpayerNum" style="display :none">
<td class="name"><span style="color: red;">*</span>纳税人识别号:</td>
- <td><input id="taxpayerNumId01" class="required" name="taxpayerNum" style="width:220px" type="text"></td>
- <td><span class="reg_body">请填写您的纳税人识别号</span></td></div>
+ <td><input id="taxpayerNumId01" class="required" name="taxpayerNum"
+ style="width:220px" type="text"></td>
+ <td><span class="reg_body">请填写您的纳税人识别号</span></td>
</tr>
<tr id="addressNameId" name="trAddressName" style="display :none">
- <div><td class="name"><span style="color: red;">*</span>公司地址:</td>
- <td><input id="addressNameId01" class="required" name="addressName" style="width:220px" type="text"></td>
- <td><span class="reg_body">请填写您的公司地址</span></td></div>
+ <div>
+ <td class="name"><span style="color: red;">*</span>公司地址:</td>
+ <td><input id="addressNameId01" class="required" name="addressName"
+ style="width:220px" type="text"></td>
+ <td><span class="reg_body">请填写您的公司地址</span></td>
+ </div>
</tr>
<tr id="telephoneId" name="trTelephone" style="display :none">
- <div><td class="name"><span style="color: red;">*</span>公司电话:</td>
- <td><input id="telephoneId01" class="required" name="telephone" style="width:220px" type="text"></td>
- <td><span class="reg_body">请填写您的公司电话</span></td></div>
+ <div>
+ <td class="name"><span style="color: red;">*</span>公司电话:</td>
+ <td><input id="telephoneId01" class="required" name="telephone"
+ style="width:220px" type="text"></td>
+ <td><span class="reg_body">请填写您的公司电话</span></td>
+ </div>
</tr>
<tr id="bankAddressId" name="trBankAddress" style="display :none">
- <div><td class="name"><span style="color: red;">*</span>开户行:</td>
- <td><input id="bankAddressId01" class="required" name="bankAddress" style="width:220px" type="text"></td>
- <td><span class="reg_body">请填写您的开户行</span></td></div>
+ <div>
+ <td class="name"><span style="color: red;">*</span>开户行:</td>
+ <td><input id="bankAddressId01" class="required" name="bankAddress"
+ style="width:220px" type="text"></td>
+ <td><span class="reg_body">请填写您的开户行</span></td>
+ </div>
</tr>
<tr id="bankAccountId" name="trBankAccount" style="display :none">
- <div><td class="name"><span style="color: red;">*</span>银行账号:</td>
- <td><input id="bankAccountId01" class="required" name="bankAccount" style="width:220px" type="text"></td>
- <td><span class="reg_body">请填写您的开户行账号</span></td></div>
+ <div>
+ <td class="name"><span style="color: red;">*</span>银行账号:</td>
+ <td><input id="bankAccountId01" class="required" name="bankAccount"
+ style="width:220px" type="text"></td>
+ <td><span class="reg_body">请填写您的开户行账号</span></td>
+ </div>
</tr>
<tr>
- <td class="name"><span style="color: red;">*</span><yh:yh id="1_customitem6" english="Custom Item6:" isnotnull="0">发票开具时间:</yh:yh></td>
- <td><select class="required" id="taxIssueId" name="taxIssue" style="width:220px">
+ <td class="name"><span style="color: red;">*</span><yh:yh id="1_customitem6"
+ english="Custom Item6:"
+ isnotnull="0">发票开具时间:</yh:yh>
+ </td>
+ <td><select class="required" id="taxIssueId" name="taxIssue"
+ style="width:220px">
<option value="">请选择</option>
<option value="1">款项到账当年开具</option>
<option value="2">款项到账次年开具</option>
</select></td>
- <td><span class="reg_body"></span></td>
+ <td><span class="reg_body">当年开具为款项到账后的两个月内，次年开具为到账第二年的1月31日前</span></td>
</tr>
- <tr >
+ <tr>
<td align="center">
<div class="message"></div>
</td>
</tr>
-
- </td>
- </tr>
- </table>
- </form>
- </td>
- <div id="dengf">
- <td align="center">
- <input id="submit" name="BtnSubmit" class="buttonstyle1" value="提交" onclick="javascript:;" type="button">
- <input id="login" name="BtnReset" class="buttonstyle1" value="登录" onclick="javascript:;" type="button">
- </td>
- </div>
+ <tr>
+ <td align="center" COLSPAN="4">
+ <input id="submit" name="BtnSubmit" class="buttonstyle1" value="提交" onclick="javascript:;" type="button">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </form>
</table>
+ </td>
+ </tr>
</table>
-
- <div class="pp">
- </div>
- <div id="foot">
- <p>©版权所有：中国国际贸易促进委员会（中国国际商会）培训中心 地址：北京市西城区桦皮厂胡同2号国际商会大厦2层 邮编：100035电话：010-82217206 传真：010-82217272<br>
- 邮箱：training@ccpit.org 技术支持：中贸促信息技术有限责任公司</p>
- </div>
+</div>
+<div class="pp">
+</div>
+<div id="foot">
+ <p>©版权所有：中国国际贸易促进委员会（中国国际商会）培训中心 地址：北京市西城区桦皮厂胡同2号国际商会大厦2层 邮编：100035电话：010-82217206 传真：010-82217272<br>
+ 邮箱：training@ccpit.org 技术支持：中贸促信息技术有限责任公司</p>
+</div>
</div>
<%--<script src="/resource/front/js/jquery.min.js" type="text/javascript"></script>--%>
<script src="/resource/front/js/jquery.form.min.js" type="text/javascript"></script>
diff --git a/src/main/webapp/WEB-INF/jsp/front/login.jsp b/src/main/webapp/WEB-INF/jsp/front/login.jsp
index ffc7681..71b191f 100644
--- a/src/main/webapp/WEB-INF/jsp/front/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/front/login.jsp
@@ -51,10 +51,9 @@
<tr><td colspan="2">
<div style="float:left; width:157px"> </div><div style="font-weight:bold;color:blue;cursor:pointer;"><span><a href="/training/resetPassword?type=true">忘记密码？</a></span></div>
- <div style="float:left; width:157px"> </div><div style="font-weight:bold;"><span>如果您是参加本届考试请点击注册。</span></div>
- <div style="float:left; width:157px"> </div><div style="font-weight:bold;"><span>本系统仅用于当期考试报名信息搜集，往期报名信息不做保</span></div>
- <div style="float:left; width:157px"> </div><div style="font-weight:bold;"><span>留，请所有补考报名考生重新注册并填写信息。</span></div>
- <div style="float:left; width:157px"> </div><div style="font-weight:bold;"><span>如果您已注册完毕，请直接登录查看报名进度。</span></div>
+ <div style="float:left; width:157px"> </div><div style="font-weight:bold;"><span>本系统仅用于考试报名信息搜集。</span></div>
+ <div style="float:left; width:157px"> </div><div style="font-weight:bold;"><span>报名信息每自然年度重置一次，往年报名信息不做保存，</span></div>
+ <div style="float:left; width:157px"> </div><div style="font-weight:bold;"><span>考生需重新注册；</span></div>
<div style="float:left; width:157px"> </div><div style="font-weight:bold;color:red;" class="message"></div>
</td></tr>
<tr><td></td><td colspan="1" align="left"><div > </div>
diff --git a/src/main/webapp/WEB-INF/jsp/front/reg.jsp b/src/main/webapp/WEB-INF/jsp/front/reg.jsp
index 57c3c71..b2d6554 100644
--- a/src/main/webapp/WEB-INF/jsp/front/reg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/front/reg.jsp
@@ -60,13 +60,13 @@
</tr>
<tr id="trChinaName" name="name">
<td class="name"><span style="color: red;">*</span><yh:yh id="1_Info_FullName" english="Full Name:" isnotnull="1">姓名（中文）:</yh:yh></td>
- <td><input class="required" name="name" onblur="changeName(this)" onkeyup="if(event.keyCode==13){this.blur();}" value="" style="width:220px" type="text"></td>
+ <td><input class="required" name="name" value="" style="width:220px" type="text"></td>
<td><span class="reg_body">请填写真实姓名</span></td>
</tr>
</tr>
<tr id="trSex" name="gender">
<td class="name"><span style="color: red;">*</span><yh:yh id="1_Info_Sex" english="Sex:" isnotnull="0">性别:</yh:yh></td>
- <td><select name="gender" class="required" style="width:220px" onblur="changeName(this)" onkeyup="if(event.keyCode==13){this.blur();}">
+ <td><select name="gender" class="required" style="width:220px" >
<option value="">请选择</option>
<c:forEach items="${gender}" var="g">
<option value="${g.dataNameId}">${g.dataName}</option>
@@ -171,12 +171,12 @@
<option value="1">款项到账当年开具</option>
<option value="2">款项到账次年开具</option>
</select></td>
- <td><span class="reg_body"></span></td>
+ <td><span class="reg_body">当年开具为款项到账后的两个月内，次年开具为到账第二年的1月31日前</span></td>
</tr>
<tr>
- <td class="name"><yh:yh id="1_A_LINK_LIKE" english="Hobby:" isnotnull="0">DC/LIBF NUMBER:</yh:yh></td>
+ <td class="name"><yh:yh id="1_A_LINK_LIKE" english="Hobby:" isnotnull="0">LIBF NUMBER:</yh:yh></td>
<td><input name="dcNumber" style="width:220px" type="text"></td>
- <td><span class="reg_body">原IFS号码，仅限补考考生填写，该框填写字母与数字</span></td>
+ <td><span class="reg_body">参加过6C考试的考生请填写，首次报名无需填写</span></td>
</tr>
@@ -206,9 +206,14 @@
</tr>
<tr>
- <td class="name"><span style="color: red;">*</span><yh:yh id="1_expandinfo2" english="Expand Info2:" isnotnull="0">NAME:</yh:yh></td>
+ <td class="name"><span style="color: red;">*</span><yh:yh id="1_expandinfo2" english="Expand Info2:" isnotnull="0">Family NAME:</yh:yh></td>
<td><input class="required" name="name_en" style="width:220px" type="text"></td>
- <td><span class="reg_body">姓名拼音，Family Name空格Given Name，如：Liu Xiangning</span></td>
+ <td><span class="reg_body"></span></td>
+ </tr>
+ <tr>
+ <td class="name"><span style="color: red;">*</span><yh:yh id="1_expandinfo22" english="Expand Info2:" isnotnull="0">Given NAME:</yh:yh></td>
+ <td><input class="required" name="name_en_last" style="width:220px" type="text"></td>
+ <td><span class="reg_body"></span></td>
</tr>
<tr>
<td class="name"><span style="color: red;">*</span><yh:yh id="1_expandinfo3" english="Expand Info3:" isnotnull="0">COMPANY NAME:</yh:yh></td>
@@ -281,7 +286,7 @@
<td align="center">
<input id="submit" name="BtnSubmit" class="buttonstyle1" value="提交" onclick="javascript:;" type="button">
<input id="reset" name="BtnReset" class="buttonstyle1" value="重置" onclick="javascript:;" type="button">
- <input id="login" name="BtnReset" class="buttonstyle1" value="登录" onclick="javascript:;" type="button">
+<%-- <input id="login" name="BtnReset" class="buttonstyle1" value="登录" onclick="javascript:;" type="button">--%>
</td>
</tr>
</table>
diff --git a/src/main/webapp/resource/business/phase.js b/src/main/webapp/resource/business/phase.js
index 8f24531..091078a 100644
--- a/src/main/webapp/resource/business/phase.js
+++ b/src/main/webapp/resource/business/phase.js
@@ -184,8 +184,8 @@ function openAddWin(){
$("#main_area").height(addWinHeight);
$("#addNewsWinId").window({
title : '新增期数信息',
- width : addWinWidth,
- height : addWinHeight,
+ width : addWinWidth/2,
+ height : addWinHeight/3,
left : (dataGridWidth - addWinWidth)/2,
top : (bodyHeight - addWinHeight)/2,
closable : true, // 否显示关闭按钮
@@ -241,8 +241,8 @@ function openEditWin(){
});
$("#addNewsWinId").window({
title : '修改报名信息',
- width : addWinWidth,
- height : addWinHeight,
+ width : addWinWidth/2,
+ height : addWinHeight/3,
left : (dataGridWidth - addWinWidth)/2,
top : (bodyHeight - addWinHeight)/2,
closable : true, // 否显示关闭按钮
diff --git a/src/main/webapp/resource/business/registration.js b/src/main/webapp/resource/business/registration.js
index 4f1be4a..53a0f8e 100644
--- a/src/main/webapp/resource/business/registration.js
+++ b/src/main/webapp/resource/business/registration.js
@@ -89,7 +89,7 @@ $(function() {
$.each(subjectArray,function(n,v){
var href = "/admin/business/registerManage/exporgExcel2?&phase="+activePhase+"&bigger=1&subject="+n+
- "&fields=submitTime,city,name,gender,birthday,telphone,mobileTel,email,company,address,invoiceTitle,invoiceType,dcNumber,title,dateOfBirth,gender_en,name_en,company_en,address_en,country,phone,email,,city_en,subject";
+ "&fields=submitTime,city,name,gender,birthday,telphone,mobileTel,email,company,address,invoiceTitle,invoiceType,dcNumber,title,dateOfBirth,gender_en,name_en,name_en_last,company_en,address_en,country,phone,email,,city_en,subject";
var html="<a href='"+href+"' class='exp-btn'>"+v+"</a>";
$(".quick-export").append(html);
})
@@ -309,6 +309,8 @@ function initInputWidth(){
$("#standby1Id").attr("style", "width:" + fixShortWidth() + "px");
$("#name00Id").attr("style", "width:" + fixShortWidth() + "px");
$("#nameId").attr("style", "width:" + fixShortWidth() + "px");
+ $("#name_enId").attr("style", "width:" + fixShortWidth() + "px");
+ $("#name_en_lastId").attr("style", "width:" + fixShortWidth() + "px");
$("#postId").attr("style", "width:" + fixShortWidth() + "px");
$("#companyId").attr("style", "width:" + fixShortWidth() + "px");
$("#company_enId").attr("style", "width:" + fixShortWidth() + "px");
diff --git a/src/main/webapp/resource/front/js/info.js b/src/main/webapp/resource/front/js/info.js
index b02984c..7494b8d 100644
--- a/src/main/webapp/resource/front/js/info.js
+++ b/src/main/webapp/resource/front/js/info.js
@@ -1,4 +1,19 @@
$(function () {
+ $("#tabThesis").css('display','none');
+
+ $("#other_subject_id").change(function () {
+ var other_subject_val = $("#other_subject_id").find("option:selected").val();
+ if("1" == other_subject_val){
+ $("#tabThesis").css('display','');
+ }
+ if("2" == other_subject_val){
+ $("#tabThesis").css('display','none');
+ }
+ if("" == other_subject_val){
+ $("#tabThesis").css('display','none');
+ }
+ });
+
$("#appreciationTaxTypeId").change(function () {
var appreciationTaxType = $("#appreciationTaxTypeId").find("option:selected").val();
if ("1" == appreciationTaxType) {
@@ -53,14 +68,12 @@ $(function () {
}
});
-
+ var obj_id = $("#registerInfo_id").val();
$("#saveCertificateId").click(function () {
$.post('/training/saveCertificateId',
{
img1: $("#img1").attr("src"),
- img2: $("#img2").attr("src"),
- img3: $("#img3").attr("src"),
- obj_id: $("#choose_subject_id").val()
+ obj_id: obj_id
},
function (data) {
if (data.result) {
@@ -93,16 +106,10 @@ $(function () {
}
});
- $("#choose_subject_id").change(function () {
- var obj_id = $("#choose_subject_id").val();
- $.get('/training/getObj?obj_id=' + obj_id, function (data) {
- $("#img1").attr('src',data.obj.img1);
- $("#img2").attr('src',data.obj.img2);
- $("#img3").attr('src',data.obj.img3);
- })
+ $.get('/training/getObj?obj_id=' + obj_id, function (data) {
+ $("#img1").attr('src',data.obj.img1);
})
-
})
function checkRequired() {