无效任务处理

VisualInspection/js/mytask/check.js

@@ -390,14 +390,14 @@ function queryCheckScores() {
         // }
     ];
 
-    var colFunc = {width: 120, text: '操作', type: 'string', flex: true, field: 'id'};   
+    var colFunc = { width: 120, text: '操作', type: 'string', flex: true, field: 'id' };
     colFunc.oper = [
-                        { func: 'showEditCheckScore', text: '修改', icon_class: 'icon-edit' },
-                        { func: 'showEditPic', text: '图片', icon_class: 'icon-edit' }
-                    ];
-    if ($.checkTask.appeal){
+        { func: 'showEditCheckScore', text: '修改', icon_class: 'icon-edit' },
+        { func: 'showEditPic', text: '图片', icon_class: 'icon-edit' }
+    ];
+    if ($.checkTask.appeal) {
         colFunc.oper.push({ func: 'backoutCheckScore', text: '撤销', icon_class: 'icon-reply' });
-    }else{
+    } else {
         colFunc.oper.push({ func: 'deleteCheckScore', text: '删除', icon_class: 'icon-remove-circle' });
     }
     cols.push(colFunc);
@@ -515,6 +515,7 @@ function saveEdit() {
 function deleteCheckScore(id) {
     deleteItem4Common(id, "/score/delete/", queryCheckScores, 'r');
 }
+
 function backoutCheckScore(id) {
     layer.confirm('是否要撤销扣分？', {
         btn: ['是', '否'], //按钮
@@ -537,6 +538,7 @@ function backoutCheckScore(id) {
 
     });
 }
+
 function setVideoList(videos) {
     var videoArr;
     if (videos) {
@@ -705,7 +707,7 @@ function changePerson(id) {
     }, function() {
 
     });
-    
+
 }
 
 function checkHasScore(id, old_person) {
@@ -844,9 +846,9 @@ function getCheckItems() {
             showRemoveBtn: false
         }
     };
-    var param = {"rule_type":1};
+    var param = { "rule_type": 1 };
     console.log(param);
-    post_common_service('checkRule/getItemListByRuleType', param , function(data) {
+    post_common_service('checkRule/getItemListByRuleType', param, function(data) {
         // console.log(data);
         zdata = [];
         for (var i = 0; i < data.length; i++) {
@@ -948,7 +950,19 @@ function showPre(id) {
     changePage("/view/mytask/taskDetail.html");
 }
 
+var isappeal = false;
+
+function appeal_showInvalid() {
+    isappeal = true;
+    showInvalidView();
+}
+
 function showInvalid() {
+    isappeal = false;
+    showInvalidView();
+}
+
+function showInvalidView() {
     invalidLayer = showPopup4Common('申请无效', function() {
         saveValidReason();
     }, ['400px', '500px'], '#invalid_div', 'r');
@@ -957,6 +971,8 @@ function showInvalid() {
     getTags("/checkApply/getTopReason", "#top_reason_div", '#apply_reason', 'apply_reason');
 }
 
+
+
 function submitCheck4AppealDirect() {
     var appeal_result = 1;
     //询问框
@@ -1002,8 +1018,11 @@ function showPre4Appeal(id) {
 function saveValidReason() {
     var param = {
         "task_id": $.checkTask.id,
-        "apply_reason": $('#apply_reason').val()
-    }
+        "apply_reason": $('#apply_reason').val(),
+        "isappeal": isappeal
+    };
+
+
     no_return_common_service("/checkApply/add/", param, function(data) {
         layer.msg("申请提交成功", {
             offset: 'r',

VisualInspection/view/mytask/check.html

@@ -124,6 +124,7 @@
                 <div class="col-sm-10" id="btn_appeal_task">
                     <button class="btn btn-info2" type="button" onclick="submitCheck4AppealDirect()">直接提交</button>
                     <button class="btn btn-info2" type="button" onclick="showPre4Appeal()">预览提交</button>
+                    <button class="btn btn-info3" type="button" onclick="appeal_showInvalid()">申请无效</button>
                     <!--<button class="btn btn-primary" type="button" data-toggle="modal" data-target="#refuseApplyWin">拒绝申请</button>
                     <button class="btn btn-primary" type="button" onclick="agreeApply()">同意申请</button>-->
                 </div>
@@ -192,11 +193,11 @@
 <script>
     var curVideo;
     $(document).ready(function() {
-        $("#video_btn_start").mouseover(function(){
-            $("#video_btn_start_img").attr("src","/images/movie.png");
+        $("#video_btn_start").mouseover(function() {
+            $("#video_btn_start_img").attr("src", "/images/movie.png");
         });
-        $("#video_btn_start").mouseout(function(){
-            $("#video_btn_start_img").attr("src","/images/video.png");
+        $("#video_btn_start").mouseout(function() {
+            $("#video_btn_start_img").attr("src", "/images/video.png");
         });
         if ($.checkTask.checked_location_type == 1) {
             $("li.tab_lane").hide();

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/CheckAppeal.java

@@ -75,4 +75,6 @@ public class CheckAppeal {
     private String recheckman_name;
     //申诉结果
     private Integer appeal_result;
+
+
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/CheckApply.java

@@ -57,4 +57,6 @@ public class CheckApply {
     private Long[] apply_ids;
     
     private Integer count;
+
+    private boolean isappeal;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckAppealController.java

@@ -54,8 +54,9 @@ public class CheckAppealController extends BaseController {
     		User u = getCurrentUser(request);
     		checkAppeal.setAppeal_man(new Long(u.getId()));
     		checkAppeal.setCheck_status(Constants.STATUS_APPEALING);
-    		if(u.getOrganid()!=null)
-    			checkAppeal.setAppeal_dept(new Long(u.getOrganid()));
+    		if(u.getOrganid()!=null) {
+                checkAppeal.setAppeal_dept(new Long(u.getOrganid()));
+            }
     		checkAppealService.insert(checkAppeal);
     		Task task = taskService.getById(checkAppeal.getTask_id());
     		task.setCheck_status(checkAppeal.getCheck_status());
@@ -96,7 +97,7 @@ public class CheckAppealController extends BaseController {
     
     /**
      * 根据id获取考核项数据
-     * @param checkItem
+     * @param checkAppeal
      * @return
      */
     @RequestMapping(value = "/getById")
@@ -110,7 +111,7 @@ public class CheckAppealController extends BaseController {
     
     /**
      * 根据taskid获取申诉数据
-     * @param checkItem
+     * @param checkAppeal
      * @return
      */
     @RequestMapping(value = "/getByTaskId")

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckApplyController.java

@@ -59,12 +59,16 @@ public class CheckApplyController extends BaseController {
     	User u = getCurrentUser(request);
     	checkAppeal.setApply_man(new Long(u.getId()));
     	checkAppeal.setCheck_status(Constants.STATUS_APPLYING);
-    	if(u.getOrganid()!=null)
-    		checkAppeal.setApply_dept(new Long(u.getOrganid()));
+    	if(u.getOrganid()!=null) {
+            checkAppeal.setApply_dept(new Long(u.getOrganid()));
+        }
     	checkApplyService.insert(checkAppeal);
     	Task task = taskService.getById(checkAppeal.getTask_id());
     	task.setCheck_status(checkAppeal.getCheck_status());
     	task.setUpdate_user(new Long(u.getId()));
+    	if(checkAppeal.isIsappeal()){
+    	    task.setInvalidFrom(1);
+        }
     	taskService.update(task);
     	return super.returnSuccessResult("添加成功");
     }
@@ -154,14 +158,22 @@ public class CheckApplyController extends BaseController {
     		throw new BusinessException(20001); 
     	}
     	User user = getCurrentUser(request);
-    	checkAppeal.setVerify_person(new Long(user.getId()));
-    	int check_status = Constants.STATUS_APPLY_FAILED;
-    	checkAppeal.setCheck_status(check_status);
-    	checkApplyService.update(checkAppeal);
+//    	checkAppeal.setVerify_person(new Long(user.getId()));
+//    	int check_status = Constants.STATUS_APPLY_FAILED;
+//    	checkAppeal.setCheck_status(check_status);
+//    	checkApplyService.update(checkAppeal);
+        checkApplyService.delete(checkAppeal.getId());
     	Task task = new Task();
     	task.setId(checkAppeal.getTask_id());
+    	Task temp = taskService.getById(checkAppeal.getTask_id());
+    	if(temp.getInvalidFrom().equals(1)){
+    	    //申诉任务  则退回申诉待稽查中
+            task.setCheck_status(Constants.STATUS_APPEAL_SUCCEED);
+        }else{
+            task.setCheck_status(Constants.STATUS_CHECK_SUBMIT);
+        }
     	//无效任务拒绝后，任务该外待稽查状态
-    	task.setCheck_status(Constants.STATUS_CHECK_SUBMIT);
+
     	task.setUpdate_user(new Long(user.getId()));
     	taskService.update(task);
     	return super.returnSuccessResult("拒绝成功");

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/TaskMapper.xml

@@ -267,6 +267,9 @@
         <if test="rule_id != null">rule_id = #{rule_id},</if>
         <if test="checked_location != null">checked_location = #{checked_location},</if>
         <if test="checked_location_type != null">checked_location_type = #{checked_location_type},</if>
+        <if test="invalidFrom != null">
+            invalid_from = #{invalidFrom},
+        </if>
         remark = #{remark}
         WHERE
         id = #{id}