1、增加多次报名科目功能

src/main/java/org/ccpit/base/utils/TypeUtils.java

+package org.ccpit.base.utils;
+
+public class TypeUtils {
+
+    public static String translateData(String dataType, Integer num) {
+        String dataName = "";
+        if ("invoiceType".equals(dataType)) {
+            switch (num) {
+                case 1:
+                    dataName = "CDCS考试费";
+                    break;
+                case 2:
+                    dataName = "培训费";
+                    break;
+                case 3:
+                    dataName = "培训服务费";
+                    break;
+            }
+        }
+        if ("subject".equals(dataType)) {
+            switch (num) {
+                case 1:
+                    dataName = "单证信用专家(CDCS)";
+                    break;
+                case 2:
+                    dataName = "保函与备用证专家(CSDG)";
+                    break;
+                case 3:
+                    dataName = "国际贸易金融专家(CITF)";
+                    break;
+            }
+        }
+        if ("registerType".equals(dataType)) {
+            switch (num) {
+                case 1:
+                    dataName = "首次报名 ";
+                    break;
+                case 2:
+                    dataName = "补考报名";
+                    break;
+                case 3:
+                    dataName = "延考及恢复";
+                    break;
+            }
+        }
+        if ("registerStatus".equals(dataType)) {
+            switch (num) {
+                case 1:
+                    dataName = "报名成功";
+                    break;
+                case 2:
+                    dataName = "缴费成功";
+                    break;
+                case 3:
+                    dataName = "书籍发放";
+                    break;
+                case 4:
+                    dataName = "DC号";
+                    break;
+                case 5:
+                    dataName = "准考证打印";
+                    break;
+                case 6:
+                    dataName = "发票寄送";
+                    break;
+                case 7:
+                    dataName = "证书寄送";
+                    break;
+            }
+        }
+        return dataName;
+    }
+}

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

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -31,7 +32,7 @@ import java.util.Random;
  * @author 孙其鹏
  * @version 1.0
  */
-@Controller
+@RestController
 @RequestMapping("/training")
 public class IndexController extends BaseController {
     @Autowired
@@ -40,6 +41,8 @@ public class IndexController extends BaseController {
     private MetadataService metadataService;
     @Autowired
     private PhaseService phaseService;
+    @Autowired
+    private SubjectInfoService subjectInfoService;
 
     private Map<String,Object> check(){
         if (getActivePhase()==null){
@@ -165,7 +168,6 @@ public class IndexController extends BaseController {
      * @return
      */
     @RequestMapping("/saveCertificateId")
-    @ResponseBody
     public Object saveCertificateId(HttpServletRequest request){
     	RegisterInfo registerInfo = (RegisterInfo) request.getSession().getAttribute("registerInfo");
     	String img1 = request.getParameter("img1");
@@ -181,7 +183,6 @@ public class IndexController extends BaseController {
     }
 
     @RequestMapping("/checkEmail")
-    @ResponseBody
     public Object checkEmail(String email,Boolean regType){
         Map<String,Object> map =new HashMap<String,Object>();
         Phase phase = getActivePhase();
@@ -195,7 +196,6 @@ public class IndexController extends BaseController {
     }
 
     @RequestMapping("/reg")
-    @ResponseBody
     public Object reg(HttpServletRequest request,RegisterInfo registerInfo,String repassword){
         Phase phase = getActivePhase();
         //检查是否开放注册
@@ -262,7 +262,6 @@ public class IndexController extends BaseController {
     }
 
     @RequestMapping("/reg2")
-    @ResponseBody
     public Object reg2(HttpServletRequest request,RegisterInfo registerInfo,String repassword){
         Phase phase = getActivePhase();
         if (phase==null){
@@ -331,13 +330,37 @@ public class IndexController extends BaseController {
         return map;
     }
 
+    @RequestMapping("/reg3")
+    public Object reg3(HttpServletRequest request,SubjectInfo subjectInfo,long registerInfo_id){
+        Phase phase = getActivePhase();
+        if (phase==null){
+            return null;
+        }
+        Map<String,Object> map =new HashMap<String,Object>();
+
+        if (StringUtils.isEmpty(String.valueOf(subjectInfo.getSubject()))){
+            map.put("success",false);
+            map.put("info","请填写报名科目");
+            return map;
+        }
+        subjectInfo.setRegisterInfo_id(registerInfo_id);
+        subjectInfo.setRegisterStatus(0);
+        RegisterInfo registerInfo = registerService.queryRegisterById(registerInfo_id);
+        boolean success = subjectInfoService.addSubjectInfo(subjectInfo);
+        if (success){
+            request.getSession().setAttribute("registerInfo",registerInfo);
+            request.getSession().setAttribute("subjectInfo",subjectInfo);
+        }
+        map.put("success",success);
+        return map;
+    }
+
     private void sendEmail(String email,String name,String subject){
         EmailBody body = new EmailBody();
         MailSender.send(email,"","");
     }
 
     @RequestMapping("/login")
-    @ResponseBody
     public Object login(String name,String password,String code,HttpServletRequest request){
         Phase phase = getActivePhase();
         if (phase == null){
@@ -372,7 +395,6 @@ public class IndexController extends BaseController {
     }
 
     @RequestMapping("/login2")
-    @ResponseBody
     public Object login2(String name,String password,String code,HttpServletRequest request){
         Phase phase = getActivePhase();
         if (phase==null){

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

@@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.alibaba.fastjson.JSON;
@@ -45,7 +46,7 @@ import com.alibaba.fastjson.JSON;
  * @see
  * @since JDK 1.6
  */
-@Controller
+@RestController
 @RequestMapping("/admin/business/registerManage")
 public class RegisterController extends BaseController {
 
@@ -55,9 +56,11 @@ public class RegisterController extends BaseController {
     private MetadataService metadataService;
     @Autowired
     private PhaseService phaseService;
+    @Autowired
+    private SubjectInfoService subjectInfoService;
 
     /*
-     * 进入新闻管理列表界面(中文)
+     *
      */
     @RequestMapping("/goinRegisterInfoListPage")
     public Object goinNewsListPage() {
@@ -76,7 +79,6 @@ public class RegisterController extends BaseController {
         return mv;
     }
     @RequestMapping("/addOrUpdateRegisterInfo")
-    @ResponseBody
     public Object addOrUpdateRegisterInfo(HttpServletRequest request,RegisterInfo registerInfo,String operate,HttpServletResponse response) {
         boolean success = false;
         if (StringUtils.isNotEmpty(operate)&&operate.equals("add")){
@@ -120,7 +122,6 @@ public class RegisterController extends BaseController {
     }
 
     @RequestMapping("/queryAllRegisterInfo")
-    @ResponseBody 
     public Object queryAllRegisterInfo(HttpServletRequest request,String name,String status,String status2,String subject,String subject2,Long phase) {
         PageRequest pageRequest = getPage(request);
         StringBuilder sb = new StringBuilder("from RegisterInfo where 1=1 ");
@@ -155,8 +156,17 @@ public class RegisterController extends BaseController {
         return infoPage;
     }
 
+    @RequestMapping("/queryAllSubject")
+    public Object queryAllSubject(HttpServletRequest request,long id) {
+        PageRequest pageRequest = getPage(request);
+        StringBuilder sb = new StringBuilder("from SubjectInfo where registerInfo_id =" + id);
+        pageRequest.setOrderBy("submitTime desc ");
+        StringBuffer hql = new StringBuffer(sb.toString());
+        Page<SubjectInfo> infoPage = subjectInfoService.querySubjectInfos(pageRequest, hql.toString());
+        return infoPage;
+    }
+
     @RequestMapping("/queryRegisterInfoById")
-    @ResponseBody
     public RegisterInfo queryRegisterInfoById(HttpServletRequest request,HttpServletResponse response) {
         String registerInfoId = request.getParameter("registerInfo");
         response.setHeader("expires","0");
@@ -166,7 +176,6 @@ public class RegisterController extends BaseController {
     }
 
     @RequestMapping("/deleteByIds")
-    @ResponseBody
     public Object deleteRegisters(HttpServletRequest request){
         String ids = request.getParameter("ids");
         List<Long> list = JSON.parseArray(ids, Long.class);
@@ -176,7 +185,6 @@ public class RegisterController extends BaseController {
         return map;
     }
     @RequestMapping("/updateStatus")
-    @ResponseBody
     public Object updateStatus(HttpServletRequest request){
     	Map<String,Object> map = new HashMap<String, Object>();
     	String ids = request.getParameter("ids");
@@ -198,7 +206,6 @@ public class RegisterController extends BaseController {
     }
     
     @RequestMapping("/updateStatus2")
-    @ResponseBody
     public Object updateStatus2(HttpServletRequest request){
     	Map<String,Object> map = new HashMap<String, Object>();
     	String ids = request.getParameter("ids");
@@ -222,7 +229,6 @@ public class RegisterController extends BaseController {
      * 导出excel
      */
     @RequestMapping("/exporgExcel2")
-    @ResponseBody
     public void exporgExcel2(HttpServletResponse response,
                              String name,String status,String status2,String subject,String subject2,Long phase,String fields,String flagExt,Long bigger) {
 

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

@@ -249,6 +249,12 @@ public class RegisterInfo implements Serializable {
      * 证书照3
      */
     private String img3;
+    /**
+     * 发票开具时间
+     */
+    private String taxIssue;
+
+
     
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)

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

@@ -37,6 +37,7 @@ import org.ccpit.base.controller.PageRequest;
 import org.ccpit.base.metadataManage.Metadata;
 import org.ccpit.base.metadataManage.MetadataService;
 import org.ccpit.base.user.User;
+import org.ccpit.base.utils.TypeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -162,10 +163,10 @@ public class RegisterService {
         map.put("email", RegisterInfo.getEmail());
         map.put("company", RegisterInfo.getCompany());
         map.put("invoiceType",
-                translateData("invoiceType", RegisterInfo.getInvoiceType()));
-        map.put("subject", translateData("subject", RegisterInfo.getSubject()));
+                TypeUtils.translateData("invoiceType", RegisterInfo.getInvoiceType()));
+        map.put("subject", TypeUtils.translateData("subject", RegisterInfo.getSubject()));
         map.put("registerStatus",
-                translateData("registerStatus",
+                TypeUtils.translateData("registerStatus",
                         RegisterInfo.getRegisterStatus()));
         map.put("sort", RegisterInfo.getSort());
         return map;
@@ -180,74 +181,7 @@ public class RegisterService {
         });
     }
 
-    private String translateData(String dataType, Integer num) {
-        String dataName = "";
-        if ("invoiceType".equals(dataType)) {
-            switch (num) {
-                case 1:
-                    dataName = "CDCS考试费";
-                    break;
-                case 2:
-                    dataName = "培训费";
-                    break;
-                case 3:
-                    dataName = "培训服务费";
-                    break;
-            }
-        }
-        if ("subject".equals(dataType)) {
-            switch (num) {
-                case 1:
-                    dataName = "单证信用专家(CDCS)";
-                    break;
-                case 2:
-                    dataName = "保函与备用证专家(CSDG)";
-                    break;
-                case 3:
-                    dataName = "国际贸易金融专家(CITF)";
-                    break;
-            }
-        }
-        if ("registerType".equals(dataType)) {
-            switch (num) {
-                case 1:
-                    dataName = "首次报名 ";
-                    break;
-                case 2:
-                    dataName = "补考报名";
-                    break;
-                case 3:
-                    dataName = "延考及恢复";
-                    break;
-            }
-        }
-        if ("registerStatus".equals(dataType)) {
-            switch (num) {
-                case 1:
-                    dataName = "报名成功";
-                    break;
-                case 2:
-                    dataName = "缴费成功";
-                    break;
-                case 3:
-                    dataName = "书籍发放";
-                    break;
-                case 4:
-                    dataName = "DC号";
-                    break;
-                case 5:
-                    dataName = "准考证打印";
-                    break;
-                case 6:
-                    dataName = "发票寄送";
-                    break;
-                case 7:
-                    dataName = "证书寄送";
-                    break;
-            }
-        }
-        return dataName;
-    }
+
 
     /**
      * 根据选择的属性，导出数据到excel <功能详细描述>

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

+package org.ccpit.business.registerManage;
+
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * ClassName:报名科目信息表 <br/>
+ * Date:     2021年04月13日 下午1:33:37 <br/>
+ *
+ * @author dingwei
+ * @see
+ * @since JDK 1.8
+ */
+@Entity
+@Table(name = "reg_subjectInfo")
+public class SubjectInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private long id;
+    /**
+     * 注册用户信息id
+     */
+    private long registerInfo_id;
+    /**
+     * 报名科目
+     */
+    private Integer subject;
+    /**
+     * 报名状态
+     */
+    private Integer registerStatus;
+    /**
+     * 发票  增值税发票类型  1 表示 增值税普通发票 | 2 表示增值税专用发票
+     */
+    private Integer appreciationTaxType;
+    /**
+     * 发票 纳税人识别号
+     */
+    private String taxpayerNum;
+    /**
+     * 发票 公司地址
+     */
+    private String addressName;
+    /**
+     * 发票 公司电话
+     */
+    private String telephone;
+    /**
+     * 发票 开户行
+     */
+    private String bankAddress;
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+    /**
+     * 证书照1
+     */
+    private String img1;
+    /**
+     * 证书照2
+     */
+    private String img2;
+    /**
+     * 证书照3
+     */
+    private String img3;
+    /**
+     * 发票开具时间
+     */
+    private String taxIssue;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 缴费时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date payTime;
+    /**
+     * 提交时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date submitTime;
+    /**
+     * 修改时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date modifyTime;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getRegisterInfo_id() {
+        return registerInfo_id;
+    }
+
+    public void setRegisterInfo_id(long registerInfo_id) {
+        this.registerInfo_id = registerInfo_id;
+    }
+
+    public Integer getSubject() {
+        return subject;
+    }
+
+    public void setSubject(Integer subject) {
+        this.subject = subject;
+    }
+
+    public Integer getRegisterStatus() {
+        return registerStatus;
+    }
+
+    public void setRegisterStatus(Integer registerStatus) {
+        this.registerStatus = registerStatus;
+    }
+
+    public Integer getAppreciationTaxType() {
+        return appreciationTaxType;
+    }
+
+    public void setAppreciationTaxType(Integer appreciationTaxType) {
+        this.appreciationTaxType = appreciationTaxType;
+    }
+
+    public String getTaxpayerNum() {
+        return taxpayerNum;
+    }
+
+    public void setTaxpayerNum(String taxpayerNum) {
+        this.taxpayerNum = taxpayerNum;
+    }
+
+    public String getAddressName() {
+        return addressName;
+    }
+
+    public void setAddressName(String addressName) {
+        this.addressName = addressName;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getBankAddress() {
+        return bankAddress;
+    }
+
+    public void setBankAddress(String bankAddress) {
+        this.bankAddress = bankAddress;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    public String getImg1() {
+        return img1;
+    }
+
+    public void setImg1(String img1) {
+        this.img1 = img1;
+    }
+
+    public String getImg2() {
+        return img2;
+    }
+
+    public void setImg2(String img2) {
+        this.img2 = img2;
+    }
+
+    public String getImg3() {
+        return img3;
+    }
+
+    public void setImg3(String img3) {
+        this.img3 = img3;
+    }
+
+    public String getTaxIssue() {
+        return taxIssue;
+    }
+
+    public void setTaxIssue(String taxIssue) {
+        this.taxIssue = taxIssue;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public Date getSubmitTime() {
+        return submitTime;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+}

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

+package org.ccpit.business.registerManage;
+
+import org.ccpit.base.dao.BaseDao;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class SubjectInfoDao extends BaseDao<SubjectInfo> {
+}

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

+package org.ccpit.business.registerManage;
+
+import org.ccpit.base.controller.Convert;
+import org.ccpit.base.controller.Page;
+import org.ccpit.base.controller.PageBo;
+import org.ccpit.base.controller.PageRequest;
+import org.ccpit.base.metadataManage.MetadataService;
+import org.ccpit.base.utils.TypeUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.transaction.Transactional;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class SubjectInfoService {
+
+    private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd MM:hh:ss");
+    
+    @Resource
+    private SubjectInfoDao subjectInfoDao;
+    @Resource
+    private MetadataService metadataService;
+
+    @Transactional
+    public boolean addSubjectInfo(SubjectInfo subjectInfo) {
+        subjectInfo.setSubmitTime(new Date());
+        return subjectInfoDao.save(subjectInfo);
+    }
+
+    @Transactional
+    public boolean updateSubjectInfo(SubjectInfo subjectInfo) {
+        subjectInfo.setModifyTime(new Date());
+        return subjectInfoDao.update(subjectInfo);
+    }
+
+    @Transactional
+    public boolean deleteSubjectInfos(long id) {
+        return subjectInfoDao.deleteById(id);
+    }
+
+    public SubjectInfo queryRegisterById(long id) {
+        return subjectInfoDao.queryById(id);
+    }
+
+
+    public List<SubjectInfo> queryList(String hql) {
+        return subjectInfoDao.query(hql, null);
+    }
+
+    public Page<SubjectInfo> queryMemberBaseInfos(PageRequest pageRequest) {
+        String hql = "from SubjectInfo order by createTime desc,sort asc";
+        return subjectInfoDao.findPage(pageRequest, hql, null);
+    }
+
+    public Page<SubjectInfo> querySubjectInfos(PageRequest pageRequest, String hql) {
+        return subjectInfoDao.findPage(pageRequest, hql, null);
+    }
+
+    public Map<String, Object> convertToMap(SubjectInfo subjectInfo) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        if (subjectInfo == null) {
+            return map;
+        }
+        map.put("id", subjectInfo.getId());
+        map.put("subject", TypeUtils.translateData("subject", subjectInfo.getSubject()));
+        map.put("registerStatus", TypeUtils.translateData("registerStatus",subjectInfo.getRegisterStatus()));
+        map.put("appreciationTaxType", subjectInfo.getAppreciationTaxType() == 1 ? "增值税普通发票" : "表示增值税专用发票");
+        map.put("taxpayerNum", subjectInfo.getTaxpayerNum());
+        map.put("addressName", subjectInfo.getAddressName());
+        map.put("telephone", subjectInfo.getTelephone());
+        map.put("bankAddress", subjectInfo.getBankAddress());
+        map.put("bankAccount", subjectInfo.getBankAccount());
+        map.put("taxIssue", subjectInfo.getTaxIssue());
+        map.put("payTime", sdf.format(subjectInfo.getPayTime()));
+        map.put("submitTime", sdf.format(subjectInfo.getSubmitTime()));
+        map.put("modifyTime", sdf.format(subjectInfo.getModifyTime()));
+        return map;
+    }
+
+    public PageBo<SubjectInfo> convert(Page<SubjectInfo> page) {
+        return new PageBo<SubjectInfo>(page, new Convert<SubjectInfo>() {
+            @Override
+            public Map<String, Object> convert(SubjectInfo obj) {
+                return convertToMap(obj);
+            }
+        });
+    }
+
+}

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

@@ -89,7 +89,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">
     	<table>
     		<tr>
@@ -119,7 +119,7 @@
     </form>
 </div>
 <!-- 	datagrid列表  -->
-<table id="registersTable" toolbar="#toolbar" key="newsList" title="角色列表"
+<table id="registersTable" toolbar="#toolbar" key="newsList" title="用户列表"
        width="98%" singleSelect="false">
 </table>
 <!-- 	datagrid工具栏 -->
@@ -131,6 +131,19 @@
     <security:url uri="/admin/business/registerManage/export"><a class="easyui-linkbutton" iconCls="icon-pencil" plain="true" onclick="openEditStatusWin()"><span >修改报名状态</span></a></security:url>
     <security:url uri="/admin/business/registerManage/export"><a class="easyui-linkbutton" iconCls="icon-email" plain="true" onclick="openEmailWin()"><span >发送邮件</span></a></security:url>
 </div>
+
+<!-- 	datagrid列表  -->
+<table id="subjectTable" toolbar="#toolbar2" key="newsList" title="用户报名科目列表"
+       width="98%" singleSelect="false">
+</table>
+<!-- 	datagrid工具栏 -->
+<div id="toolbar2">
+    <security:url uri="/admin/business/registerManage/update"><a class="easyui-linkbutton" iconCls="icon-pencil" plain="true" onclick="openEditWin()"><span >修改</span></a></security:url>
+    <security:url uri="/admin/business/registerManage/delete"><a class="easyui-linkbutton" iconCls="icon-remove" plain="true" onclick="deleteNews()"><span >删除</span></a></security:url>
+    <security:url uri="/admin/business/registerManage/export"><a class="easyui-linkbutton" iconCls="icon-pencil" plain="true" onclick="openEditStatusWin()"><span >修改报名状态</span></a></security:url>
+</div>
+
+
 <div id="exportWindow" class="easyui-window close" >
     <div class="main">
         <h3>导出所有查询结果，请选择导出字段和顺序：</h3>

src/main/webapp/WEB-INF/jsp/home.jsp

@@ -32,7 +32,7 @@
 		<span style="float: right; padding-right: 20px;" class="head">欢迎您：
 			<font style="font-weight:bold">${user_in_session.username}</font><a style="text-decoration:none;color:#000000;font-weight:bold" href="#" id="editpass" >&nbsp;&nbsp;修改密码</a> <a style="font-weight:bold;text-decoration:none;color:red" href="#" id="loginOut">安全退出</a>
 		</span>  
-		<div align="center"><span style="font-size: 16px;"><img src="<c:url value='/resource/home/images/homeTop_b20.png'/>" width="20" height="20" align="absmiddle" />&emsp;培训中心报名管理平台</span></div>
+		<div align="center"><span style="font-size: 16px;"><img src="<c:url value='/resource/home/images/ccpit-logo.png'/>" width="20" height="20" align="absmiddle" />&emsp;培训中心报名管理平台</span></div>
 	</div>
 	<div region="south" split="true" style="height: 30px; background: #D2E0F2;">
 		<div class="footer">技术支持： <a href="#">中贸促信息技术有限责任公司</a></div>

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

@@ -138,18 +138,19 @@ function initExportWindow(){
 function initDataTable(){
 	var h = document.documentElement.clientHeight;
 	$("#registersTable").datagrid({
-		height : h - dataGridHeight,
+		height : (h - dataGridHeight)/3*2,
 		nowrap : true,
 		striped : true,
 		pagination : true,
 		rownumbers : true,
-		pageList : [15,20,30,40,50],
+        singleSelect : true,
+		pageList : [10,20,30,40,50],
 		autoRowHeight : false, 
 		fitColumns : true,
         queryParams : {
             phase:activePhase
         },
-		title : "新闻列表",
+		title : "报名用户列表",
 		url : '/admin/business/registerManage/queryAllRegisterInfo',
 		columns : [ [ {
 			field : 'ck',
@@ -203,6 +204,86 @@ function initDataTable(){
             },
             width : 20
         }] ],
+        onCheck : function(index, row) { // 双击"任一行"执行
+			subjectTableById(row.id)
+		},
+		onLoadSuccess : function(data) { // 加载成功之后执行
+		}
+	});
+}
+
+function subjectTableById(id){
+	var h = document.documentElement.clientHeight;
+	$("#subjectTable").datagrid({
+		height : (h - dataGridHeight)/3,
+		nowrap : true,
+		striped : true,
+		pagination : true,
+		rownumbers : true,
+		pageList : [5,10,15],
+		autoRowHeight : false,
+		fitColumns : true,
+		title : "用户报名科目列表",
+		url : '/admin/business/registerManage/queryAllSubject?id='+ id,
+		columns : [ [ {
+			field : 'ck',
+			title : 'id',
+			width : 15,
+			checkbox : true
+		}, {
+			field : 'subject',
+			title : '报名科目',
+			align : 'center',
+			formatter:function(val,row){
+				return subjectArray[val];
+			},
+			width : 30
+		}, {
+			field : 'registerStatus',
+			title : '报名状态',
+			align : 'center',
+			formatter:function(val,row){
+				return statusArray[val];
+			},
+			width : 30
+		},{
+			field : 'appreciationTaxType',
+			title : '发票类型',
+			align : 'center',
+			width : 30,
+            formatter:function (val,row) {
+                if (1 == val){
+                    return "增值税普通发票";
+                }
+                if (2 == val){
+                    return "表示增值税专用发票";
+                }
+            }
+		}, {
+			field : 'taxIssue',
+			title : '发票开具时间',
+			align : 'center',
+			width : 30,
+            formatter:function (val,row) {
+                if (1 == val){
+                    return "款项到账当年开具";
+                }
+                if (2 == val){
+                    return "款项到账次年开具";
+                }
+            }
+		}, {
+			field : 'submitTime',
+			title : '提交时间',
+			align : 'center',
+			formatter:function(val,row){
+				if(val==''||val==null){
+					return "";
+				}
+				return new Date(parseInt(val)).format("yyyy-MM-dd hh:mm:ss");
+			},
+			width : 20
+		}] ],
 		onDblClickRow : function(index, row) { // 双击"任一行"执行
 		},
 		onLoadSuccess : function(data) { // 加载成功之后执行
@@ -210,6 +291,7 @@ function initDataTable(){
 	});
 }
 
+
 function view(val,row){
     return "<a href=\"javascript:viewData("+row.id+")\">"+row.name+"</button>";
 }
@@ -588,7 +670,6 @@ function saveData(){
 		});    
 	}
 	if('edit' == operation){
-        console.log("dddd");
 		var row = $('#registersTable').datagrid('getSelected');
 		url = "/admin/business/registerManage/addOrUpdateRegisterInfo?operate="+ operation+"&id="+row.id;
 		$('#newsForm').form('submit',{

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

@@ -141,7 +141,7 @@ function initDataTable(){
 		pageList : [15,20,30,40,50],
 		autoRowHeight : false, 
 		fitColumns : true,  
-		title : "新闻列表",
+		title : "延考恢复报名用户列表",
         queryParams : {
             phase:activePhase
         },

src/main/webapp/resource/front/js/info.js

 $(function(){
+	$("#appreciationTaxTypeId").change(function(){
+		var appreciationTaxType = $("#appreciationTaxTypeId").find("option:selected").val();
+		if("1" == appreciationTaxType){
+			$("#companyNameId").css("display","");
+			$("#subjectNameId").css("display","");
+			$("#taxpayerNumId").css("display","");
+			$("#addressNameId").css("display","none");
+			$("#telephoneId").css("display","none");
+			$("#bankAddressId").css("display","none");
+			$("#bankAccountId").css("display","none");
+			$("#taxpayerNumId01").removeAttr("class");
+			$("#addressNameId01").removeAttr("class");
+			$("#telephoneId01").removeAttr("class");
+			$("#bankAddressId01").removeAttr("class");
+			$("#bankAccountId01").removeAttr("class");
+		}else if("2" == appreciationTaxType){
+			$("#companyNameId").css("display","");
+			$("#subjectNameId").css("display","");
+			$("#taxpayerNumId").css("display","");
+			$("#addressNameId").css("display","");
+			$("#telephoneId").css("display","");
+			$("#bankAddressId").css("display","");
+			$("#bankAccountId").css("display","");
+			$("#taxpayerNumId01").attr("class","required");
+			$("#addressNameId01").attr("class","required");
+			$("#telephoneId01").attr("class","required");
+			$("#bankAddressId01").attr("class","required");
+			$("#bankAccountId01").attr("class","required");
+		}else {
+			$("#companyNameId").css("display","none");
+			$("#subjectNameId").css("display","none");
+			$("#taxpayerNumId").css("display","none");
+			$("#addressNameId").css("display","none");
+			$("#telephoneId").css("display","none");
+			$("#bankAddressId").css("display","none");
+			$("#bankAccountId").css("display","none");
+			$("#taxpayerNumId01").removeAttr("class");
+			$("#addressNameId01").removeAttr("class");
+			$("#telephoneId01").removeAttr("class");
+			$("#bankAddressId01").removeAttr("class");
+			$("#companyNameId01").removeAttr("class");
+			$("#subjectNameId01").removeAttr("class");
+			$("#bankAccountId01").removeAttr("class");
+		}
+	})
+
+
 	$("#saveCertificateId").click(function() {
 		$.post('/training/saveCertificateId',
 		  {
@@ -14,4 +61,42 @@ $(function(){
 		    }
 		  });
 	});
+
+	$("#submit").on("click",function(){
+		$(".message").html();
+		if(checkRequired()){
+			var sn = $("input[name='subject']:checked")[0].nextSibling.nodeValue;
+			var registerInfo_id = $("#registerInfo_id").val();
+			if(confirm("您报名的科目是“"+sn+"”，请牢记您的用户名和密码，报名成功后可凭此登陆查看缴费等状态，信息提交之后不可再更改，确认要提交吗？")){
+				$("#form").ajaxSubmit({
+					url: "/training/reg3?registerInfo_id=" + registerInfo_id,
+					type:"post",
+					dataType:"json",
+					success:function(data){
+						if(data.success){
+							location.href="/training/infop";
+						}else{
+							$(".message").html(data.info);
+						}
+					}
+				});
+			}
+		}
+
+	});
 })
+
+function checkRequired(){
+	var success = true;
+	$(".required").each(function(n,v){
+		if($.trim($(this).val())==''){
+			showWarning($(this),"请填写此信息");
+			success = false;
+		}
+	});
+	return success;
+}
+
+function showWarning(obj,text){
+	$(obj).parent().parent().find("span.reg_body").html("<b style='color:red'>"+text+"</b>");
+}
\ No newline at end of file