1、解决部分bug

src/main/java/org/ccpit/base/metadataManage/MetadataService.java

@@ -182,7 +182,6 @@ public class MetadataService {
         map.put("dataName",metadata.getDataName());
         map.put("dataType",metadata.getDataType());
         map.put("description",metadata.getDescription());
-        map.put("description",metadata.getDescription());
         map.put("languageType", "english".equals(metadata.getLanguageType())?"英文":"中文");
         return map;
     }

src/main/java/org/ccpit/business/registerManage/RegisterController.java

@@ -11,10 +11,7 @@ package org.ccpit.business.registerManage;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

src/main/java/org/ccpit/business/registerManage/RegisterInfo.java

@@ -260,7 +260,7 @@ public class RegisterInfo implements Serializable {
     /**
      * 发票开具时间
      */
-    private String taxIssue;
+    private Integer taxIssue;
     /**
      * 发票内容
      */
@@ -662,11 +662,11 @@ public class RegisterInfo implements Serializable {
 		this.img3 = img3;
 	}
 
-      public String getTaxIssue() {
+    public Integer getTaxIssue() {
         return taxIssue;
     }
 
-    public void setTaxIssue(String taxIssue) {
+    public void setTaxIssue(Integer taxIssue) {
         this.taxIssue = taxIssue;
     }
 

src/main/java/org/ccpit/business/registerManage/RegisterService.java

@@ -13,11 +13,7 @@ import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.annotation.Resource;
 import javax.transaction.Transactional;
@@ -62,6 +58,7 @@ public class RegisterService {
     List<Metadata> invoiceTypeM = null;
     List<Metadata> subjectM = null;
     List<Metadata> appreciationTaxType = null;
+    List<Metadata> taxIssue = null;
 
     public void initMetadata() {
         registerStatusM = metadataService.getMetadatasByType2("status");// 报名状态
@@ -69,6 +66,7 @@ public class RegisterService {
         invoiceTypeM = metadataService.getMetadatasByType2("invoiceType");// 发票类型
         subjectM = metadataService.getMetadatasByType2("subject");// 考试科目
         appreciationTaxType = metadataService.getMetadatasByType2("appreciationTaxType");// 增值税发票
+        taxIssue = metadataService.getMetadatasByType2("taxIssue");// 发票开具时间
     }
 
     @Resource
@@ -150,7 +148,7 @@ public class RegisterService {
             sb.append(" and registerStatus='"+status+"'");
         }
         List<SubjectInfo> subjectInfos = subjectInfoDao.query(sb.toString());
-        List<RegisterInfo> registerInfos = new ArrayList<RegisterInfo>();
+        List<RegisterInfo> registerInfos = new ArrayList<>();
         String hql = "";
         if(phase != null && phase != 0){
             hql = "from RegisterInfo where phase.id = '" + phase + "'";
@@ -162,20 +160,42 @@ public class RegisterService {
             long registerInfo_id = s_info.getRegisterInfo_id();
             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);
+                    RegisterInfo n_info = new RegisterInfo();
+                    n_info.setId(s_info.getId());
+                    n_info.setSubject(s_info.getSubject());
+                    n_info.setRegisterStatus(s_info.getRegisterStatus());
+                    n_info.setAppreciationTaxType(s_info.getAppreciationTaxType());
+                    n_info.setInvoiceType(s_info.getInvoiceType());
+                    n_info.setInvoiceTitle(s_info.getInvoiceTitle());
+                    n_info.setTaxpayerNum(s_info.getTaxpayerNum());
+                    n_info.setAddressName(s_info.getAddressName());
+                    n_info.setTelephone(s_info.getTelephone());
+                    n_info.setBankAddress(s_info.getBankAddress());
+                    n_info.setBankAccount(s_info.getBankAccount());
+//                    n_info.setImg1(s_info.getImg1());
+                    n_info.setTaxIssue(s_info.getTaxIssue());
+                    n_info.setPayTime(s_info.getPayTime());
+                    n_info.setName(r_info.getName());
+                    n_info.setGender(r_info.getGender());
+                    n_info.setBirthday(r_info.getBirthday());
+                    n_info.setTelphone(r_info.getTelphone());
+                    n_info.setMobileTel(r_info.getMobileTel());
+                    n_info.setEmail(r_info.getEmail());
+                    n_info.setCompany(r_info.getCompany());
+                    n_info.setCompany_en(r_info.getCompany_en());
+                    n_info.setAddress(r_info.getAddress());
+                    n_info.setTitle(r_info.getTitle());
+                    n_info.setEmail_en(r_info.getEmail_en());
+                    n_info.setDateOfBirth(r_info.getDateOfBirth());
+                    n_info.setGender_en(r_info.getGender_en());
+                    n_info.setName_en(r_info.getName_en());
+                    n_info.setName_en_last(r_info.getName_en_last());
+                    n_info.setAddress_en(r_info.getAddress_en());
+                    n_info.setCountry(r_info.getCountry());
+                    n_info.setDcNumber(r_info.getDcNumber());
+                    n_info.setPhone(r_info.getPhone());
+                    n_info.setSubmitTime(s_info.getSubmitTime());
+                    registerInfos.add(n_info);
                 }
             }
         }
@@ -214,8 +234,8 @@ public class RegisterService {
         map.put("email", RegisterInfo.getEmail());
         map.put("company", RegisterInfo.getCompany());
         map.put("invoiceInfo", RegisterInfo.getInvoiceInfo());
-        map.put("invoiceType",
-                TypeUtils.translateData("invoiceType", RegisterInfo.getInvoiceType()));
+//        map.put("invoiceType",
+//                TypeUtils.translateData("invoiceType", RegisterInfo.getInvoiceType()));
         map.put("subject", TypeUtils.translateData("subject", RegisterInfo.getSubject()));
         map.put("registerStatus",
                 TypeUtils.translateData("registerStatus",
@@ -305,10 +325,10 @@ 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","taxIssue","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"
                 , "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"
                 , "考试科目", "考试科目", "报名状态", "排序号", "是否删除", "创建人", "创建时间", "修改人", "修改时间"};
         for (int i = 0; i < enPros.length; i++) {

src/main/java/org/ccpit/business/registerManage/SubjectInfo.java

@@ -85,7 +85,7 @@ public class SubjectInfo implements Serializable {
     /**
      * 发票开具时间
      */
-    private String taxIssue;
+    private Integer taxIssue;
     /**
      * 备注
      */
@@ -224,11 +224,11 @@ public class SubjectInfo implements Serializable {
         this.img3 = img3;
     }
 
-    public String getTaxIssue() {
+    public Integer getTaxIssue() {
         return taxIssue;
     }
 
-    public void setTaxIssue(String taxIssue) {
+    public void setTaxIssue(Integer taxIssue) {
         this.taxIssue = taxIssue;
     }
 

src/main/sql/update.sql

-/* create by dingwei 20210617  start */
-set character set utf8;
-update reg_subjectinfo set registerName = '邓默' where registerInfo_id = 12983;
-update reg_subjectinfo set registerName = '丁伟' where registerInfo_id = 12979;
-update reg_subjectinfo set registerName = '丁伟' where registerInfo_id = 12979;
-/* create by dingwei 20210617  end */
+/* 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/sql/update_20210702.sql

+/* create by dingwei 20210617  start */
+set character set utf8;
+update reg_subjectinfo set registerName = '邓默' where registerInfo_id = 12983;
+update reg_subjectinfo set registerName = '丁伟' where registerInfo_id = 12979;
+update reg_subjectinfo set registerName = '丁伟' where registerInfo_id = 12979;
+/* create by dingwei 20210617  end */
+

src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp

@@ -248,6 +248,15 @@
                 <div class="ele-select">
                     <input type="checkbox" checked="checked">
                 </div>
+                <div class="ele-name" val="taxIssue">发票开具时间</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="invoiceTitle">发票抬头</div>
                 <div class="ele">
                     <a class="up">&uarr;</a><a class="down">&darr;</a>

src/main/webapp/resource/admin/metadataManage/dataType.json

@@ -31,4 +31,7 @@
 },{
     "id":"engender",
     "text":"性别（英）"
+},{
+    "id":"taxIssue",
+    "text":"发票开出时间"
 }]
\ No newline at end of file

src/main/webapp/resource/business/registration.js

@@ -344,6 +344,7 @@ function initInputWidth(){
 	$("#standby1Id").attr("style", "width:" + fixShortWidth() + "px"); 
 
 	$("#nameId").attr("style", "width:" + fixShortWidth() + "px");
+	$("#invoiceInfo_Id").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");
@@ -365,6 +366,7 @@ function initInputWidth(){
 	$("#bankAccountId").attr("style", "width:" + fixShortWidth() + "px");
 	$("#dcNumberId").attr("style", "width:" + fixShortWidth() + "px");
 	$("#countryId").attr("style", "width:" + fixShortWidth() + "px");
+	$("#invoiceInfoId").attr("style", "width:" + fixShortWidth() + "px");
 
 	$("#invoiceTitle_Id").attr("style", "width:" + fixShortWidth() + "px");
 	$("#addressName_Id").attr("style", "width:" + fixShortWidth() + "px");