清障队流程

VisualInspection/qzd/js/appeal_management/appeal_checked.js

@@ -40,7 +40,7 @@ function queryCheckedAppealTask() {
     // }
     checkedAppealTableObj = $('#checked_datatable').mytable({
         'cols': cols,
-        'url': "/f/checkAppeal/getTaskList/",
+        'url': "/q/checkAppeal/getTaskList/",
         'param': data,
         'pager': {
             'p_cur': cur_page
@@ -53,7 +53,7 @@ function queryCheckedAppealTask() {
 function showTaskDetail(id) {
     var rowData = getItemByIdFromArr(id, $('#checked_datatable').mytable('getTableData'));
     $.checkTask = rowData;
-    post_common_service("/f/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
+    post_common_service("/q/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
         $.checkTask = rowData;
         $.checkTask.appeal = data;
         changePage("/qzd/view/task/taskDetail.html", checkedAppealTableObj);

VisualInspection/qzd/js/appeal_management/appeal_submited.js

@@ -38,7 +38,7 @@ function querySubmitedAppealTask() {
     // }
     submitedAppealTableObj = $('#submited_datatable').mytable({
         'cols': cols,
-        'url': "/f/checkAppeal/getTaskList/",
+        'url': "/q/checkAppeal/getTaskList/",
         'param': data,
         'pager': {
             'p_cur': cur_page
@@ -51,7 +51,7 @@ function querySubmitedAppealTask() {
 function showTaskDetail(id) {
     var rowData = getItemByIdFromArr(id, $('#submited_datatable').mytable('getTableData'));
     $.checkTask = rowData;
-    post_common_service("/f/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
+    post_common_service("/q/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
         $.checkTask = rowData;
         $.checkTask.appeal = data;
         console.log("申诉：" + $.checkTask.appeal.id);

VisualInspection/qzd/js/task/checked.js

@@ -38,7 +38,7 @@ function queryCheckedTask() {
     // }
     checkedTaskTableObj = $('#checked_datatable').mytable({
         'cols': cols,
-        'url': "/f/task/getall/",
+        'url': "/q/task/getall/",
         'param': data,
         'pager': {
             'page_size': 10,

VisualInspection/qzd/js/task/task_list.js

@@ -188,7 +188,7 @@ function dispatchTaskPatch() {
     layer.confirm('确定下发选中任务？', {
         btn: ['确定', '取消'] //按钮
     }, function() {
-        no_return_common_service('/f/task/dispatch', param, function(data) {
+        no_return_common_service('/q/task/dispatch', param, function(data) {
             queryTask();
             layer.msg(data, {
                 time: 2000 //20s后自动关闭
@@ -233,7 +233,7 @@ function dispatchAllNoScoreTask() {
             "start_time": getMomentTimeFormat(t.starttime),
             "end_time": getMomentTimeFormat(t.endtime),
         };
-        no_return_common_service('/f/task/dispatchAllNoScoreTask', param, function(data) {
+        no_return_common_service('/q/task/dispatchAllNoScoreTask', param, function(data) {
             queryTask();
             layer.msg(data, {
                 time: 2000 //20s后自动关闭

VisualInspection/qzd/view/appeal_management/appealDetail.html

@@ -68,7 +68,7 @@
             "appeal_reason": $("#add_appeal_reason").val(),
             "file_src": file_src
         }
-        no_return_common_service("/f/checkAppeal/add/", param, function(data) {
+        no_return_common_service("/q/checkAppeal/add/", param, function(data) {
             layer.msg("申诉提交成功", {
                 time: 2000 //20s后自动关闭
             });

VisualInspection/qzd/view/task/taskDetail.html

@@ -53,15 +53,15 @@
     </div>
     <div class="row" style="margin-top:5px;text-align:center">
         <div>
-            <button id="submitBtn" style="display:none" type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
-            <button id="confirmBtn" style="display:none" type="button" class="btn btn-warning" onclick="confirmCheck()">确认</button>
-            <button id="submitAppealBtn" style="display:none" type="button" class="btn btn-warning" onclick="submitCheck4Appeal()">复核提交</button>
-            <button id="confirmAppealBtn" style="display:none" type="button" class="btn btn-warning" onclick="confirmCheck4Appeal()">申诉结果确认</button>
-            <button id="appealBtn" style="display:none" type="button" class="btn btn-danger" onclick="showAppeal()">申诉</button>
-            <button id="assignBtn" style="display:none" type="button" class="btn btn-danger" onclick="showAssign()">分配</button>
-            <button id="backBtn" style="display:none" type="button" class="btn btn-danger" onclick="back2Check()">退回重新稽查</button>
-            <button id="backAppealBtn" style="display:none" type="button" class="btn btn-danger" onclick="back2AppealCheck()">退回重新复查</button>
-            <button id="backConfirmBtn" style="display:none" type="button" class="btn btn-danger" onclick="back2Confirm()">退回重新确认</button>
+            <button id="submitBtn" style="display:block" type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
+            <button id="confirmBtn" style="display:block" type="button" class="btn btn-warning" onclick="confirmCheck()">确认</button>
+            <button id="submitAppealBtn" style="display:block" type="button" class="btn btn-warning" onclick="submitCheck4Appeal()">复核提交</button>
+            <button id="confirmAppealBtn" style="display:block" type="button" class="btn btn-warning" onclick="confirmCheck4Appeal()">申诉结果确认</button>
+            <button id="appealBtn" style="display:block" type="button" class="btn btn-danger" onclick="showAppeal()">申诉</button>
+            <button id="assignBtn" style="display:block" type="button" class="btn btn-danger" onclick="showAssign()">分配</button>
+            <button id="backBtn" style="display:block" type="button" class="btn btn-danger" onclick="back2Check()">退回重新稽查</button>
+            <button id="backAppealBtn" style="display:block" type="button" class="btn btn-danger" onclick="back2AppealCheck()">退回重新复查</button>
+            <button id="backConfirmBtn" style="display:block" type="button" class="btn btn-danger" onclick="back2Confirm()">退回重新确认</button>
         </div>
     </div>
 </div>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/TaskController_Q.java

@@ -7,6 +7,7 @@ import com.xintong.visualinspection.controller.BaseController;
 import com.xintong.visualinspection.pojo.fwq.TaskData_F;
 import com.xintong.visualinspection.pojo.qzd.TaskDate_Q;
 import com.xintong.visualinspection.service.CheckAppealService_F;
+import com.xintong.visualinspection.service.CheckAppealService_Q;
 import com.xintong.visualinspection.service.TaskService_Q;
 import com.xintong.visualinspection.util.AuthorUtil;
 import com.xintong.visualinspection.util.CacheUtil;
@@ -31,7 +32,7 @@ public class TaskController_Q extends BaseController {
     @Reference(version = "1.0.0",
             application = "${dubbo.application.id}",
             registry = "${dubbo.registry.address}")
-    private CheckAppealService_F checkAppealService_f;
+    private CheckAppealService_Q checkAppealService_f;
 
 
 
@@ -123,4 +124,25 @@ public class TaskController_Q extends BaseController {
         return super.returnSuccessResult("修改成功", t);
     }
 
+    @RequestMapping(value = "/taskEnd")
+    public String taskEnd(HttpServletRequest request, @Valid @RequestBody QzdCheckTask task){
+        if(task.getId()==null){
+            throw new BusinessException(20002);
+        }
+        if(task.getCheck_status()==null || "".equals(task.getCheck_status())){
+            task.setCheck_status(Constants.STATUS_CHECK_END);
+        }
+        User user = getCurrentUser(request);
+        task.setUpdate_user(new Long(user.getId()));
+        taskService_q.updateStatus(task);
+
+        if(task.getAppeal_result()!=null && task.getAppeal_id()!=null){
+            CheckAppeal_F checkAppeal = new CheckAppeal_F();
+            checkAppeal.setId(task.getAppeal_id());
+            checkAppeal.setAppeal_result(task.getAppeal_result());
+            checkAppealService_f.update(checkAppeal);
+        }
+        return super.returnSuccessResult("修改成功");
+    }
+
 }

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

@@ -51,7 +51,7 @@
             </otherwise>
         </choose>
 
-
+        <if test="checked_users != null">AND t.checked_users like #{checked_users}</if>
         <if test="checkman != null">AND t.checkman = #{checkman}</if>
         <if test="record_id != null">AND t.record_id = #{record_id}</if>
         <if test="check_status_arr != null and check_status_arr.length > 0">AND

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CheckAppealServiceImpl.java

@@ -2,6 +2,7 @@ package com.xintong.visualinspection.visuallnspection_qzd.service.impl;
 
 import com.xintong.visualinspection.bean.CheckAppeal_F;
 import com.xintong.visualinspection.service.CheckAppealService_F;
+import com.xintong.visualinspection.service.CheckAppealService_Q;
 import com.xintong.visualinspection.util.CacheUtil;
 import com.xintong.visualinspection.visuallnspection_qzd.dao.CheckAppealDao;
 import org.slf4j.LoggerFactory;
@@ -21,7 +22,7 @@ import java.util.List;
         protocol = "${dubbo.protocol.id}",
         registry = "${dubbo.registry.id}"
 )
-public class CheckAppealServiceImpl implements CheckAppealService_F {
+public class CheckAppealServiceImpl implements CheckAppealService_Q {
 
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CheckAppealServiceImpl.class);
 

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CheckApplyServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.dubbo.config.annotation.Reference;
 import com.xintong.visualinspection.bean.CheckApply_F;
 import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.service.CheckApplyService_F;
+import com.xintong.visualinspection.service.CheckApplyService_Q;
 import com.xintong.visualinspection.service.CommonService;
 import com.xintong.visualinspection.visuallnspection_qzd.dao.CheckApplyDao;
 import org.slf4j.LoggerFactory;
@@ -24,7 +25,7 @@ import java.util.Map;
         protocol = "${dubbo.protocol.id}",
         registry = "${dubbo.registry.id}"
 )
-public class CheckApplyServiceImpl  implements CheckApplyService_F {
+public class CheckApplyServiceImpl  implements CheckApplyService_Q {
 
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CheckApplyServiceImpl.class);
 

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/TaskService_QImpl.java

@@ -116,18 +116,18 @@ public  class TaskService_QImpl implements TaskService_Q {
     }
 
 //    @Override
-//    public void addTask(QzdCheckTask qzdCheckTask) {
-//        qzdTaskDao.addtask(qzdCheckTask);
-//        TaskStatus taskStatus = new TaskStatus();
-//        taskStatus.setCheck_status(qzdCheckTask.getCheck_status());
-//        taskStatus.setCheck_status_name((commonService.getCodeMap().get("task_status_" + qzdCheckTask.getCheck_status())).getCode_name());
-//        User u = commonService.getUserMap().get((long) qzdCheckTask.getCheckman());
-//        if (u != null) {
-//            taskStatus.setUpdate_username(u.getTruename());
-//        }
-//        taskStatus.setTask_id((long) qzdCheckTask.getId());
-//        qzdTaskDao.insertStatus(taskStatus);
-//    }
+////    public void addTask(QzdCheckTask qzdCheckTask) {
+////        qzdTaskDao.addtask(qzdCheckTask);
+////        TaskStatus taskStatus = new TaskStatus();
+////        taskStatus.setCheck_status(qzdCheckTask.getCheck_status());
+////        taskStatus.setCheck_status_name((commonService.getCodeMap().get("task_status_" + qzdCheckTask.getCheck_status())).getCode_name());
+////        User u = commonService.getUserMap().get((long) qzdCheckTask.getCheckman());
+////        if (u != null) {
+////            taskStatus.setUpdate_username(u.getTruename());
+////        }
+////        taskStatus.setTask_id((long) qzdCheckTask.getId());
+////        qzdTaskDao.insertStatus(taskStatus);
+////    }
 
     @Override
     public void updateStatus(QzdCheckTask qzdCheckTask) {