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 b7fca2e..2855bbc 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 @@ -26,6 +26,9 @@ public class ExamApplyBO { private String examApplyNum; private Integer status; private Integer userStatus; + private Integer checkStatus; + private Integer examType; + private String reason; public String getExamApplyId() { return examApplyId; @@ -138,4 +141,28 @@ public class ExamApplyBO { public void setUserStatus(Integer userStatus) { this.userStatus = userStatus; } + + public Integer getCheckStatus() { + return checkStatus; + } + + public void setCheckStatus(Integer checkStatus) { + this.checkStatus = checkStatus; + } + + public Integer getExamType() { + return examType; + } + + public void setExamType(Integer examType) { + this.examType = examType; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } } 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 cb0f067..916e591 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 @@ -43,8 +43,14 @@ public class ExamApplyDTO { private Integer status; @ApiModelProperty(name = "userStatus", value = "监考老师分配状态。0：未分配，1：已分配") private Integer userStatus; + @ApiModelProperty(name = "checkStatus", value = "考试申请审核状态。0：未审核，1：审核通过，2：审核驳回") + private Integer checkStatus; + @ApiModelProperty(name = "examType", value = "考试类型。1：理论，2：实操") + private Integer examType; @ApiModelProperty(name = "classPlanDTO", value = "考试基本信息") private ClassPlanDTO classPlanDTO; + @ApiModelProperty(name = "reason", value = "审核原因") + private String reason; public String getExamApplyId() { return examApplyId; @@ -158,6 +164,22 @@ public class ExamApplyDTO { this.userStatus = userStatus; } + public Integer getCheckStatus() { + return checkStatus; + } + + public void setCheckStatus(Integer checkStatus) { + this.checkStatus = checkStatus; + } + + public Integer getExamType() { + return examType; + } + + public void setExamType(Integer examType) { + this.examType = examType; + } + public ClassPlanDTO getClassPlanDTO() { return classPlanDTO; } @@ -165,4 +187,12 @@ public class ExamApplyDTO { public void setClassPlanDTO(ClassPlanDTO classPlanDTO) { this.classPlanDTO = classPlanDTO; } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } } 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 6a0cf20..9676755 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 @@ -24,6 +24,9 @@ public class ExamApplyPO { private String examApplyNum; private Integer status; private Integer userStatus; + private Integer checkStatus; + private Integer examType; + private String reason; public String getExamApplyId() { return examApplyId; @@ -136,4 +139,28 @@ public class ExamApplyPO { public void setUserStatus(Integer userStatus) { this.userStatus = userStatus; } + + public Integer getCheckStatus() { + return checkStatus; + } + + public void setCheckStatus(Integer checkStatus) { + this.checkStatus = checkStatus; + } + + public Integer getExamType() { + return examType; + } + + public void setExamType(Integer examType) { + this.examType = examType; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } } 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 efc2a61..36b88f7 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 @@ -48,6 +48,12 @@ public class ExamApplyVO { private Integer status; @ApiModelProperty(name = "userStatus", value = "监考老师分配状态。0：未分配，1：已分配") private Integer userStatus; + @ApiModelProperty(name = "checkStatus", value = "考试申请审核状态。0：未审核，1：审核通过，2：审核驳回") + private Integer checkStatus; + @ApiModelProperty(name = "examType", value = "考试类型。1：理论，2：实操") + private Integer examType; + @ApiModelProperty(name = "reason", value = "审核原因") + private String reason; public String getExamApplyId() { return examApplyId; @@ -169,6 +175,14 @@ public class ExamApplyVO { this.status = status; } + public Integer getCheckStatus() { + return checkStatus; + } + + public void setCheckStatus(Integer checkStatus) { + this.checkStatus = checkStatus; + } + public Integer getUserStatus() { return userStatus; } @@ -176,4 +190,20 @@ public class ExamApplyVO { public void setUserStatus(Integer userStatus) { this.userStatus = userStatus; } + + public Integer getExamType() { + return examType; + } + + public void setExamType(Integer examType) { + this.examType = examType; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } } diff --git a/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java index bea3412..3bd9618 100644 --- a/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java @@ -62,6 +62,9 @@ public class ExamApplyServiceImpl extends DefaultBaseService implements IExamApp @Override public String saveReturnId(String token, ExamApplyVO examApplyVO) { String examApplyId = UUIDUtil.getUUID(); + examApplyVO.setStatus(0); + examApplyVO.setUserStatus(0); + examApplyVO.setCheckStatus(0); Map params = HashMapUtil.beanToMap(examApplyVO); params.put("examApplyId", examApplyId); if (StringUtils.isBlank(token)) { @@ -128,16 +131,19 @@ public class ExamApplyServiceImpl extends DefaultBaseService implements IExamApp setAppUpdateInfo(token, params); } examApplyDao.update(params); - // 申请考场信息开始 - DistributionSaveVO dstributionSaveVO = new DistributionSaveVO(); - dstributionSaveVO.setPlanId(examApplyVO.getExamId()); - dstributionSaveVO.setPlanName(examApplyVO.getPlanName()); - dstributionSaveVO.setDistributionTime(examApplyVO.getTheoryExamStartTime()); - dstributionSaveVO.setDistributionEndTime(examApplyVO.getTheoryExamEndTime()); - dstributionSaveVO.setDistributionNumber(examApplyVO.getPlanPersonNum()); - dstributionSaveVO.setStationId(examApplyVO.getTheoryExamAddressId()); - distributionService.save(dstributionSaveVO); - // 申请考场信息结束 + // 如果受理通过，则新增一条考场分配数据 + if(2 == examApplyVO.getCheckStatus()) { + // 申请考场信息开始 + DistributionSaveVO dstributionSaveVO = new DistributionSaveVO(); + dstributionSaveVO.setPlanId(examApplyVO.getExamId()); + dstributionSaveVO.setPlanName(examApplyVO.getPlanName()); + dstributionSaveVO.setDistributionTime(examApplyVO.getTheoryExamStartTime()); + dstributionSaveVO.setDistributionEndTime(examApplyVO.getTheoryExamEndTime()); + dstributionSaveVO.setDistributionNumber(examApplyVO.getPlanPersonNum()); + dstributionSaveVO.setStationId(examApplyVO.getTheoryExamAddressId()); + distributionService.save(dstributionSaveVO); + // 申请考场信息结束 + } } @Override diff --git a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java index 7a58fc0..b2ce45b 100644 --- a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java @@ -114,14 +114,6 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe setAppUpdateInfo(token, params); } examCheckDao.update(params); - // 如果受理通过，则新增一条考场分配数据 - if(2 == examCheckVO.getCheckStatus()) { - ExamApplyVO examApplyVO = new ExamApplyVO(); - examApplyVO.setStatus(0); - examApplyVO.setUserStatus(0); - examApplyVO.setExamId(examCheckVO.getPlanId()); - examApplyService.save(examApplyVO); - } // 信息回传到培训机构，返回审核状态等信息 String classPlanId = examCheckVO.getPlanId(); ClassPlanVO classPlanVO = new ClassPlanVO(); 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 3dcb48f..833878e 100644 --- a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml +++ b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml @@ -17,6 +17,9 @@ + + + @@ -34,6 +37,9 @@ + + + @@ -51,6 +57,9 @@ + + + @@ -66,6 +75,9 @@ payment_voucher_num, status, user_status, + check_status, + exam_type, + reason, gmt_create, creator, gmt_modified, @@ -82,6 +94,9 @@ #{paymentVoucherNum}, #{status}, #{userStatus}, + #{checkStatus}, + #{examType}, + #{reason}, #{gmtCreate}, #{creator}, #{gmtModified}, @@ -159,6 +174,15 @@ user_status = #{userStatus}, + + + check_status = #{checkStatus}, + + + exam_type = #{examType}, + + + reason = #{reason}, gmt_modified = #{gmtModified}, modifier = #{modifier}, @@ -186,6 +210,9 @@ t1.exam_apply_num, t1.status, t1.user_status, + t1.check_status, + t1.exam_type, + t1.reason, t1.exam_apply_id FROM management_exam_apply t1 @@ -213,6 +240,9 @@ t1.payment_voucher_num, t1.status, t1.user_status, + t1.check_status, + t1.exam_type, + t1.reason, t1.exam_apply_num FROM management_exam_apply t1 @@ -240,6 +270,9 @@ t1.payment_voucher_num, t1.status, t1.user_status, + t1.check_status, + t1.exam_type, + t1.reason, t1.exam_apply_num FROM management_exam_apply t1 @@ -268,6 +301,9 @@ t1.exam_apply_num, t1.status, t1.user_status, + t1.check_status, + t1.exam_type, + t1.reason, 1 FROM management_exam_apply t1 @@ -312,6 +348,9 @@ t1.payment_voucher_num, t1.status, t1.user_status, + t1.check_status, + t1.exam_type, + t1.reason, t1.exam_apply_num FROM management_exam_apply t1 @@ -356,6 +395,9 @@ t1.payment_voucher_num, t1.status, t1.user_status, + t1.check_status, + t1.exam_type, + t1.reason, t1.exam_apply_num FROM management_exam_apply t1 diff --git a/src/main/resources/static/route/examapply/update.html b/src/main/resources/static/route/examapply/update.html index 4fc58e7..5a10b64 100644 --- a/src/main/resources/static/route/examapply/update.html +++ b/src/main/resources/static/route/examapply/update.html @@ -56,14 +56,14 @@
- -
+ +
- -
+ +
@@ -193,6 +193,19 @@
+
+ +
+ + +
+
+
@@ -226,6 +239,15 @@ var wangEditorObj = {}; var viewerObj = {}; + form.on('radio(checkStatus)', function (data) { + var val = data.value; + if (2 == val) { + $('#reasonDiv').show(); + } else { + $('#reasonDiv').hide(); + } + }); + // 初始化实操考试地点下拉选择 function initPracticeExamAddressIdSelect(selectValue) { top.restAjax.get(top.restAjax.path('api/institution/list?institutionType=考点信息', []), {}, null, function(code, data, args) { @@ -467,6 +489,13 @@ for(var i in data) { dataFormData[i] = data[i] +''; } + if ('1' == data.planType) { + data.planType = '初训'; + } else if ('2' == data.planType) { + data.planType = '复训'; + } else if ('3' == data.planType) { + data.planType = '换证 '; + } form.val('initDataForm', dataFormData); form.render(null, 'initDataForm'); }) @@ -498,6 +527,12 @@ // 提交表单 form.on('submit(submitForm)', function(formData) { + if(2 == formData.field.checkStatus) { + if(null == formData.field.reason || '' == formData.field.reason || typeof(formData.field.reason) == "undefined") { + top.dialog.msg('退回原因必填'); + return false; + } + } var theoryExamStartTime = new Date($('#theoryExamEndTime').val()).getTime(); var theoryExamEndTime = new Date($('#theoryExamStartTime').val()).getTime(); if(theoryExamEndTime >= theoryExamStartTime) {