diff --git a/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java b/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java
index 5962d5b..06c0bc4 100644
--- a/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java
+++ b/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java
@@ -32,6 +32,7 @@ public class ExamApplyBO {
private String nextCommitTime;
private String workTypeId;
private String orgId;
+ private Integer nextNum;
public String getExamApplyId() {
return examApplyId;
@@ -192,4 +193,12 @@ public class ExamApplyBO {
public void setOrgId(String orgId) {
this.orgId = orgId;
}
+
+ public Integer getNextNum() {
+ return nextNum;
+ }
+
+ public void setNextNum(Integer nextNum) {
+ this.nextNum = nextNum;
+ }
}
diff --git a/src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java b/src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java
index 3f20f66..72c64ac 100644
--- a/src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java
+++ b/src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java
@@ -23,6 +23,7 @@ public class ExamCheckBO {
private String nextCommitTime;
private String workTypeId;
private String orgId;
+ private Integer nextNum;
public String getExamCheckId() {
return examCheckId == null ? "" : examCheckId.trim();
@@ -127,4 +128,12 @@ public class ExamCheckBO {
public void setOrgId(String orgId) {
this.orgId = orgId;
}
+
+ public Integer getNextNum() {
+ return nextNum;
+ }
+
+ public void setNextNum(Integer nextNum) {
+ this.nextNum = nextNum;
+ }
}
diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java
index 73a8447..fbacbdc 100644
--- a/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java
+++ b/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java
@@ -63,6 +63,8 @@ public class ExamApplyDTO {
private String workTypeId;
@ApiModelProperty(name = "orgId", value = "机构ID")
private String orgId;
+ @ApiModelProperty(name = "nextNum", value = "下次提交审核时间数字")
+ private Integer nextNum;
public String getExamApplyId() {
return examApplyId;
@@ -255,4 +257,12 @@ public class ExamApplyDTO {
public void setOrgId(String orgId) {
this.orgId = orgId;
}
+
+ public Integer getNextNum() {
+ return nextNum;
+ }
+
+ public void setNextNum(Integer nextNum) {
+ this.nextNum = nextNum;
+ }
}
diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java
index 656fbdd..dd430aa 100644
--- a/src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java
+++ b/src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java
@@ -33,6 +33,8 @@ public class ExamCheckDTO {
private String workTypeId;
@ApiModelProperty(name = "orgId", value = "机构ID")
private String orgId;
+ @ApiModelProperty(name = "nextNum", value = "下次提交审核时间数字")
+ private Integer nextNum;
public String getExamCheckId() {
return examCheckId == null ? "" : examCheckId.trim();
@@ -105,4 +107,12 @@ public class ExamCheckDTO {
public void setOrgId(String orgId) {
this.orgId = orgId;
}
+
+ public Integer getNextNum() {
+ return nextNum;
+ }
+
+ public void setNextNum(Integer nextNum) {
+ this.nextNum = nextNum;
+ }
}
diff --git a/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java b/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java
index 9fb413c..4a49998 100644
--- a/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java
+++ b/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java
@@ -30,6 +30,7 @@ public class ExamApplyPO {
private String nextCommitTime;
private String workTypeId;
private String orgId;
+ private Integer nextNum;
public String getExamApplyId() {
return examApplyId;
@@ -190,4 +191,12 @@ public class ExamApplyPO {
public void setOrgId(String orgId) {
this.orgId = orgId;
}
+
+ public Integer getNextNum() {
+ return nextNum;
+ }
+
+ public void setNextNum(Integer nextNum) {
+ this.nextNum = nextNum;
+ }
}
diff --git a/src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java b/src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java
index 888dbbd..1713a96 100644
--- a/src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java
+++ b/src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java
@@ -23,6 +23,7 @@ public class ExamCheckPO {
private String nextCommitTime;
private String workTypeId;
private String orgId;
+ private Integer nextNum;
public String getExamCheckId() {
return examCheckId == null ? "" : examCheckId.trim();
@@ -127,4 +128,12 @@ public class ExamCheckPO {
public void setOrgId(String orgId) {
this.orgId = orgId;
}
+
+ public Integer getNextNum() {
+ return nextNum;
+ }
+
+ public void setNextNum(Integer nextNum) {
+ this.nextNum = nextNum;
+ }
}
diff --git a/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java b/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java
index 965b65b..4e84bc8 100644
--- a/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java
+++ b/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java
@@ -60,6 +60,8 @@ public class ExamApplyVO {
private String workTypeId;
@ApiModelProperty(name = "orgId", value = "机构ID")
private String orgId;
+ @ApiModelProperty(name = "nextNum", value = "下次提交审核时间数字")
+ private Integer nextNum;
public String getExamApplyId() {
return examApplyId;
@@ -236,4 +238,12 @@ public class ExamApplyVO {
public void setOrgId(String orgId) {
this.orgId = orgId;
}
+
+ public Integer getNextNum() {
+ return nextNum;
+ }
+
+ public void setNextNum(Integer nextNum) {
+ this.nextNum = nextNum;
+ }
}
diff --git a/src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java b/src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java
index 05931a2..08624fb 100644
--- a/src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java
+++ b/src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java
@@ -31,6 +31,8 @@ public class ExamCheckVO {
private String workTypeId;
@ApiModelProperty(name = "orgId", value = "机构ID")
private String orgId;
+ @ApiModelProperty(name = "nextNum", value = "下次提交审核时间数字")
+ private Integer nextNum;
public String getPlanId() {
return planId == null ? "" : planId.trim();
@@ -87,4 +89,12 @@ public class ExamCheckVO {
public void setOrgId(String orgId) {
this.orgId = orgId;
}
+
+ public Integer getNextNum() {
+ return nextNum;
+ }
+
+ public void setNextNum(Integer nextNum) {
+ this.nextNum = nextNum;
+ }
}
diff --git a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml
index 636ee74..11cd3b0 100644
--- a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml
+++ b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml
@@ -23,6 +23,7 @@
+
@@ -46,6 +47,7 @@
+
@@ -69,6 +71,7 @@
+
@@ -91,6 +94,7 @@
next_commit_time,
work_type_id,
org_id,
+ next_num,
gmt_create,
creator,
gmt_modified,
@@ -114,6 +118,7 @@
#{nextCommitTime},
#{workTypeId},
#{orgId},
+ #{nextNum},
#{gmtCreate},
#{creator},
#{gmtModified},
@@ -209,6 +214,9 @@
org_id = #{orgId},
+
+
+ next_num = #{nextNum},
gmt_modified = #{gmtModified},
modifier = #{modifier},
@@ -245,6 +253,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
t1.exam_apply_id
FROM
management_exam_apply t1
@@ -281,6 +290,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
t1.exam_apply_num
FROM
management_exam_apply t1
@@ -314,6 +324,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
t1.exam_apply_num
FROM
management_exam_apply t1
@@ -348,6 +359,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
1
FROM
management_exam_apply t1
@@ -401,6 +413,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
t1.exam_apply_num
FROM
management_exam_apply t1
@@ -451,6 +464,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
t1.exam_apply_num
FROM
management_exam_apply t1
diff --git a/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml b/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml
index b77da81..1f46638 100644
--- a/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml
+++ b/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml
@@ -11,6 +11,7 @@
+
@@ -27,6 +28,7 @@
+
@@ -43,6 +45,7 @@
+
@@ -56,6 +59,7 @@
next_commit_time,
work_type_id,
org_id,
+ next_num,
gmt_create,
creator,
gmt_modified,
@@ -70,6 +74,7 @@
#{nextCommitTime},
#{workTypeId},
#{orgId},
+ #{nextNum},
#{gmtCreate},
#{creator},
#{gmtModified},
@@ -129,6 +134,9 @@
org_id = #{orgId},
+
+
+ next_num = #{nextNum},
gmt_modified = #{gmtModified},
modifier = #{modifier},
@@ -147,6 +155,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
t1.exam_check_id
FROM
management_exam_check t1
@@ -177,6 +186,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
t1.gmt_create,
t1.creator,
t1.gmt_modified,
@@ -203,6 +213,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
t1.gmt_create,
t1.creator,
t1.gmt_modified,
@@ -229,6 +240,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
1
FROM
management_exam_check t1
@@ -273,6 +285,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
t1.gmt_create,
t1.creator,
t1.gmt_modified,
@@ -314,12 +327,13 @@
t1.reason,
t1.exam_apply_id,
t1.next_commit_time,
+ t1.work_type_id,
+ t1.org_id,
+ t1.next_num,
t1.gmt_create,
t1.creator,
t1.gmt_modified,
t1.modifier,
- t1.work_type_id,
- t1.org_id,
t1.is_delete
FROM
management_exam_check t1
@@ -380,6 +394,7 @@
t1.next_commit_time,
t1.work_type_id,
t1.org_id,
+ t1.next_num,
1
FROM
management_exam_check t1
diff --git a/src/main/resources/static/route/examapply/list-check.html b/src/main/resources/static/route/examapply/list-check.html
index c63e483..b9fc5d5 100644
--- a/src/main/resources/static/route/examapply/list-check.html
+++ b/src/main/resources/static/route/examapply/list-check.html
@@ -131,7 +131,7 @@
nextTime.setDate(nextTime.getDate() + $('#nextCommitTime').val());
formData.field.nextCommitTime = nextTime.format("yyyy-MM-dd hh:mm:ss");
formData.field.checkStatus = '2';
- top.restAjax.put(top.restAjax.path('api/examapply/update-more/{examCheckId}', [ids]), formData.field, null, function(code, data) {
+ top.restAjax.put(top.restAjax.path('api/examapply/update-more/{examApplyId}', [ids]), formData.field, null, function(code, data) {
if('200' == code) {
top.dialog.msg('退回成功');
window.location.reload();
diff --git a/src/main/resources/static/route/examapply/update-check.html b/src/main/resources/static/route/examapply/update-check.html
index 9656828..d00acdd 100644
--- a/src/main/resources/static/route/examapply/update-check.html
+++ b/src/main/resources/static/route/examapply/update-check.html
@@ -91,6 +91,12 @@
+
@@ -134,8 +140,10 @@
var val = data.value;
if (2 == val) {
$('#reasonDiv').show();
+ $('#nextTimeDiv').show();
} else {
$('#reasonDiv').hide();
+ $('#nextTimeDiv').hide();
}
});
@@ -189,6 +197,7 @@
}
if ('3' == data.checkStatus) {
$('#reasonDiv').show();
+ $('#nextTimeDiv').show();
}
if (null == data.checkStatus || '' == data.checkStatus || typeof (data.checkStatus) == 'undefined') {
$('#subBtn').show();
@@ -253,19 +262,68 @@
});
}
}
+
+ Date.prototype.format = function(fmt) {
+ var o = {
+ "M+" : this.getMonth()+1,
+ "d+" : this.getDate(),
+ "h+" : this.getHours(),
+ "m+" : this.getMinutes(),
+ "s+" : this.getSeconds(),
+ "q+" : Math.floor((this.getMonth()+3)/3),
+ "S" : this.getMilliseconds()
+ };
+ if(/(y+)/.test(fmt)) {
+ fmt=fmt.replace(RegExp.$1, (this.getFullYear()+"").substr(4 - RegExp.$1.length));
+ };
+ for(var k in o) {
+ if(new RegExp("("+ k +")").test(fmt)){
+ fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+ }
+ }
+ return fmt;
+ };
// 提交表单
form.on('submit(submitForm)', function(formData) {
layer.confirm('审核一旦通过,将无法进行修改', {
btn: ['确定','取消'] //按钮
}, function(){
- if(3 == formData.field.checkStatus) {
+ if(2 == formData.field.checkStatus) {
if(null == formData.field.reason || '' == formData.field.reason || typeof(formData.field.reason) == "undefined") {
top.dialog.msg('退回原因必填');
return false;
}
+ if(null == formData.field.nextNum || '' == formData.field.nextNum || typeof(formData.field.nextNum) == "undefined") {
+ top.dialog.msg('下次提交审核时间必填');
+ return false;
+ }
+ var nextTime = new Date();
+ nextTime.setDate(nextTime.getDate() + $('#nextNum').val());
+ formData.field.nextCommitTime = nextTime.format("yyyy-MM-dd hh:mm:ss");
+ top.dialog.confirm(top.dataMessage.commit, function(index) {
+ top.dialog.close(index);
+ var loadLayerIndex;
+ top.restAjax.put(top.restAjax.path('api/examapply/update/{examApplyId}', [examApplyId]), formData.field, null, function(code, data) {
+ if('200' == code) {
+ top.dialog.msg('退回成功');
+ closeBox();
+ }else {
+ top.dialog.msg('退回失败');
+ closeBox();
+ }
+ }, function(code, data) {
+ top.dialog.msg(data.msg);
+ }, function() {
+ loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
+ }, function() {
+ top.dialog.close(loadLayerIndex);
+ });
+ });
+ return false;
+ }else {
+ sentExamMsg(classPlanId);
}
- sentExamMsg(classPlanId);
}, function(){
return false;
});
@@ -284,7 +342,6 @@
anim: 2,
content: top.restAjax.path('route/examination/distribution/update.html?planId={planId}', [planIds]),
end: function() {
- reloadTable();
}
});
}
diff --git a/src/main/resources/static/route/examcheck/update.html b/src/main/resources/static/route/examcheck/update.html
index bfcd40c..97614cd 100644
--- a/src/main/resources/static/route/examcheck/update.html
+++ b/src/main/resources/static/route/examcheck/update.html
@@ -87,10 +87,16 @@
+
@@ -134,8 +140,10 @@
var val = data.value;
if (3 == val) {
$('#reasonDiv').show();
+ $('#nextTimeDiv').show();
} else {
$('#reasonDiv').hide();
+ $('#nextTimeDiv').hide();
}
});
@@ -189,6 +197,7 @@
}
if ('3' == data.checkStatus) {
$('#reasonDiv').show();
+ $('#nextTimeDiv').show();
}
if (null == data.checkStatus || '' == data.checkStatus || typeof (data.checkStatus) == 'undefined') {
$('#subBtn').show();
@@ -253,6 +262,27 @@
});
}
}
+
+ Date.prototype.format = function(fmt) {
+ var o = {
+ "M+" : this.getMonth()+1,
+ "d+" : this.getDate(),
+ "h+" : this.getHours(),
+ "m+" : this.getMinutes(),
+ "s+" : this.getSeconds(),
+ "q+" : Math.floor((this.getMonth()+3)/3),
+ "S" : this.getMilliseconds()
+ };
+ if(/(y+)/.test(fmt)) {
+ fmt=fmt.replace(RegExp.$1, (this.getFullYear()+"").substr(4 - RegExp.$1.length));
+ };
+ for(var k in o) {
+ if(new RegExp("("+ k +")").test(fmt)){
+ fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+ }
+ }
+ return fmt;
+ };
// 提交表单
form.on('submit(submitForm)', function(formData) {
@@ -263,22 +293,20 @@
}
}
formData.field.planId = classPlanId;
+ var nextTime = new Date();
+ nextTime.setDate(nextTime.getDate() + $('#nextNum').val());
+ formData.field.nextCommitTime = nextTime.format("yyyy-MM-dd hh:mm:ss");
top.dialog.confirm(top.dataMessage.commit, function(index) {
top.dialog.close(index);
var loadLayerIndex;
top.restAjax.put(top.restAjax.path('api/examcheck/update/{examCheckId}', [examCheckId]), formData.field, null, function(code, data) {
- var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
- time: 0,
- btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
- shade: 0.3,
- yes: function(index) {
- top.dialog.close(index);
- window.location.reload();
- },
- btn2: function() {
- closeBox();
- }
- });
+ if('200' == code) {
+ top.dialog.msg('退回成功');
+ closeBox();
+ }else {
+ top.dialog.msg('退回失败');
+ closeBox();
+ }
}, function(code, data) {
top.dialog.msg(data.msg);
}, function() {