Skip to content

R
registration
Commit d646c7d7 by 丁伟
Options

1、报名页联系地址字段增加省市区联动，并导出数据

parent 8941970c
Showing with 118 additions and 35 deletions
src/main/java/org/ccpit/business/registerManage/IndexController.java
...@@ -249,10 +249,13 @@ public class IndexController extends BaseController { ...@@ -249,10 +249,13 @@ public class IndexController extends BaseController {
if (phase == null) { if (phase == null) {
return null; return null;
} }
String province = request.getParameter("province");
String chengshi = request.getParameter("chengshi");
String district = request.getParameter("district");
registerInfo.setProvince(province);
registerInfo.setChengshi(chengshi);
registerInfo.setDistrict(district);
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String pre_address = request.getParameter("pre_address");
String address = registerInfo.getAddress();
registerInfo.setAddress(pre_address+address);
if (StringUtils.isEmpty(registerInfo.getEmail())) { if (StringUtils.isEmpty(registerInfo.getEmail())) {
map.put("success", false); map.put("success", false);
map.put("info", "请填写邮箱"); map.put("info", "请填写邮箱");
......
src/main/java/org/ccpit/business/registerManage/RegisterInfo.java
...@@ -95,6 +95,18 @@ public class RegisterInfo implements Serializable { ...@@ -95,6 +95,18 @@ public class RegisterInfo implements Serializable {
*/ */
private Integer invoiceType; private Integer invoiceType;
/** /**
* 省
*/
private String province;
/**
* 市
*/
private String chengshi;
/**
* 区
*/
private String district;
/**
* 地址 * 地址
*/ */
private String address; private String address;
...@@ -685,5 +697,29 @@ public class RegisterInfo implements Serializable { ...@@ -685,5 +697,29 @@ public class RegisterInfo implements Serializable {
public void setInvoiceInfo(String invoiceInfo) { public void setInvoiceInfo(String invoiceInfo) {
this.invoiceInfo = invoiceInfo; this.invoiceInfo = invoiceInfo;
} }
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getChengshi() {
return chengshi;
}
public void setChengshi(String chengshi) {
this.chengshi = chengshi;
}
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
} }
src/main/java/org/ccpit/business/registerManage/RegisterService.java
...@@ -324,11 +324,11 @@ public class RegisterService { ...@@ -324,11 +324,11 @@ public class RegisterService {
public Map<String, String> initProsHeader() { public Map<String, String> initProsHeader() {
Map<String, String> mapProsHeader = new HashMap<String, String>(); Map<String, String> mapProsHeader = new HashMap<String, String>();
String[] enPros = {"id", "submitTime", "city", "name", "password", "gender", "birthday", "telphone", "mobileTel", "email", "company", "address" String[] enPros = {"id", "submitTime", "name", "password", "gender", "birthday", "telphone", "mobileTel", "email", "company", "province","chengshi","district","address"
, "taxIssue","appreciationTaxType","invoiceTitle", "invoiceInfo", "taxpayerNum", "addressName", "telephone", "bankAddress", "bankAccount", "title", "dateOfBirth", "gender_en", "name_en", "name_en_last", "company_en", "address_en" , "taxIssue","appreciationTaxType","invoiceTitle", "invoiceInfo", "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" , "country", "dcNumber", "payTime", "phone", "city_en", "subject", "subject2", "registerStatus", "sort", "whetherDelete"
, "creator", "createTime", "modifyBy", "modifyTime"}; , "creator", "createTime", "modifyBy", "modifyTime"};
String[] cnPros = {"序号", "提交时间", "城市", "姓名", "密码", "性别", "出生日期", "电话", "手机", "EMAIL", "工作单位", "联系地址","发票开具时间","增值税发票类型", "发票抬头", "发票内容", "纳税人识别号", "公司地址", "公司电话", "开户行", "银行账号" String[] cnPros = {"序号", "提交时间", "姓名", "密码", "性别", "出生日期", "电话", "手机", "EMAIL", "工作单位", "省/直辖市","市","区/县","详细地址","发票开具时间","增值税发票类型", "发票抬头", "发票内容", "纳税人识别号", "公司地址", "公司电话", "开户行", "银行账号"
, "TITLE", "DATE OF BIRTH", "GENDER", "Family NAME", "Given NAME", "COMPANY NAME", "ADDRESS", "COUNTRY", "DC/IFS NUMBER", "缴费时间", "PHONE", "CITY SELECT" , "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++) { for (int i = 0; i < enPros.length; i++) {
......
src/main/sql/update.sql
/* create by dingwei 20210702 start */ /* create by dingwei 20211212 start */
alter table reg_registerinfo modify taxIssue Integer; alter table reg_subjectinfo add province varchar(100) Null;
alter table reg_subjectinfo modify taxIssue Integer; alter table reg_subjectinfo add chengshi varchar(100) Null;
/* create by dingwei 20210702 end */ alter table reg_subjectinfo add district varchar(100) Null;
/* create by dingwei 20211212 end */
select id,name,whetherDelete from reg_registerinfo where taxpayerNum = '9142';
\ No newline at end of file
src/main/sql/update_20211222.sql 0 → 100644
/* create by dingwei 20210702 start */
alter table reg_registerinfo modify taxIssue Integer;
alter table reg_subjectinfo modify taxIssue Integer;
/* create by dingwei 20210702 end */
select id,name,whetherDelete from reg_registerinfo where taxpayerNum = '9142';
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp
...@@ -154,11 +154,12 @@ ...@@ -154,11 +154,12 @@
<a class="up">&uarr;</a><a class="down">&darr;</a> <a class="up">&uarr;</a><a class="down">&darr;</a>
</div> </div>
</div> </div>
<div class="block"> <div class="block">
<div class="ele-select"> <div class="ele-select">
<input type="checkbox" checked="checked"> <input type="checkbox" checked="checked">
</div> </div>
<div class="ele-name" val="city">城市</div> <div class="ele-name" val="name">姓名</div>
<div class="ele"> <div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a> <a class="up">&uarr;</a><a class="down">&darr;</a>
</div> </div>
...@@ -167,7 +168,7 @@ ...@@ -167,7 +168,7 @@
<div class="ele-select"> <div class="ele-select">
<input type="checkbox" checked="checked"> <input type="checkbox" checked="checked">
</div> </div>
<div class="ele-name" val="name">姓名</div> <div class="ele-name" val="gender">性别</div>
<div class="ele"> <div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a> <a class="up">&uarr;</a><a class="down">&darr;</a>
</div> </div>
...@@ -176,7 +177,7 @@ ...@@ -176,7 +177,7 @@
<div class="ele-select"> <div class="ele-select">
<input type="checkbox" checked="checked"> <input type="checkbox" checked="checked">
</div> </div>
<div class="ele-name" val="gender">性别</div> <div class="ele-name" val="birthday">出生日期</div>
<div class="ele"> <div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a> <a class="up">&uarr;</a><a class="down">&darr;</a>
</div> </div>
...@@ -185,7 +186,7 @@ ...@@ -185,7 +186,7 @@
<div class="ele-select"> <div class="ele-select">
<input type="checkbox" checked="checked"> <input type="checkbox" checked="checked">
</div> </div>
<div class="ele-name" val="birthday">出生日期</div> <div class="ele-name" val="telphone">电话</div>
<div class="ele"> <div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a> <a class="up">&uarr;</a><a class="down">&darr;</a>
</div> </div>
...@@ -194,7 +195,7 @@ ...@@ -194,7 +195,7 @@
<div class="ele-select"> <div class="ele-select">
<input type="checkbox" checked="checked"> <input type="checkbox" checked="checked">
</div> </div>
<div class="ele-name" val="telphone">电话</div> <div class="ele-name" val="mobileTel">手机号</div>
<div class="ele"> <div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a> <a class="up">&uarr;</a><a class="down">&darr;</a>
</div> </div>
...@@ -203,7 +204,7 @@ ...@@ -203,7 +204,7 @@
<div class="ele-select"> <div class="ele-select">
<input type="checkbox" checked="checked"> <input type="checkbox" checked="checked">
</div> </div>
<div class="ele-name" val="mobileTel">手机号</div> <div class="ele-name" val="email">邮箱</div>
<div class="ele"> <div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a> <a class="up">&uarr;</a><a class="down">&darr;</a>
</div> </div>
...@@ -212,7 +213,7 @@ ...@@ -212,7 +213,7 @@
<div class="ele-select"> <div class="ele-select">
<input type="checkbox" checked="checked"> <input type="checkbox" checked="checked">
</div> </div>
<div class="ele-name" val="email">邮箱</div> <div class="ele-name" val="company">工作单位</div>
<div class="ele"> <div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a> <a class="up">&uarr;</a><a class="down">&darr;</a>
</div> </div>
...@@ -221,7 +222,16 @@ ...@@ -221,7 +222,16 @@
<div class="ele-select"> <div class="ele-select">
<input type="checkbox" checked="checked"> <input type="checkbox" checked="checked">
</div> </div>
<div class="ele-name" val="company">工作单位</div> <div class="ele-name" val="province">省/直辖市</div>
<div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a>
</div>
</div>
<div class="block">
<div class="ele-select">
<input type="checkbox" checked="checked">
</div>
<div class="ele-name" val="chengshi">市</div>
<div class="ele"> <div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a> <a class="up">&uarr;</a><a class="down">&darr;</a>
</div> </div>
...@@ -230,7 +240,16 @@ ...@@ -230,7 +240,16 @@
<div class="ele-select"> <div class="ele-select">
<input type="checkbox" checked="checked"> <input type="checkbox" checked="checked">
</div> </div>
<div class="ele-name" val="address">联系地址</div> <div class="ele-name" val="district">区/县</div>
<div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a>
</div>
</div>
<div class="block">
<div class="ele-select">
<input type="checkbox" checked="checked">
</div>
<div class="ele-name" val="address">详细地址</div>
<div class="ele"> <div class="ele">
<a class="up">&uarr;</a><a class="down">&darr;</a> <a class="up">&uarr;</a><a class="down">&darr;</a>
</div> </div>
...@@ -503,16 +522,32 @@ ...@@ -503,16 +522,32 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="right"><span>地&emsp;&emsp;址:</span></td> <td align="right"><span>省/直辖市:</span></td>
<td align="left"> <td align="left">
<input id="addressId" name="address" class="easyui-textbox" /> <input id="provinceId" name="province" class="easyui-textbox" />
</td> </td>
<td align="right"><span>Address:</span></td> <td align="right"><span>&emsp;&emsp;市</span></td>
<td align="left"> <td align="left">
<input id="address_enId" name='address_en' class="easyui-textbox" /> <input id="chengshiId" name='chengshi' class="easyui-textbox" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="right"><span>&emsp;&emsp;区:</span></td>
<td align="left">
<input id="districtId" name="district" class="easyui-textbox" />
</td>
</tr>
<tr>
<td align="right"><span>地&emsp;&emsp;址:</span></td>
<td align="left">
<input id="addressId" name="address" class="easyui-textbox" />
</td>
<td align="right"><span>Address:</span></td>
<td align="left">
<input id="address_enId" name='address_en' class="easyui-textbox" />
</td>
</tr>
<tr>
<td align="right"><span>电&emsp;&emsp;话:</span></td> <td align="right"><span>电&emsp;&emsp;话:</span></td>
<td align="left"> <td align="left">
<input id="telphoneId" name="telphone" class="easyui-textbox" /> <input id="telphoneId" name="telphone" class="easyui-textbox" />
......
src/main/webapp/WEB-INF/jsp/front/info.jsp
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
</tr> </tr>
<tr id="trAddress" name="trAddress"> <tr id="trAddress" name="trAddress">
<td class="name">联系地址:</td> <td class="name">联系地址:</td>
<td>${registerInfo.address}</td> <td>${registerInfo.province}${registerInfo.chengshi}${registerInfo.district}${registerInfo.address}</td>
</tr> </tr>
<tr id="trMobileTel" name="trMobileTel"> <tr id="trMobileTel" name="trMobileTel">
......
src/main/webapp/WEB-INF/jsp/front/reg.jsp
...@@ -109,14 +109,14 @@ ...@@ -109,14 +109,14 @@
<tr id="trAddress" name="trAddress"> <tr id="trAddress" name="trAddress">
<td class="name"><span style="color: red;">*</span>联系地址:</td> <td class="name"><span style="color: red;">*</span>联系地址:</td>
<td> <td>
<span class="ress" > <span >
<select id="JSheng" onchange="JGetShi();" runat="server" style="width: 225px;"></select> <select class="required" id="JSheng" name="province" onchange="JGetShi();" style="width: 225px;"></select>
</span><br/> </span><br/>
<span class="ress"> <span >
<select id="JShi" onchange="JGetQu();" runat="server" style="width: 225px;"></select> <select class="required" id="JShi" name="chengshi" onchange="JGetQu();" style="width: 225px;"></select>
</span><br/> </span><br/>
<span class="ress"> <span >
<select id="JQu" runat="server" style="width: 225px;"></select> <select class="required" id="JQu" name="district" style="width: 225px;"></select>
</span> </span>
<textarea class="required" name="address" style="width:223px;height:45px;resize: none;" <textarea class="required" name="address" style="width:223px;height:45px;resize: none;"
type="text"></textarea></td> type="text"></textarea></td>
......
src/main/webapp/resource/business/registration.js
...@@ -376,6 +376,9 @@ function initInputWidth(){ ...@@ -376,6 +376,9 @@ function initInputWidth(){
$("#bankAccount_Id").attr("style", "width:" + fixShortWidth() + "px"); $("#bankAccount_Id").attr("style", "width:" + fixShortWidth() + "px");
$("#dcNumber_Id").attr("style", "width:" + fixShortWidth() + "px"); $("#dcNumber_Id").attr("style", "width:" + fixShortWidth() + "px");
$("#remarkId").attr("style", "width:" + fixShortWidth() + "px"); $("#remarkId").attr("style", "width:" + fixShortWidth() + "px");
$("#provinceId").attr("style", "width:" + fixShortWidth() + "px");
$("#chengshiId").attr("style", "width:" + fixShortWidth() + "px");
$("#districtId").attr("style", "width:" + fixShortWidth() + "px");
$("#appreciationTaxType_Id").combobox({ $("#appreciationTaxType_Id").combobox({
width : fixShortWidth()+4, width : fixShortWidth()+4,
...@@ -518,7 +521,7 @@ function initInputWidth(){ ...@@ -518,7 +521,7 @@ function initInputWidth(){
panelHeight:'auto', panelHeight:'auto',
width : (fixShortWidth()+4) width : (fixShortWidth()+4)
}) })
$("#emailSenderId").combobox({ $("#emailSenderId").combobox({
width : fixLongWidth()+4, width : fixLongWidth()+4,
panelHeight:'auto', panelHeight:'auto',
......
src/main/webapp/resource/front/js/reg.js
...@@ -28,7 +28,7 @@ var REG = function () { ...@@ -28,7 +28,7 @@ var REG = function () {
var sn = $("input[name='subject']:checked")[0].nextSibling.nodeValue; var sn = $("input[name='subject']:checked")[0].nextSibling.nodeValue;
if (confirm("您报名的科目是“" + sn + "”，请牢记您的用户名和密码，报名成功后可凭此登陆查看缴费等状态，信息提交之后不可再更改，确认要提交吗？")) { if (confirm("您报名的科目是“" + sn + "”，请牢记您的用户名和密码，报名成功后可凭此登陆查看缴费等状态，信息提交之后不可再更改，确认要提交吗？")) {
$("#form").ajaxSubmit({ $("#form").ajaxSubmit({
url: "/training/reg?pre_address=" + (province + city + district).replace('市辖区','').replace('县',''), url: "/training/reg?province=" + province + "&chengshi=" + city.replace('市辖区', '').replace('县', '').replace('请选择', '') + "&district=" + district.replace('请选择', ''),
type: "post", type: "post",
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
......
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