1、报名系统2.0版本修改

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

@@ -373,6 +373,7 @@ public class IndexController extends BaseController {
         subjectInfo.setRegisterStatus(0);
         subjectInfo.setPhaseId(phase.getId());
         subjectInfo.setPhaseName(phase.getName());
+        subjectInfo.setInvoiceInfo("发票内容为相应考试的考试费");
         RegisterInfo registerInfo = registerService.queryRegisterById(registerInfo_id);
         boolean success = subjectInfoService.addSubjectInfo(subjectInfo);
         if (success){

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

@@ -89,6 +89,7 @@ public class RegisterController extends BaseController {
                 registerInfo.setRegType(false);//如果是延考则在新增数据时把regType设为false表示延考或恢复
             }
             registerInfo.setPhase(phaseService.getActivePhase());
+            registerInfo.setInvoiceInfo("发票内容为相应考试的考试费");
             success = registerService.addRegisterInfo(registerInfo);
         }else if (StringUtils.isNotEmpty(operate)&&operate.equals("edit")){
             RegisterInfo reg = registerService.queryRegisterById(registerInfo.getId());
@@ -188,6 +189,9 @@ public class RegisterController extends BaseController {
         pageRequest.setOrderBy("submitTime desc ");
         StringBuffer hql = new StringBuffer(sb.toString());
         Page<RegisterInfo> infoPage = registerService.queryRegisterInfos(pageRequest, hql.toString());
+        List<RegisterInfo> reg_infos = registerService.query(subject,phase,name,status);
+//        infoPage.getRows().addAll(reg_infos);
+        infoPage.setTotal(infoPage.getTotal()+reg_infos.size());
         return infoPage;
     }
 
@@ -314,7 +318,7 @@ 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);
+        List<RegisterInfo> reg_infos = registerService.query(subject,phase,name,status);
         results.addAll(reg_infos);
         String[] props = StringUtils.split(fields, ",");
 

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

@@ -261,8 +261,10 @@ public class RegisterInfo implements Serializable {
      * 发票开具时间
      */
     private String taxIssue;
-
-
+    /**
+     * 发票内容
+     */
+    private String invoiceInfo;
     
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -675,5 +677,13 @@ public class RegisterInfo implements Serializable {
     public void setName_en_last(String name_en_last) {
         this.name_en_last = name_en_last;
     }
+
+    public String getInvoiceInfo() {
+        return invoiceInfo;
+    }
+
+    public void setInvoiceInfo(String invoiceInfo) {
+        this.invoiceInfo = invoiceInfo;
+    }
 }
 

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

@@ -30,6 +30,7 @@ import jxl.write.WritableFont;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 
+import org.apache.commons.lang.StringUtils;
 import org.ccpit.base.controller.Convert;
 import org.ccpit.base.controller.Page;
 import org.ccpit.base.controller.PageBo;
@@ -134,15 +135,27 @@ public class RegisterService {
         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());
+    public List<RegisterInfo> query(String subject, Long phase, String name, String status) {
+        StringBuilder sb = new StringBuilder("from SubjectInfo where 1=1 ");
+        if (StringUtils.isNotBlank(subject)) {
+            sb.append(" and subject = " + subject);
+        }
+        if (phase != null && phase != 0) {
+            sb.append(" and phaseId = '" + phase + "'");
+        }
+        if (StringUtils.isNotBlank(name)){
+            sb.append(" and name like '%"+name+"%'");
+        }
+        if (StringUtils.isNotBlank(status)){
+            sb.append(" and registerStatus='"+status+"'");
+        }
+        List<SubjectInfo> subjectInfos = subjectInfoDao.query(sb.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()){
+            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());
@@ -160,7 +173,7 @@ public class RegisterService {
                 }
             }
         }
-        return  registerInfos;
+        return registerInfos;
     }
 
     public Page<RegisterInfo> queryMemberBaseInfos(PageRequest pageRequest) {
@@ -194,6 +207,7 @@ public class RegisterService {
         map.put("mobileTel", RegisterInfo.getMobileTel());
         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("subject", TypeUtils.translateData("subject", RegisterInfo.getSubject()));
@@ -285,11 +299,11 @@ 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","name_en_last", "company_en", "address_en"
+                , "appreciationTaxType","taxIssue","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", "工作单位", "联系地址", "增值税发票类型", "发票抬头", "发票类型", "纳税人识别号", "公司地址", "公司电话", "开户行", "银行账号"
-                , "TITLE", "DATE OF BIRTH", "GENDER", "Family NAME","Given NAME", "COMPANY NAME", "ADDRESS", "COUNTRY", "DC/IFS NUMBER", "缴费时间", "PHONE", "CITY SELECT"
+        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]);

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

@@ -109,6 +109,10 @@ public class SubjectInfo implements Serializable {
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date modifyTime;
+    /**
+     * 发票内容
+     */
+    private String invoiceInfo;
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -289,5 +293,11 @@ public class SubjectInfo implements Serializable {
         this.invoiceTitle = invoiceTitle;
     }
 
+    public String getInvoiceInfo() {
+        return invoiceInfo;
+    }
 
+    public void setInvoiceInfo(String invoiceInfo) {
+        this.invoiceInfo = invoiceInfo;
+    }
 }

src/main/resources/log4j.properties

@@ -9,7 +9,7 @@ log4j.appender.A1.layout.ConversionPattern=%4p [%t] (%F:%L) - %m%n
 
 log4j.appender.A2=org.apache.log4j.RollingFileAppender
 
-log4j.appender.A2.File=c://logs/registration/project.log
+log4j.appender.A2.File=d://logs/registration/project.log
 
 log4j.appender.A2.MaxFileSize = 10MB
 

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

@@ -111,10 +111,10 @@
 				</td>
 			</tr>
     	</table>
-        <div class="quick-export">
-            <div class="lb">快速导出已缴费名单</div>
-            <%--快捷导出按钮组--%>
-        </div>
+<%--        <div class="quick-export">--%>
+<%--            <div class="lb">快速导出已缴费名单</div>--%>
+<%--            &lt;%&ndash;快捷导出按钮组&ndash;%&gt;--%>
+<%--        </div>--%>
 
     </form>
 </div>
@@ -259,7 +259,7 @@
                 <div class="ele-select">
                     <input type="checkbox" checked="checked">
                 </div>
-                <div class="ele-name" val="invoiceType">发票类型</div>
+                <div class="ele-name" val="invoiceInfo">发票内容</div>
                 <div class="ele">
                     <a class="up">&uarr;</a><a class="down">&darr;</a>
                 </div>
@@ -535,9 +535,9 @@
                             <option value="2">增值税专用发票</option>
 						</select>  
 					</td>
-					<td  align="right"><span>发票类型:</span></td>
+					<td  align="right"><span>发票内容:</span></td>
 					<td  align="left">
-						<input id="invoiceTypeId" name='invoiceType' class="easyui-combobox" />
+						<input id="invoiceInfoId" name='invoiceInfo' class="easyui-textbox" />
 					</td>
 				</tr> 
 				<tr>
@@ -601,11 +601,9 @@
 					<td align="left" >
 						<textarea id="standby1Id" name="standby1" rows="7"></textarea>
 					</td>
-				    <td align="right"><span>证书照:</span></td>
+				    <td align="right"><span>考生名片:</span></td>
 					<td align="left" >
 						<img id="img1" class="certificatePhoto" style="width:130px;height:100px">
-						<img id="img2" class="certificatePhoto" style="width:130px;height:100px">
-						<img id="img3" class="certificatePhoto" style="width:130px;height:100px">
 					</td>
 				</tr>
 				<tr>
@@ -707,18 +705,9 @@
                                 <option value="2">增值税专用发票</option>
                             </select>
                         </td>
-                        <td  align="right" width="15%"><span>发票类型:</span></td>
+                        <td  align="right" width="15%"><span>发票内容:</span></td>
                         <td  align="left" width="35%">
-                            <select id="invoiceType_Id" name="invoiceType" class="easyui-combobox" >
-                                <option value="0">CDCS考试费</option>
-                                <option value="1">培训费</option>
-                                <option value="2">培训服务费</option>
-                                <option value="3">CSDG考试费</option>
-                                <option value="4">CITF考试费</option>
-                                <option value="5">CertPAY考试费</option>
-                                <option value="6">CTFC考试费</option>
-                                <option value="7">CSCF考试费</option>
-                            </select>
+                            <input id="invoiceInfo_Id" name="invoiceInfo" class="easyui-textbox" />
                         </td>
                     </tr>
                     <tr>

src/main/webapp/WEB-INF/jsp/front/info.jsp

@@ -55,23 +55,26 @@
                             <tr>
                                 <td class="name">1.</td>
                                 <td colspan="3">
-                                    <p>考生如需修改以下注册信息，请联系负责老师:
-                                    </p>
-                                    <p>CDCS、CITF、CSDG、CertPAY--邓默 &ensp; cdcschina@ccpit.org;&ensp;
-                                        citfchina@ccpit.org;&ensp;csdgchina@ccpit.org;&ensp;certpaychina@ccpit.org</p>
-                                    <p>CTFC、CSCF--隋梦箐 &ensp;ctfcchina@ccpit.org;&ensp;cscfchina@ccpit.org</p>
+                                    <p>本页信息考生无法修改，如需修改考生信息，请根据科目将修改内容发送至以下邮箱：</p>
+                                    <p>CDCS&ensp;请发送至&ensp;cdcschina@ccpit.org;&emsp;
+                                        CITF&ensp;请发送至&ensp;citfchina@ccpit.org;</p>
+                                    <p>CSDG&ensp;请发送至&ensp;csdgchina@ccpit.org;&emsp;
+                                        CertPAY&ensp;请发送至&ensp;certpaychina@ccpit.org;</p>
+                                    <p>CTFC&ensp;请发送至&ensp;ctfcchina@ccpit.org;&emsp;
+                                        CSCF&ensp;请发送至&ensp;cscfchina@ccpit.org;</p>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="name">2.</td>
                                 <td colspan="3">
-                                    <p>本系统仅用于考试报名信息的采集工作，并于每年12月31日自动重置，次年1月1日后登录本系统需重新注册</p>
+                                    <p>本系统仅用于考试报名信息的采集工作，并于每年12月31日自动重置，次年1月1日后登录本系统需重新注册。</p>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="name">3.</td>
                                 <td colspan="3">
-                                    <p>考生可同时报名多项考试，请自行把握复习时间，缴费成功后，可登陆My LIBF系统查看报名情况并进行学习</p>
+                                    <p>考生可同时报名多项考试，请自行把握复习时间，缴费成功后，可登陆<a href="https://my.libf.ac.uk/Account/login.aspx?site=myifslearning&ReturnUrl=%2f"
+                                                                         target="_blank">My LIBF</a>系统查看报名情况并进行学习。</p>
                                 </td>
                             </tr>
                             <tr>
@@ -84,12 +87,15 @@
                             <c:if test="${registerInfo.regType}">
                                 <tr name="trEmial">
                                     <td class="name" width="25%" style="font-weight: bold;font-size: 15px">已报名科目:</td>
-                                    <td>
-                                        <c:forEach items="${subjectInfos}" var="subj">
-                                            <c:forEach items="${subject}" var="s">
-                                                <font style="font-size: 17px;font-weight: bold"><c:if
-                                                        test="${subj.subject == s.dataNameId}">${s.dataName} <br></c:if></font>
+                                    <td colspan="2">
+                                        <c:forEach items="${subjectInfos}" var="sub_info">
+                                            <c:forEach items="${subject}" var="sub">
+                                                <font style="font-size: 17px;font-weight: bold">
+                                                    <c:if test="${sub_info.subject == sub.dataNameId}">${sub.dataName} &emsp;</c:if></font>
                                             </c:forEach>
+                                            (<c:forEach items="${status}" var="s">
+                                                <c:if test="${sub_info.registerStatus == s.dataNameId}">${s.dataName} </c:if>
+                                            </c:forEach>)<br>
                                         </c:forEach>
                                     </td>
 
@@ -124,7 +130,7 @@
                                 </tr>
                                 <c:if test="${not empty registerInfo.dcNumber}">
                                     <tr id="" name="trEmial">
-                                        <td class="name" width="25%">DC号:</td>
+                                        <td class="name" width="25%">LIBF NUMBER:</td>
                                         <td>${registerInfo.dcNumber}</td>
                                     </tr>
                                 </c:if>
@@ -200,12 +206,8 @@
                                     <td id="invoiceTitle_id">${registerInfo.invoiceTitle}</td>
                                 </tr>
                                 <tr>
-                                    <td class="name">发票类型:</td>
-                                    <td>
-                                        <c:forEach items="${invoiceType}" var="s">
-                                            <c:if test="${registerInfo.invoiceType == s.dataNameId}">${s.dataName} </c:if>
-                                        </c:forEach>
-                                    </td>
+                                    <td class="name">发票内容:</td>
+                                    <td id="invoiceInfo_id">${registerInfo.invoiceInfo}</td>
                                 </tr>
                                 <tr>
                                     <td class="name">纳税人识别号:</td>
@@ -343,11 +345,11 @@
                                     <button>My LIBF 快捷登录</button>
                                 </a></td>
                                 <td>
-                                    <p style="color: #000000">考生缴费成功后3到5个工作日，会收到LIBF的确认邮件，请考生登录My LIBF系统，激活账号用于学习</p>
+                                    <p style="color: #000000">考生缴费成功后3到5个工作日，会收到LIBF的确认邮件，</br>请考生登录My LIBF系统，激活账号用于学习</p>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="name"><font style="font-size: 14px;color: red">您是否要报考其他国际贸易金融6C专家考试？</font></td>
+                                <td class="name"><font style="font-size: 14px;color: red">您是否要报考其他国际贸易</br>金融6C专家考试？</font></td>
                                 <td width="30%">
                                     <select id="other_subject_id" style="width: 220px">
                                         <option value="">请选择</option>
@@ -419,18 +421,12 @@
                                             <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 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">
-                                                    <option value="">请选择</option>
-                                                    <c:forEach items="${invoiceType}" var="g">
-                                                        <option value="${g.dataNameId}">${g.dataName}</option>
-                                                    </c:forEach>
-                                                </select>
+                                                <p>发票内容为相应考试的考试费，如CDCS考试费。</p>
                                             </td>
-                                            <td><span class="reg_body">请选择您的发票类型</span></td>
+                                            <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>

src/main/webapp/WEB-INF/jsp/front/reg.jsp

@@ -127,17 +127,12 @@
                                             <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 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">
-	                                                <option value="">请选择</option>
-	                                                <c:forEach items="${invoiceType}" var="g">
-	                                                    <option value="${g.dataNameId}">${g.dataName}</option>
-	                                                </c:forEach>
-                                            	</select>
+                                                <p>发票内容为相应考试的考试费，如CDCS考试费。</p>
                                             </td>
-                                            <td><span class="reg_body">请选择您的发票类型</span></td></div>
+                                            <td><span class="reg_body">考试只能开具与之相对应的考试费发票</span></td></div>
                                         </tr>
                                         <tr id="taxpayerNumId" name="trTaxpayerNum" style="display :none">
                                            	<td class="name"><span style="color: red;">*</span>纳税人识别号:</td>

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

@@ -87,12 +87,12 @@ $(function() {
     initShowPhoto();
     $("#showPhotoWinId").window('close');
     
-    $.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,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);
-    })
+    // $.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,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);
+    // })
     
 });
 /*
@@ -139,7 +139,7 @@ function initExportWindow(){
 function initDataTable(){
 	var h = document.documentElement.clientHeight;
 	$("#registersTable").datagrid({
-		height : (h - dataGridHeight)/3*2,
+		height : h/4,
 		nowrap : true,
 		striped : true,
 		pagination : true,
@@ -171,7 +171,7 @@ function initDataTable(){
             formatter:function(val,row){
                 return subjectArray[val];
             },
-			width : 30
+			width : 40
 		}, {
 			field : 'registerStatus',
 			title : '报名状态',
@@ -179,7 +179,7 @@ function initDataTable(){
             formatter:function(val,row){
                 return statusArray[val];
             },
-			width : 30
+			width : 20
 		},{
             field : 'phase',
             title : '报名期数',
@@ -187,7 +187,7 @@ function initDataTable(){
             formatter:function(val,row){
                 return row.phase.name;
             },
-            width : 30
+            width : 20
         }, {
             field : 'email',
             title : '邮箱',
@@ -916,4 +916,3 @@ function closeWindow2(){
 //关闭窗口
 function closeWindow3(){
 	$("#subjectWinId").window('close');
-}