Commit d3a72e14 by 丁伟

1、解决部分bug

parent 2592d7e4
......@@ -407,6 +407,28 @@ public class IndexController extends BaseController {
return map;
}
@RequestMapping("/checkSubject")
public Object checkSubject(Long registerInfo_id, Integer subject,String sn) {
Map<String, Object> map = new HashMap<String, Object>();
Phase phase = getActivePhase();
RegisterInfo reg = registerService.queryRegisterById(registerInfo_id);
if(subject == reg.getSubject()){
map.put("success", false);
map.put("info", "当前选择考试科目《"+ sn +"》已报名,请勿重复报名!");
return map;
}
List<SubjectInfo> subjectInfos = subjectInfoService.queryList("from SubjectInfo where registerInfo_id = " + registerInfo_id);
for(SubjectInfo sub : subjectInfos){
if(subject == sub.getSubject()){
map.put("success", false);
map.put("info", "当前选择考试科目《"+ sn +"》已报名,请勿重复报名!");
return map;
}
}
map.put("success", true);
return map;
}
private void sendEmail(String email, String name, String subject) {
EmailBody body = new EmailBody();
MailSender.send(email, "", "");
......
......@@ -151,9 +151,15 @@ public class RegisterService {
}
List<SubjectInfo> subjectInfos = subjectInfoDao.query(sb.toString());
List<RegisterInfo> registerInfos = new ArrayList<RegisterInfo>();
String hql = "";
if(phase != null && phase != 0){
hql = "from RegisterInfo where phase.id = '" + phase + "'";
}else {
hql = "from RegisterInfo";
}
List<RegisterInfo> registerInfoList = registerDao.query(hql);
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()) {
r_info.setSubject(s_info.getSubject());
......
......@@ -125,6 +125,13 @@
<button onClick="ok('alert2')">确定</button>
</div>
</div>
<div class="sy-alert sy-alert-alert animated" sy-enter="zoomIn" sy-leave="zoomOut" sy-type="alert" sy-mask="true" id="alert3">
<div class="bm-title"></div>
<div class="bm-message"></div>
<div class="sy-btn">
<button onClick="ok('alert3')">确定</button>
</div>
</div>
<c:if test="${!registerInfo.regType}">
<tr name="trEmial">
<td class="name" width="25%">报名科目:</td>
......
......@@ -94,7 +94,7 @@ body {
width: auto;
height: 160px;
padding: 0;
background-image: url(/resource/front/img/imageslog/topbg_01.gif);
background-image: url(/resource/front/img/buttonbg.gif);
}
#top img {
......
......@@ -43,6 +43,16 @@
padding: 0 12px
}
.sy-alert .bm-title{
height: 45px;
color: #333;
line-height: 45px;
font-size: 15px;
border-bottom: 1px solid #eee;
padding: 0 12px;
text-align: center;
}
.sy-alert .sy-content {
padding: 20px;
text-align: center;
......
......@@ -88,21 +88,44 @@ $(function () {
$(".message").html();
if (checkRequired()) {
var sn = $("input[name='subject']:checked")[0].nextSibling.nodeValue;
var subject = $("input[name='subject']:checked")[0].value;
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);
$.ajax({
url: '/training/checkSubject',
type: 'get',
dataType: 'json',
data: {
registerInfo_id: registerInfo_id,
subject: subject,
sn : sn
},
success:function (data){
if(data.success){
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);
}
}
});
}
alert("报名成功!");
}else {
var title = '<h3>报名提示</h3>'
var html = '<span style="font-size: 16px; color: red;text-align: center">&emsp;&emsp;' + data.info + '</span>';
$(".bm-title").append(title);
$(".bm-message").append(html);
syalert.syopen('alert3')
}
});
}
}
})
}
});
......@@ -133,6 +156,8 @@ function ok(id){
syalert.syhide(id);
$(".sy-title").empty();
$(".invoiceWin").empty();
$(".bm-title").empty();
$(".bm-message").empty();
}
......
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