From 680f64875178b5154af0d66ce41e2c04dcf93aae Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Sat, 15 May 2021 18:04:16 +0800 Subject: [PATCH 1/7] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/route/examapply/list-check.html | 11 +---------- .../static/route/examapply/update-check.html | 6 ------ 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/resources/static/route/examapply/list-check.html b/src/main/resources/static/route/examapply/list-check.html index d015166..c63e483 100644 --- a/src/main/resources/static/route/examapply/list-check.html +++ b/src/main/resources/static/route/examapply/list-check.html @@ -232,15 +232,6 @@ return rowData; } }, - {field: 'planPersonNum', width: 180, title: '计划人数', align:'center', - templet: function(row) { - var rowData = row.classPlanDTO[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, {field: 'planStartTime', width: 180, title: '计划开始时间', align:'center', templet: function(row) { var rowData = row.classPlanDTO[this.field]; @@ -361,7 +352,7 @@ // 考试申请批量审核 function checkMore(ids, planIds) { - top.dialog.msg('开班计划审核', { + top.dialog.msg('考试申请审核', { time: 0, btn: ['通过', '退回'], shade: 0.3, diff --git a/src/main/resources/static/route/examapply/update-check.html b/src/main/resources/static/route/examapply/update-check.html index 36cad71..0269fc3 100644 --- a/src/main/resources/static/route/examapply/update-check.html +++ b/src/main/resources/static/route/examapply/update-check.html @@ -49,12 +49,6 @@ -
- -
- -
-
From dd41e1c08efe875e869f88591fedf5d54cf69cea Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Sat, 15 May 2021 18:13:29 +0800 Subject: [PATCH 2/7] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E3=80=82=20=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=88=90=E7=BB=A9=E5=BD=95=E5=85=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/route/examapply/update-check.html | 46 +-- .../static/route/insertscore/list.html | 336 ++++++++++++++++++ .../static/route/insertscore/user-list.html | 319 +++++++++++++++++ 3 files changed, 673 insertions(+), 28 deletions(-) create mode 100644 src/main/resources/static/route/insertscore/list.html create mode 100644 src/main/resources/static/route/insertscore/user-list.html diff --git a/src/main/resources/static/route/examapply/update-check.html b/src/main/resources/static/route/examapply/update-check.html index 0269fc3..9656828 100644 --- a/src/main/resources/static/route/examapply/update-check.html +++ b/src/main/resources/static/route/examapply/update-check.html @@ -87,7 +87,7 @@
- +
@@ -265,33 +265,7 @@ return false; } } - formData.field.examId = classPlanId; - formData.field.planName = $('#planName').val(); - formData.field.planPersonNum = $('#planPersonNum').val(); - 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) { - 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(); - } - }); - }, 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); - }); - }); + sentExamMsg(classPlanId); }, function(){ return false; }); @@ -299,6 +273,22 @@ return false; }); + // 考场信息分配 + function sentExamMsg(planIds) { + layer.open({ + type: 2, + title: false, + closeBtn: 0, + area: ['100%', '100%'], + shadeClose: true, + anim: 2, + content: top.restAjax.path('route/examination/distribution/update.html?planId={planId}', [planIds]), + end: function() { + reloadTable(); + } + }); + } + $('.close').on('click', function() { closeBox(); }); diff --git a/src/main/resources/static/route/insertscore/list.html b/src/main/resources/static/route/insertscore/list.html new file mode 100644 index 0000000..319f1c7 --- /dev/null +++ b/src/main/resources/static/route/insertscore/list.html @@ -0,0 +1,336 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/insertscore/user-list.html b/src/main/resources/static/route/insertscore/user-list.html new file mode 100644 index 0000000..97fcc75 --- /dev/null +++ b/src/main/resources/static/route/insertscore/user-list.html @@ -0,0 +1,319 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+ +
+
+ + + +
+
+
+
+
+ + + + + \ No newline at end of file From 7c40de8b2a35c4c50c590eb596682007871315b2 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Sat, 15 May 2021 18:38:40 +0800 Subject: [PATCH 3/7] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/bos/examapply/ExamApplyBO.java | 9 +++ .../pojo/bos/examcheck/ExamCheckBO.java | 9 +++ .../pojo/dtos/examapply/ExamApplyDTO.java | 10 +++ .../pojo/dtos/examcheck/ExamCheckDTO.java | 10 +++ .../pojo/pos/examapply/ExamApplyPO.java | 9 +++ .../pojo/pos/examcheck/ExamCheckPO.java | 9 +++ .../pojo/vos/examapply/ExamApplyVO.java | 10 +++ .../pojo/vos/examcheck/ExamCheckVO.java | 10 +++ .../mapper/examapply/exam-apply-mapper.xml | 14 +++++ .../mapper/examcheck/exam-check-mapper.xml | 19 +++++- .../static/route/examapply/list-check.html | 2 +- .../static/route/examapply/update-check.html | 63 ++++++++++++++++++- .../static/route/examcheck/update.html | 54 ++++++++++++---- 13 files changed, 209 insertions(+), 19 deletions(-) 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 @@
+
+ +
+ +
+