bug修改。

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

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

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

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

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

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

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

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

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

@@ -23,6 +23,7 @@
         <result column="next_commit_time" property="nextCommitTime"/>
         <result column="work_type_id" property="workTypeId"/>
         <result column="org_id" property="orgId"/>
+        <result column="next_num" property="nextNum"/>
     </resultMap>
 
     <resultMap id="examApplyBO" type="cn.com.tenlion.pojo.bos.examapply.ExamApplyBO">
@@ -46,6 +47,7 @@
         <result column="next_commit_time" property="nextCommitTime"/>
         <result column="work_type_id" property="workTypeId"/>
         <result column="org_id" property="orgId"/>
+        <result column="next_num" property="nextNum"/>
     </resultMap>
 
     <resultMap id="examApplyPO" type="cn.com.tenlion.pojo.pos.examapply.ExamApplyPO">
@@ -69,6 +71,7 @@
         <result column="next_commit_time" property="nextCommitTime"/>
         <result column="work_type_id" property="workTypeId"/>
         <result column="org_id" property="orgId"/>
+        <result column="next_num" property="nextNum"/>
     </resultMap>
 
     <!-- 新增应急管理局-考试申请表-renpc -->
@@ -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 @@
         </if>
         <if test="orgId != null and orgId != ''">
             org_id = #{orgId},
+        </if>
+        <if test="nextNum != null and nextNum != ''">
+            next_num = #{nextNum},
         </if>
             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

src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml

@@ -11,6 +11,7 @@
         <result column="next_commit_time" property="nextCommitTime"/>
         <result column="work_type_id" property="workTypeId"/>
         <result column="org_id" property="orgId"/>
+        <result column="next_num" property="nextNum"/>
     </resultMap>
 
     <resultMap id="examCheckBO" type="cn.com.tenlion.pojo.bos.examcheck.ExamCheckBO">
@@ -27,6 +28,7 @@
         <result column="next_commit_time" property="nextCommitTime"/>
         <result column="work_type_id" property="workTypeId"/>
         <result column="org_id" property="orgId"/>
+        <result column="next_num" property="nextNum"/>
     </resultMap>
 
     <resultMap id="examCheckPO" type="cn.com.tenlion.pojo.pos.examcheck.ExamCheckPO">
@@ -43,6 +45,7 @@
         <result column="next_commit_time" property="nextCommitTime"/>
         <result column="work_type_id" property="workTypeId"/>
         <result column="org_id" property="orgId"/>
+        <result column="next_num" property="nextNum"/>
     </resultMap>
 
     <!-- 新增 -->
@@ -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 @@
         </if>
         <if test="orgId != null and orgId != ''">
             org_id = #{orgId},
+        </if>
+        <if test="nextNum != null and nextNum != ''">
+            next_num = #{nextNum},
         </if>
             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

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

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

@@ -91,6 +91,12 @@
                         <input type="radio" lay-filter="checkStatus" name="checkStatus" value="2" title="退回">
                     </div>
                 </div>
+                <div class="layui-form-item" id="nextTimeDiv">
+                    <label class="layui-form-label" style="width: 135px;">下次提交审核时间</label>
+                    <div class="layui-input-block" style="margin-left: 165px;">
+                        <input type="number" id="nextNum" name="nextNum" lay-verify="inputRule" class="layui-input" value="" placeholder="请输入下次提交审核时间(单位：天)"  maxlength="255">
+                    </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">
@@ -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();
                 }
             });
         }

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

@@ -87,10 +87,16 @@
                 <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="2" title="受理" checked>
+                        <input type="radio" lay-filter="checkStatus" name="checkStatus" value="2" title="审核通过" checked>
                         <input type="radio" lay-filter="checkStatus" name="checkStatus" value="3" title="退回">
                     </div>
                 </div>
+                <div class="layui-form-item" id="nextTimeDiv">
+                    <label class="layui-form-label" style="width: 135px;">下次提交审核时间</label>
+                    <div class="layui-input-block" style="margin-left: 165px;">
+                        <input type="number" id="nextCommitTime" name="nextCommitTime" lay-verify="inputRule" class="layui-input" value="" placeholder="请输入下次提交审核时间(单位：天)"  maxlength="255">
+                    </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">
@@ -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, {
+                    if('200' == code) {
-                        time: 0,
+                        top.dialog.msg('退回成功');
-                        btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                        closeBox();
-                        shade: 0.3,
+                    }else {
-                        yes: function(index) {
+                        top.dialog.msg('退回失败');
-                            top.dialog.close(index);
+                        closeBox();
-                            window.location.reload();
+                    }
-                        },
-                        btn2: function() {
-                            closeBox();
-                        }
-                    });
                 }, function(code, data) {
                     top.dialog.msg(data.msg);
                 }, function() {