Skip to content

R
registration
Commit c16dd80d by 丁伟
Options

1、报名系统2.0版本修改

parent 78da22b6
Showing with 136 additions and 67 deletions
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){
......
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();
}
}
}
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;
}
}
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;
}
}
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>姓&emsp;名:<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>
......
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>性&emsp;&emsp;别:</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>生&emsp;&emsp;日</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>称&emsp;&emsp;谓:</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&emsp;&emsp;号:</span></td>
<td align="right"><span>LIBF NUMBER:</span></td>
<td align="left">
<input id="dcNumber_Id" name='dcNumber' class="easyui-textbox" />
</td>
......
src/main/webapp/WEB-INF/jsp/front/login.jsp
......@@ -51,10 +51,9 @@
<tr><td colspan="2">
<div style="float:left; width:157px">&nbsp;</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">&nbsp;</div><div style="font-weight:bold;"><span>如果您是参加本届考试请点击注册。</span></div>
<div style="float:left; width:157px">&nbsp;</div><div style="font-weight:bold;"><span>本系统仅用于当期考试报名信息搜集，往期报名信息不做保</span></div>
<div style="float:left; width:157px">&nbsp;</div><div style="font-weight:bold;"><span>留，请所有补考报名考生重新注册并填写信息。</span></div>
<div style="float:left; width:157px">&nbsp;</div><div style="font-weight:bold;"><span>如果您已注册完毕，请直接登录查看报名进度。</span></div>
<div style="float:left; width:157px">&nbsp;</div><div style="font-weight:bold;"><span>本系统仅用于考试报名信息搜集。</span></div>
<div style="float:left; width:157px">&nbsp;</div><div style="font-weight:bold;"><span>报名信息每自然年度重置一次，往年报名信息不做保存，</span></div>
<div style="float:left; width:157px">&nbsp;</div><div style="font-weight:bold;"><span>考生需重新注册；</span></div>
<div style="float:left; width:157px">&nbsp;</div><div style="font-weight:bold;color:red;" class="message"></div>
</td></tr>
<tr><td></td><td colspan="1" align="left"><div >&nbsp;</div>
......
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>
......
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, // 否显示关闭按钮
......
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");
......
src/main/webapp/resource/front/js/info.js
$(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() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment