清障队

VisualInspection/qzd/js/appeal_management/appeal_list.js

@@ -25,7 +25,7 @@ function initQueryParams() {
         cur_page = store_params.currentpage;
     }
 
-    setSASelect("#fsList", checked_dept);
+    setWreckerGroupAllSelect("#fsList", checked_dept);
 
     //获取页面参数
     var page_params = $.zui.store.get("page_params");
@@ -93,7 +93,7 @@ function queryAppeal() {
     }
     appealTableObj = $('#appeal_list_table').mytable({
         'cols': cols,
-        'url': "/f/checkAppeal/getTaskList",
+        'url': "/q/checkAppeal/getTaskList",
         'param': data,
         'pager': {
             'p_cur': cur_page
@@ -107,7 +107,7 @@ function seeCheckAudit(id, task_id) {
     // alert("task_id:"+task_id+"---id:"+id)
     // function showTaskDetail1(id){
     var rowData = getItemByIdFromArr(id, $('#appeal_list_table').mytable('getTableData'));
-    post_common_service("/f/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
+    post_common_service("/q/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
         if (!data) {
             layer.msg('未获取到申诉内容！', {
                 time: 2000 //20s后自动关闭
@@ -170,14 +170,14 @@ function queryUnAssignedTable() {
 
     $('#appeal_list_table').mytable({
         'cols': cols,
-        'url': "/f/checkAppeal/getList",
+        'url': "/q/checkAppeal/getList",
         'param': data
     });
 }
 //进入稽查页面
 function showAppealCheck(id) {
     var rowData = getItemByIdFromArr(id, $('#appeal_list_table').mytable('getTableData'));
-    post_common_service("/f/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
+    post_common_service("/q/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
         if (!data) {
             layer.msg('未获取到申诉内容！', {
                 time: 2000 //20s后自动关闭
@@ -188,7 +188,7 @@ function showAppealCheck(id) {
         $.checkTask.appeal = data;
         // console.log(data);
         // console.log("申诉："+$.checkTask.appeal.id);
-        no_return_common_service('/f/task/update', { "id": id, "check_status": 13 })
+        no_return_common_service('/q/task/update', { "id": id, "check_status": 13 })
         changePage("/qzd/view/task/check.html", appealTableObj);
     });
 }
@@ -196,7 +196,7 @@ function showAppealCheck(id) {
 function showAppealContinueCheck(id) {
     // $('#myModal').modal({name:"dd"});
     var rowData = getItemByIdFromArr(id, $('#appeal_list_table').mytable('getTableData'));
-    post_common_service("/f/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
+    post_common_service("/q/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
         if (!data) {
             layer.msg('未获取到申诉内容！', {
                 time: 2000 //20s后自动关闭
@@ -229,7 +229,7 @@ function dispatchAppealTaskById(id) {
             "id": rowData.id,
             "check_status": 15
         }
-        no_return_common_service('/f/task/dispatchById', param, function(data) {
+        no_return_common_service('/q/task/dispatchById', param, function(data) {
             queryAppeal();
             layer.msg(data, {
                 time: 2000 //20s后自动关闭

VisualInspection/qzd/js/task/add.js

@@ -69,8 +69,8 @@ function inittAreaable(time, dept) {
     var endtime = moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss");
     var starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
 
-    var param1 = { "start_time": starttime.format("YYYY-MM-DD HH:mm:ss"), "end_time": endtime.format("YYYY-MM-DD HH:mm:ss"), "checked_dept": dept }
-
+    var param1 = { "startTime": starttime, "endTime": endtime, "checked_dept": dept }
+    console.log(param1);
 
 
     //获取排班情况

VisualInspection/qzd/js/task/apply_task.js

@@ -6,7 +6,7 @@ function initApplyPage() {
     });
     $("#start_time").val(getCurrentTimeFormat());
 
-    setSASelect("#fsList");
+    setWreckerGroupAllSelect("#fsList");
 
 
     var page_params = $.zui.store.get("page_params");
@@ -86,7 +86,7 @@ function queryUnexaminedTask() {
     $('#unexamined_datatable').mytable({
         'cols': cols,
         'checkable': checkable,
-        'url': "/f/task/getall/",
+        'url': "/q/task/getall/",
         'param': data
     });
 }
@@ -98,7 +98,7 @@ function showCheck(id) {
     }
 
     //开始稽查
-    no_return_common_service('/f/task/update', { "id": $.checkTask.id, "check_status": 21, "record_status": 1, "check_status_name": "复查" });
+    no_return_common_service('/q/task/update', { "id": $.checkTask.id, "check_status": 21, "record_status": 1, "check_status_name": "复查" });
     changePage("/qzd/view/task/check.html");
 }
 
@@ -125,7 +125,7 @@ function showApplyDetail1(id) {
     $('#apply_time').val("");
     $('#apply_reason').val("");
     $('#apply_id').val("");
-    post_common_service('/f/checkApply/getByTaskId', param, function(data) {
+    post_common_service('/q/checkApply/getByTaskId', param, function(data) {
         $('#apply_man').val(data.apply_man_name);
         $('#apply_time').val(data.apply_time);
         $('#apply_reason').val(data.apply_reason);
@@ -161,7 +161,7 @@ function showApplyDetail(id) {
     $('#apply_time').val("");
     $('#apply_reason').val("");
     $('#apply_id').val("");
-    post_common_service('/f/checkApply/getByTaskId', param, function(data) {
+    post_common_service('/q/checkApply/getByTaskId', param, function(data) {
         $('#apply_man').val(data.apply_man_name);
         $('#apply_time').val(data.apply_time);
         $('#apply_reason').val(data.apply_reason);
@@ -174,7 +174,7 @@ function aggreeApply(taskId) {
         'id': $('#apply_id').val(),
         'task_id': taskId
     };
-    addOrUpdateItem4Common(param, '/f/checkApply/agree', queryUnexaminedTask);
+    addOrUpdateItem4Common(param, '/q/checkApply/agree', queryUnexaminedTask);
 }
 
 function refuseApply(taskId) {
@@ -182,12 +182,12 @@ function refuseApply(taskId) {
         'id': $('#apply_id').val(),
         'task_id': taskId
     };
-    addOrUpdateItem4Common(param, '/f/checkApply/refuse', queryUnexaminedTask);
+    addOrUpdateItem4Common(param, '/q/checkApply/refuse', queryUnexaminedTask);
 }
 
 function agreeApplyTaskPatch() {
     var param = {
         'apply_ids': $('#unexamined_datatable').mytable('getTableCheckedIds')
     };
-    addOrUpdateItem4Common(param, '/f/checkApply/agreePatch', queryUnexaminedTask);
+    addOrUpdateItem4Common(param, '/q/checkApply/agreePatch', queryUnexaminedTask);
 }

VisualInspection/qzd/js/task/check.js

@@ -930,7 +930,7 @@ function saveValidReason() {
     };
 
 
-    no_return_common_service("/f/checkApply/add/", param, function(data) {
+    no_return_common_service("/q/checkApply/add/", param, function(data) {
         layer.msg("申请提交成功", {
             offset: 'r',
             time: 2000 //20s后自动关闭
@@ -988,7 +988,7 @@ function saveRecheckResult() {
         "id": $.checkTask.appeal.id,
         "recheck_result": $("#recheck_result").val()
     }
-    post_common_service("/f/checkAppeal/update", param, function(data) {
+    post_common_service("/q/checkAppeal/update", param, function(data) {
         layer.msg("保存成功", {
             offset: 'r',
             time: 2000 //20s后自动关闭

VisualInspection/qzd/js/task/new.js

@@ -70,8 +70,8 @@ function queryTask() {
     console.log(user.roles[0]);
     var t = getTimeByMonth(GV("#start_time"));
     var data = {
-        "startTime": getMomentTimeFormat(t.starttime),
-        "endTime": getMomentTimeFormat(t.endtime),
+        "startTime": t.starttime,
+        "endTime": t.endtime,
         "dept": $("#deptlist").val(),
         // "check_status": cur_status
     };
@@ -219,5 +219,7 @@ function getRecord() {
         // "check_status": cur_status
 
     };
-
+    post_common_service('q/record/getall/0/0', data, function(redata) {
+        console.log(redata);
+    });
 }

VisualInspection/qzd/view/task/taskDetail.html

@@ -237,7 +237,7 @@
         }
         $('#score_datatable').mytable({
             'cols': cols,
-            'url': "/f/score/getScoreList/",
+            'url': "/q/score/getScoreList/",
             'param': data
         });
         $('a.lightbox-toggle').lightbox();
@@ -309,12 +309,12 @@
                 'pics': picsStr
             }
             // alert("dddd");
-        addOrUpdateItem4Common(param, "/f/score/update", queryScores);
+        addOrUpdateItem4Common(param, "/q/score/update", queryScores);
         curScoreId = "";
     }
 
     function deleteScore(id) {
-        deleteItem4Common(id, "/f/score/delete/", queryScores);
+        deleteItem4Common(id, "/q/score/delete/", queryScores);
     }
 
     function genFlow() {
@@ -382,7 +382,7 @@
             "id": $.checkTask.id,
             "check_status": 4
         }
-        no_return_common_service("/f/task/taskEnd/", param, function(data) {
+        no_return_common_service("/q/task/taskEnd/", param, function(data) {
             layer.msg("提交成功", {
                 time: 2000 //20s后自动关闭
             });
@@ -412,7 +412,7 @@
             "appeal_id": $.checkTask.appeal.id,
             "appeal_result": appeal_result
         }
-        no_return_common_service("/f/task/update/", param, function(data) {
+        no_return_common_service("/q/task/update/", param, function(data) {
             layer.msg("提交成功", {
                 time: 2000 //20s后自动关闭
             });
@@ -449,7 +449,7 @@
                 "id": $.checkTask.id,
                 "check_status": 6
             }
-            no_return_common_service("/f/task/update/", param, function(data) {
+            no_return_common_service("/q/task/update/", param, function(data) {
                 layer.msg("确认成功", {
                     time: 2000 //20s后自动关闭
                 });
@@ -470,7 +470,7 @@
                 "id": $.checkTask.id,
                 "check_status": 16
             }
-            no_return_common_service("/f/task/update/", param, function(data) {
+            no_return_common_service("/q/task/update/", param, function(data) {
                 layer.msg("确认成功", {
                     time: 2000 //20s后自动关闭
                 });
@@ -505,7 +505,7 @@
             "recheckman": $('#choseCheckmanList').val(),
             "check_status": 12
         }
-        no_return_common_service("/f/task/update/", param, function(data) {
+        no_return_common_service("/q/task/update/", param, function(data) {
             layer.msg("分配成功", {
                 time: 2000 //20s后自动关闭
             });
@@ -520,7 +520,7 @@
             "check_status": 3,
             "check_status_name": "退回"
         }
-        no_return_common_service("/f/task/update/", param, function(data) {
+        no_return_common_service("/q/task/update/", param, function(data) {
             layer.msg("退回成功", {
                 time: 2000 //20s后自动关闭
             });
@@ -535,7 +535,7 @@
             "check_status": 5,
             "check_status_name": "退回重新确认"
         }
-        no_return_common_service("/f/task/update/", param, function(data) {
+        no_return_common_service("/q/task/update/", param, function(data) {
             layer.msg("退回成功", {
                 time: 2000 //20s后自动关闭
             });
@@ -550,7 +550,7 @@
             "check_status": 13,
             "check_status_name": "退回"
         }
-        no_return_common_service("/f/task/update/", param, function(data) {
+        no_return_common_service("/q/task/update/", param, function(data) {
             layer.msg("退回成功", {
                 time: 2000 //20s后自动关闭
             });

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

@@ -0,0 +1,161 @@
+package com.xintong.visualinspection.controller.gettway;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.*;
+import com.xintong.visualinspection.controller.BaseController;
+import com.xintong.visualinspection.service.*;
+import com.xintong.visualinspection.util.AuthorUtil;
+import com.xintong.visualinspection.util.Constants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 文件名：CheckItemController
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@RestController
+@RequestMapping("/q/checkAppeal")
+public class CheckAppealController_Q extends BaseController {
+
+
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CheckAppealService_Q checkAppealService;
+
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private TaskService_Q taskService;
+
+    /**
+     * 添加考核项
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/add")
+    public String add(HttpServletRequest request,@Valid @RequestBody CheckAppeal_F checkAppeal){
+//    	CheckAppeal ca = checkAppealService.getByTaskId(checkAppeal.getTask_id());
+//		if(ca!=null) {
+//			throw new BusinessException(21201);
+//		}
+        CheckAppeal_F ca = checkAppealService.getByTaskId(checkAppeal.getTask_id());
+        if(ca==null){
+            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()));
+            }
+            checkAppealService.insert(checkAppeal);
+            QzdCheckTask task = new QzdCheckTask();
+            task.setId(checkAppeal.getTask_id().intValue());
+            task = taskService.getTask(task);
+            task.setCheck_status(checkAppeal.getCheck_status());
+            task.setUpdate_user(new Long(u.getId()));
+            taskService.updateStatus(task);
+            return super.returnSuccessResult("添加成功");
+        }else{
+            throw new BusinessException(21401);
+        }
+    }
+
+    /**
+     * 修改考核项
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/update")
+    public String update(@Valid @RequestBody CheckAppeal_F checkAppeal){
+        checkAppealService.update(checkAppeal);
+        CheckAppeal_F ca = checkAppealService.getById(checkAppeal.getId());
+        return super.returnSuccessResult("修改成功",ca);
+    }
+
+    /**
+     * 删除考核项
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/delete")
+    public String delete(@RequestBody CheckAppeal_F checkAppeal){
+        checkAppealService.delete(checkAppeal.getId());
+        return super.returnSuccessResult("删除成功");
+    }
+
+    /**
+     * 根据id获取考核项数据
+     * @param checkAppeal
+     * @return
+     */
+    @RequestMapping(value = "/getById")
+    public String getById(@RequestBody CheckAppeal_F checkAppeal){
+        if(checkAppeal.getId()==null){
+            throw new BusinessException(20101);
+        }
+        CheckAppeal_F checkItemOne =  checkAppealService.getById(checkAppeal.getId()) ;
+        return super.returnSuccessResult(checkItemOne);
+    }
+
+    /**
+     * 根据taskid获取申诉数据
+     * @param checkAppeal
+     * @return
+     */
+    @RequestMapping(value = "/getByTaskId")
+    public String getByTaskId(@RequestBody CheckAppeal_F checkAppeal){
+        if(checkAppeal.getTask_id()==null){
+            throw new BusinessException(20002);
+        }
+        CheckAppeal_F checkItemOne =  checkAppealService.getByTaskId(checkAppeal.getTask_id()) ;
+        return super.returnSuccessResult(checkItemOne);
+    }
+
+    @RequestMapping(value = "/getList/{page}/{size}")
+    public String getList(@RequestBody CheckAppeal_F param ,@PathVariable Integer page,@PathVariable Integer size){
+        PageHelper.startPage(page, size);
+        param.setCode_flag("task_status");
+        List<CheckAppeal_F> checkAppeal =  checkAppealService.getList(param) ;
+        return super.returnSuccessResult(new PageInfo(checkAppeal));
+    }
+
+    /**
+     * 通过多条件获取考核任务
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getTaskList/{page}/{size}")
+    public String getTaskList(HttpServletRequest request, @PathVariable Integer page,@PathVariable Integer size, @RequestBody QzdCheckTask task){
+        PageHelper.startPage(page, size);
+        User user = getCurrentUser(request);
+        if(AuthorUtil.hasRole(user, Constants.ROLE_FWQ_ADMIN)
+                ||AuthorUtil.hasRole(user, Constants.ROLE_FWQ)
+                ||AuthorUtil.containsRole(user, "ROLE_FWQ")){
+            task.setChecked_dept((long)user.getOrganid());
+        }else if(AuthorUtil.hasRole(user, Constants.ROLE_JICHA)){
+            task.setRecheckman(new Long(user.getId()));
+        }
+        Object  taskList =  taskService.getAllTask(page,size,task);
+        if(taskList==null) return super.returnSuccessResult(new PageInfo(new ArrayList()));
+        return super.returnSuccessResult(taskList);
+    }
+}

Visuallnspection_fjq/visuallnspectioninteface/install.bat

@@ -1,4 +1,4 @@
 @echo off
 java -version
-mvn clean deploy;
+mvn clean deploy
 #mvn clean package && mvn install:install-file -Dfile="D:\VisualInspection\Visuallnspection_fjq\visuallnspectioninteface\target\visuallnspectioninteface-1.0-SNAPSHOT.jar" -DgroupId=com.xintong.visuallnspection.inteface -DartifactId=visuallnspectioninteface -Dversion=1.0 -Dpackaging=jar

Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties

@@ -1,6 +1,5 @@
 #Generated by Maven
-#Sat Aug 11 15:17:02 GMT+08:00 2018
-#Sat Aug 11 16:35:06 CST 2018
+#Sat Aug 11 17:23:59 GMT+08:00 2018
 version=1.0-SNAPSHOT
 groupId=com.xintong.visuallnspection.inteface
 artifactId=visuallnspectioninteface

Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,52 +1,54 @@
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ConstantService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/User.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckAppealService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CheckAppeal_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/RecordService_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckOther.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/DateUtil.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqStatisticsBean.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqStatisticsBo.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/TaskData_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/WreckerGroup.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/AuthorUtil.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Job.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/FwqStatisiticPojo.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ThreadTaskService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/AreaInfoService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CustomJsonDateDeserializer.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CheckApply_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Organ.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Item.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/DepartmentService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdCheckTask.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/AreaInfo.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/qzd/TaskDate_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/UserService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/TaskService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckOtherStatistics.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/JobService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CodeUtil.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqScore.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/FwqRankingData.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CommonService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CheckTaskPeriod.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckOtherService_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/TaskService_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/ServiceAreaStatistic.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdRecord.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ScoreService_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqDeptStatistic.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Role.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckApplyService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/TaskStatus.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/Constants.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ScoreService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/CheckAreaData.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/StatisticsService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CacheUtil.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ItemService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Constant.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FeeStation.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckOtherService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckAppealService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\ServiceAreaStatistic.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\AreaInfoService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckApplyService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\User.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\ScoreService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\UserService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Role.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqCheckOther.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\CodeUtil.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqScore.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqCheckTask.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckApplyService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\Constants.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\QzdCheckTask.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckAppealService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\FwqRankingData.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\ItemService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\CheckApply_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckOtherService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FeeStation.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Item.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\StatisticsService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Organ.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\RecordService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\JobService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CommonService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckOtherService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\DepartmentService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\ThreadTaskService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqCheckOtherStatistics.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\WreckerGroup.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\CheckAreaData.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\AuthorUtil.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\TaskService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\TaskStatus.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Job.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqStatisticsBo.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\TaskService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\AreaInfo.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\DateUtil.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqDeptStatistic.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\CacheUtil.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\CheckAppeal_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\CustomJsonDateDeserializer.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\QzdRecord.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\qzd\TaskDate_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqStatisticsBean.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\ScoreService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\TaskData_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\CheckTaskPeriod.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\FwqStatisiticPojo.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\ConstantService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Constant.java

Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst.rej

@@ -1,6 +0,0 @@
-diff a/Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst	(rejected hunks)
-@@ -2,3 +3,4 @@
-+<<<<<<< HEAD
- D:\�غ�����\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckAppealService_F.java
- D:\�غ�����\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\ServiceAreaStatistic.java
- D:\�غ�����\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\AreaInfoService_F.java