Merge remote-tracking branch 'origin/master'

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;
+    }
 }

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;
+    }
 }

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;
+    }
 }

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;
+    }
 }

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<String, Object> 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();
+        if(2 == examApplyVO.getCheckStatus()) {
-        dstributionSaveVO.setPlanId(examApplyVO.getExamId());
+            // 申请考场信息开始
-        dstributionSaveVO.setPlanName(examApplyVO.getPlanName());
+            DistributionSaveVO dstributionSaveVO = new DistributionSaveVO();
-        dstributionSaveVO.setDistributionTime(examApplyVO.getTheoryExamStartTime());
+            dstributionSaveVO.setPlanId(examApplyVO.getExamId());
-        dstributionSaveVO.setDistributionEndTime(examApplyVO.getTheoryExamEndTime());
+            dstributionSaveVO.setPlanName(examApplyVO.getPlanName());
-        dstributionSaveVO.setDistributionNumber(examApplyVO.getPlanPersonNum());
+            dstributionSaveVO.setDistributionTime(examApplyVO.getTheoryExamStartTime());
-        dstributionSaveVO.setStationId(examApplyVO.getTheoryExamAddressId());
+            dstributionSaveVO.setDistributionEndTime(examApplyVO.getTheoryExamEndTime());
-        distributionService.save(dstributionSaveVO);
+            dstributionSaveVO.setDistributionNumber(examApplyVO.getPlanPersonNum());
-        // 申请考场信息结束
+            dstributionSaveVO.setStationId(examApplyVO.getTheoryExamAddressId());
+            distributionService.save(dstributionSaveVO);
+            // 申请考场信息结束
+        }
     }
 
     @Override

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();

src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml

@@ -17,6 +17,9 @@
         <result column="exam_apply_num" property="examApplyNum"/>
         <result column="status" property="status"/>
         <result column="user_status" property="userStatus"/>
+        <result column="check_status" property="checkStatus"/>
+        <result column="exam_type" property="examType"/>
+        <result column="reason" property="reason"/>
     </resultMap>
 
     <resultMap id="examApplyBO" type="cn.com.tenlion.pojo.bos.examapply.ExamApplyBO">
@@ -34,6 +37,9 @@
         <result column="exam_apply_num" property="examApplyNum"/>
         <result column="status" property="status"/>
         <result column="user_status" property="userStatus"/>
+        <result column="check_status" property="checkStatus"/>
+        <result column="exam_type" property="examType"/>
+        <result column="reason" property="reason"/>
     </resultMap>
 
     <resultMap id="examApplyPO" type="cn.com.tenlion.pojo.pos.examapply.ExamApplyPO">
@@ -51,6 +57,9 @@
         <result column="exam_apply_num" property="examApplyNum"/>
         <result column="status" property="status"/>
         <result column="user_status" property="userStatus"/>
+        <result column="check_status" property="checkStatus"/>
+        <result column="exam_type" property="examType"/>
+        <result column="reason" property="reason"/>
     </resultMap>
 
     <!-- 新增应急管理局-考试申请表-renpc -->
@@ -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 @@
         </if>
         <if test="userStatus != null and userStatus != ''">
             user_status = #{userStatus},
+        </if>
+        <if test="checkStatus != null and checkStatus != ''">
+            check_status = #{checkStatus},
+        </if>
+        <if test="examType != null and examType != ''">
+            exam_type = #{examType},
+        </if>
+        <if test="reason != null and reason != ''">
+            reason = #{reason},
         </if>
             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

src/main/resources/static/route/examapply/update.html

@@ -56,14 +56,14 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">计划开始时间</label>
+                    <label class="layui-form-label" style="width: 120px;">计划开始时间</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block" style="margin-left: 120px;">
                         <input type="text" id="planStartTime" name="planStartTime" class="layui-input" value="" placeholder="请输入计划人数"  maxlength="255" readonly>
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">计划结束时间</label>
+                    <label class="layui-form-label" style="width: 120px;">计划结束时间</label>
-                    <div class="layui-input-block">
+                    <div class="layui-input-block" style="margin-left: 120px;">
                         <input type="text" id="planEndTime" name="planEndTime" class="layui-input" value="" placeholder="请输入计划人数"  maxlength="255" readonly>
                     </div>
                 </div>
@@ -193,6 +193,19 @@
                         <input type="text" id="paymentVoucherNum" name="paymentVoucherNum" class="layui-input" value="" placeholder="请输入缴费凭证编号"  maxlength="255">
                     </div>
                 </div>
+                <div class="layui-form-item" pane>
+                    <label class="layui-form-label">审核状态</label>
+                    <div class="layui-input-block layui-form">
+                        <input type="radio" lay-filter="checkStatus" name="checkStatus" value="1" title="受理" checked>
+                        <input type="radio" lay-filter="checkStatus" name="checkStatus" value="2" title="退回">
+                    </div>
+                </div>
+                <div class="layui-form-item layui-form-text" style="display: none;" id="reasonDiv">
+                    <label class="layui-form-label">审核失败原因</label>
+                    <div class="layui-input-block">
+                        <textarea type="text" id="reason" name="reason" class="layui-textarea" value="" placeholder="请输入审核结果，审核失败原因"></textarea>
+                    </div>
+                </div>
                 <div class="layui-form-item layui-layout-admin">
                     <div class="layui-input-block">
                         <div class="layui-footer" style="left: 0;">
@@ -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) {