diff --git a/src/main/java/org/ccpit/business/registerManage/RegisterService.java b/src/main/java/org/ccpit/business/registerManage/RegisterService.java
index 967bbc4..a0f7090 100644
--- a/src/main/java/org/ccpit/business/registerManage/RegisterService.java
+++ b/src/main/java/org/ccpit/business/registerManage/RegisterService.java
@@ -328,11 +328,11 @@ public class RegisterService {
public Map<String, String> initProsHeader() {
Map<String, String> mapProsHeader = new HashMap<String, String>();
- String[] enPros = {"id", "submitTime", "name", "password", "gender", "birthday", "telphone", "mobileTel", "email", "company", "province","chengshi","district","address"
+ String[] enPros = {"id", "submitTime", "name", "password", "gender", "birthday", "telphone", "mobileTel", "email", "company", "province","chengshi","district","address","ifBuyFee"
, "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"
, "creator", "createTime", "modifyBy", "modifyTime"};
- String[] cnPros = {"序号", "提交时间", "姓名", "密码", "性别", "出生日期", "电话", "手机", "EMAIL", "工作单位", "省/直辖市","市","区/县","详细地址","发票开具时间","增值税发票类型", "发票抬头", "发票内容", "纳税人识别号", "公司地址", "公司电话", "开户行", "银行账号"
+ String[] cnPros = {"序号", "提交时间", "姓名", "密码", "性别", "出生日期", "电话", "手机", "EMAIL", "工作单位", "省/直辖市","市","区/县","详细地址","是否购买CDCS/CSDG考前培训","发票开具时间","增值税发票类型", "发票抬头", "发票内容", "纳税人识别号", "公司地址", "公司电话", "开户行", "银行账号"
, "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++) {
@@ -428,7 +428,15 @@ public class RegisterService {
} else if (value instanceof Integer) {
// Integer类型的数值会代表不同的内容，所以通过数据库initMetadata()初始化Metadata的数据查出的
// List集合来分别代表不同的内容。
- textValue = DataIdToDataName(listMapPros, value, propertyName);
+ if("ifBuyFee".equals(propertyName)){
+ if(1 == (Integer) value){
+ textValue = "是";
+ }else {
+ textValue = "否";
+ }
+ }else {
+ textValue = DataIdToDataName(listMapPros, value, propertyName);
+ }
} else {
if (value != null)
textValue = value.toString();
diff --git a/src/main/resources/framework.properties b/src/main/resources/framework.properties
index ca3bb35..6dd9d9a 100644
--- a/src/main/resources/framework.properties
+++ b/src/main/resources/framework.properties
@@ -1,13 +1,13 @@
# jdbc.X
jdbc.driverClassName=com.mysql.jdbc.Driver
# 生产环境 docker 环境下一定要注意 将localhost 换成mysql
-#jdbc.url=jdbc:mysql://mysql:3306/registration?createDatabaseIfNotExist=true&characterEncoding=utf-8
-#jdbc.user=root
-#jdbc.pass=root
+jdbc.url=jdbc:mysql://mysql:3306/registration?createDatabaseIfNotExist=true&characterEncoding=utf-8
+jdbc.user=root
+jdbc.pass=root
# 开发环境
-jdbc.url=jdbc:mysql://localhost:3306/registration_0611?createDatabaseIfNotExist=true&characterEncoding=utf-8
-jdbc.user=ccpit
-jdbc.pass=ccpit1516
+#jdbc.url=jdbc:mysql://localhost:3306/registration_0611?createDatabaseIfNotExist=true&characterEncoding=utf-8
+#jdbc.user=ccpit
+#jdbc.pass=ccpit1516
# hibernate.X
hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
diff --git a/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp b/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp
index 548d895..ef35caf 100644
--- a/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp
@@ -258,6 +258,15 @@
<div class="ele-select">
<input type="checkbox" checked="checked">
</div>
+ <div class="ele-name" val="ifBuyFee">是否购买CDCS/CSDG</br>考前培训</div>
+ <div class="ele">
+ <a class="up">↑</a><a class="down">↓</a>
+ </div>
+ </div>
+ <div class="block">
+ <div class="ele-select">
+ <input type="checkbox" checked="checked">
+ </div>
<div class="ele-name" val="appreciationTaxType">增值税发票类型</div>
<div class="ele">
<a class="up">↑</a><a class="down">↓</a>
@@ -576,7 +585,17 @@
<td align="left">
<input id="email_enId" name='email_en' class="easyui-textbox" />
</td>
- </tr>
+ </tr>
+ <tr>
+ <td align="right"><span>是否购买CDCS/CSDG</br>考前培训:</span></td>
+ <td align="left">
+ <select id="ifBuyFeeId" name="ifBuyFee" class="easyui-combobox" >
+ <option value="">请选择</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </select>
+ </td>
+ </tr>
<tr>
<td align="right"><span>增值税发票:</span></td>
<td align="left">
diff --git a/src/main/webapp/resource/business/registration.js b/src/main/webapp/resource/business/registration.js
index 51a0ff4..5f2458f 100644
--- a/src/main/webapp/resource/business/registration.js
+++ b/src/main/webapp/resource/business/registration.js
@@ -475,6 +475,10 @@ function initInputWidth(){
valueField : 'id',
textField : 'text'
});
+ $("#ifBuyFeeId").combobox({
+ width : fixShortWidth()+4,
+ panelHeight:'auto'
+ });
$("#appreciationTaxTypeId").combobox({
width : fixShortWidth()+4,
panelHeight:'auto'