Главная Обзор Помощь
Регистрация Вход
wenhongquan
/
VisualInspection
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

清障队bugfix

温红权 7 лет назад
Родитель
ecc919154b
Сommit
917ae30839
34 измененных файлов с 202 добавлено и 259 удалено
Разделённый вид Показать статистику Diff
  1. BIN
      .DS_Store
  2. 1 1
      VisualInspection/fwq/js/task/task_list.js
  3. 92 44
      VisualInspection/view/home.html
  4. 1 1
      VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java
  5. 3 1
      VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/DepartmentServiceImpl.java
  6. 3 64
      VisualInspection_server/visual/visual.log
  7. 1 1
      Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/DepartmentService.java
  8. 3 6
      Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CacheUtil.java
  9. 1 1
      Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties
  10. 14 12
      Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  11. 19 17
      Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  12. 0 16
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqAreaDao.java
  13. 0 22
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqTaskDao.java
  14. 2 2
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/QzdCheckDeptStatisticsDao.java
  15. 2 2
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/QzdCheckOtherDao.java
  16. 2 2
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/QzdStatisticsDao.java
  17. 1 1
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CheckDeptStatisticsMapper.xml
  18. 1 1
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CheckOtherMapper.xml
  19. 1 1
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/StatisticsMapper.xml
  20. 9 9
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CheckOtherServiceImpl.java
  21. 4 4
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CheckOtherService_FImpl.java
  22. 0 7
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/RecordServiceImpl.java
  23. 23 23
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/StatisticsServiceImpl.java
  24. 9 9
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/StatisticsService_FImpl.java
  25. 3 3
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/ThreadTaskServiceImpl.java
  26. 1 1
      Visuallnspection_qzd/src/main/resources/application.properties
  27. 1 1
      Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqCheckDeptStatisticsDao.java
  28. 1 1
      Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqCheckOtherDao.java
  29. 1 1
      Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqStatisticsDao.java
  30. 1 1
      Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CheckDeptStatisticsMapper.xml
  31. 1 1
      Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CheckOtherMapper.xml
  32. 1 1
      Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/StatisticsMapper.xml
  33. 0 1
      Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/RecordServiceImpl.java
  34. 0 1
      Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/TaskServiceImpl.java

BIN
.DS_Store
Просмотреть файл


+ 1 - 1
VisualInspection/fwq/js/task/task_list.js
Просмотреть файл 

@@ -39,7 +39,7 @@ function initQueryParams() {
 
         checked_dept = store_params.checked_dept;
 
 
         // $("#start_time").val(store_params.end_time.substr(0, 7));
 
-        $("#start_time").val(store_params.start_time.substr(0, 11));
 
+        $("#start_time").val(moment(store_params.start_time).add(1, "d").format("YYYY-MM-DD"));
 
         $("#end_time").val(store_params.end_time.substr(0, 11));
 
         $("#hasScoreList").val(store_params.hasScore);
 
         cur_page = store_params.currentpage;

+ 92 - 44
VisualInspection/view/home.html
Просмотреть файл 

@@ -4,70 +4,94 @@
 
 <head>
 
     <meta charset="utf-8">
 
     <title>稽查</title>
 
-       
-    
+
 
+
 
     <link rel="import" href="/view/common/commoncsslink.html?__inline">
 
     <link rel="stylesheet" type="text/css" href="/css/main.css">
 
     <link rel="import" href="/view/common/commonscriptlink.html?__inline">
 
     <!--<link rel="stylesheet" type="text/css" href="/js/lib/jedate/skin/jedate.css">
 
     <script src="/js/lib/jedate/jedate.js"></script>-->
 
     <style>
 
-        html{overflow:auto;}
 
-        img.lightbox-img{width:600px;}
 
+        html {
 
+            overflow: auto;
 
+        }
 
+        
+        img.lightbox-img {
 
+            width: 600px;
 
+        }
 
+        
         .navbar-inverse {
 
             background-color: #366ca5;
 
         }
 
-        .file-list,.uploader-files {
 
-            border:0px;
 
+        
+        .file-list,
 
+        .uploader-files {
 
+            border: 0px;
 
         }
 
-        html{
 
-           overflow:hidden
 
+        
+        html {
 
+            overflow: hidden
 
         }
 
-        body{
 
-           font-family:'Microsoft Yahei';
 
-           overflow:hidden
 
+        
+        body {
 
+            font-family: 'Microsoft Yahei';
 
+            overflow: hidden
 
         }
 
         /*.mum_left {
 
             background-color: #2B7EB3;
 
         }*/
 
-        .colorbackground1{
 
-            background: linear-gradient(to right, #D99182 , #FF5C56);
 
+        
+        .colorbackground1 {
 
+            background: linear-gradient(to right, #D99182, #FF5C56);
 
+            height: 100%;
 
+            color: white;
 
+            font-size: 30px;
 
+            padding-top: 20%
 
+        }
 
+        
+        .colorbackground2 {
 
+            background: linear-gradient(to right, #50BFF7, #5E99E5);
 
             height: 100%;
 
-            color:white;
 
+            color: white;
 
             font-size: 30px;
 
             padding-top: 20%
 
         }
 
-        .colorbackground2{
 
-            background: linear-gradient(to right, #50BFF7 , #5E99E5);
 
+        
+        .colorbackground3 {
 
+            background: linear-gradient(to right, #ABF0D3, #2EA98C);
 
             height: 100%;
 
-            color:white;
 
+            color: white;
 
             font-size: 30px;
 
             padding-top: 20%
 
         }
 
-        .colorbackground3{
 
-            background: linear-gradient(to right, #ABF0D3 , #2EA98C);
 
+        
+        .colorbackground0 {
 
+            background: linear-gradient(to right, #5E8579, #2E68AA);
 
             height: 100%;
 
-            color:white;
 
+            color: white;
 
             font-size: 30px;
 
             padding-top: 20%
 
         }
 
-        .colorbackground4{
 
+        
+        .colorbackground4 {
 
             background-color: gray;
 
             height: 100%;
 
-            color:white;
 
+            color: white;
 
             font-size: 30px;
 
             padding-top: 20%
 
         }
 
-        .imgsize{
 
-            width:25%;
 
-            margin-left:40px;
 
+        
+        .imgsize {
 
+            width: 25%;
 
+            margin-left: 40px;
 
             margin-right: 10px
 
         }
 
-        .appdiv{
 
-            height:45%;
 
-            width:30%;
 
+        
+        .appdiv {
 
+            height: 45%;
 
+            width: 30%;
 
             position: absolute;
 
-            cursor:pointer
 
+            cursor: pointer
 
         }
 
     </style>
 
     <script src="/js/mytask/check.js"></script>
 
@@ -82,26 +106,50 @@
 
 
 
     <div id="main" class="container-fluid main">
 
-                <div id="mum_right" class="mum_right" style="width: 100%;">
 
+        <div id="mum_right" class="mum_right" style="width: 100%;">
 
 
-                    <div class="panel" id="main_panel">
 
-                        <div class="panel-body"  id="main_panel_body" style="position: relative;">
 
-                            <div id="main_content" style="position: absolute;top: 10%;left: 10%;width: 80%;height: 80%">
 
-                                        <div onclick="opennew(1,null)" class="appdiv" style="text-align: center;top: 0;left:0;height: 40%"><div class="colorbackground1" ><p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/service.png"></img><span>服务区稽查</span></p></div></div>
 
-                                        <div onclick="opennew(0,null)" class="appdiv" style="text-align: center;top:0;left:35%;height: 40%"><div class="colorbackground2" ><p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/plan.png"></img><span>收费站稽查</span></p></div></div>
 
-                                        <div onclick="" class="appdiv" style="text-align: center;top:0;right: 0;height: 40%"><div class="colorbackground4" ><p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/repair.png"></img><span>清障队稽查</span></p></div></div>
 
-                                <!-- <div class="row" id="" style="margin-top: 50px"> -->
 
-                                        <div onclick="" class="appdiv" style="text-align: center;bottom: 6%;left: 0;height: 40%"><div class="colorbackground4" ><p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/car.png"></img><span>车队稽查</span></p></div></div>
 
-                                        <div onclick="" class="appdiv" style="text-align: center;bottom: 6%;left:35%;height: 40%"><div class="colorbackground4" ><p style="margin-right:40px;font-size:28px"><img  class="imgsize" src="/images/area-chart.png"></img><span>统计分析</span></p></div></div>
 
-                                        <div onclick="opennew(0,'14')" class="appdiv" style="text-align: center;bottom: 6%;right: 0;height: 40%"><div class="colorbackground3"><p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/wood.png"></img><span>配置管理</span></p></div></div>
 
-                                <!-- </div>          -->
 
+            <div class="panel" id="main_panel">
 
+                <div class="panel-body" id="main_panel_body" style="position: relative;">
 
+                    <div id="main_content" style="position: absolute;top: 10%;left: 10%;width: 80%;height: 80%">
 
+                        <div onclick="opennew(1,null)" class="appdiv" style="text-align: center;top: 0;left:0;height: 40%">
 
+                            <div class="colorbackground1">
 
+                                <p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/service.png"></img><span>服务区稽查</span></p>
 
+                            </div>
 
+                        </div>
 
+                        <div onclick="opennew(0,null)" class="appdiv" style="text-align: center;top:0;left:35%;height: 40%">
 
+                            <div class="colorbackground2">
 
+                                <p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/plan.png"></img><span>收费站稽查</span></p>
 
                             </div>
 
-                            <!--<link rel="import" href="/view/mytask/unchecked.html?__inline">-->
 
                         </div>
 
+                        <div onclick="opennew(2,null)" class="appdiv" style="text-align: center;top:0;right: 0;height: 40%">
 
+                            <div class="colorbackground0">
 
+                                <p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/repair.png"></img><span>清障队稽查</span></p>
 
+                            </div>
 
+                        </div>
 
+                        <!-- <div class="row" id="" style="margin-top: 50px"> -->
 
+                        <div onclick="" class="appdiv" style="text-align: center;bottom: 6%;left: 0;height: 40%">
 
+                            <div class="colorbackground4">
 
+                                <p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/car.png"></img><span>车队稽查</span></p>
 
+                            </div>
 
+                        </div>
 
+                        <div onclick="" class="appdiv" style="text-align: center;bottom: 6%;left:35%;height: 40%">
 
+                            <div class="colorbackground4">
 
+                                <p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/area-chart.png"></img><span>统计分析</span></p>
 
+                            </div>
 
+                        </div>
 
+                        <div onclick="opennew(0,'14')" class="appdiv" style="text-align: center;bottom: 6%;right: 0;height: 40%">
 
+                            <div class="colorbackground3">
 
+                                <p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/wood.png"></img><span>配置管理</span></p>
 
+                            </div>
 
+                        </div>
 
+                        <!-- </div>          -->
 
                     </div>
 
-
 
-                    <link rel="import" href="/view/common/foot.html?__inline">  
+                    <!--<link rel="import" href="/view/mytask/unchecked.html?__inline">-->
 
                 </div>
 
+            </div>
 
+
 
+            <link rel="import" href="/view/common/foot.html?__inline">
 
+        </div>
 
     </div>
 
 
     <script src="/js/new.js"></script>

+ 1 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java
Просмотреть файл 

@@ -23,7 +23,7 @@ public interface DepartmentDao  {
 
     public void delete(Integer id);
 
     public List<FeeStation> getAllFS();
 
     public List<FeeStation> getAllRM();
 
-    public List<WreckerGroup> getAllWG();
 
+    public List<FeeStation> getAllWG();
 
     public List<FeeStation> getAllSA();
 
     public FeeStation getFsBydeptId(Integer id);

+ 3 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/DepartmentServiceImpl.java
Просмотреть файл 

@@ -154,9 +154,11 @@ public class DepartmentServiceImpl extends BaseService implements DepartmentServ
 
 	}
 
 
 	@Override
 
-	public List<WreckerGroup> getAllWG() {
 
+	public List<FeeStation> getAllWG() {
 
 		// TODO Auto-generated method stub
 
 		return departmentDao.getAllWG();
 
 	}
 
 
+
 
+
 
 }

Разница между файлами не показана из-за своего большого размера
+ 3 - 64
VisualInspection_server/visual/visual.log


+ 1 - 1
Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/DepartmentService.java
Просмотреть файл 

@@ -25,7 +25,7 @@ public interface DepartmentService {
 
 	
 	public List<FeeStation> getAllRM();
 
 	
-	public List<WreckerGroup> getAllWG();
 
+	public List<FeeStation> getAllWG();
 
 
     public List<FeeStation> getAllSA();

+ 3 - 6
Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CacheUtil.java
Просмотреть файл 

@@ -1,11 +1,6 @@
 
 package com.xintong.visualinspection.util;
 
 
-import com.xintong.visualinspection.bean.Constant;
 
-import com.xintong.visualinspection.bean.FeeStation;
 
-import com.xintong.visualinspection.bean.Item;
 
-import com.xintong.visualinspection.bean.Job;
 
-import com.xintong.visualinspection.bean.Organ;
 
-import com.xintong.visualinspection.bean.User;
 
+import com.xintong.visualinspection.bean.*;
 
 import com.xintong.visualinspection.service.ConstantService;
 
 import com.xintong.visualinspection.service.DepartmentService;
 
 import com.xintong.visualinspection.service.ItemService;
 
@@ -108,8 +103,10 @@ public class CacheUtil {
 
     public static void refreshSAList(DepartmentService deptService) {
 
         List<FeeStation> saList = deptService.getAllSA();
 
         List<FeeStation> rmList = deptService.getAllRM();
 
+        List<FeeStation> wgList = deptService.getAllWG();
 
         CacheUtil.allDeptMap.put("SA", saList);
 
         CacheUtil.allDeptMap.put("RM", rmList);
 
+        CacheUtil.allDeptMap.put("WG", wgList);
 
         logger.info(CacheUtil.allDeptMap.toString());
 
         logger.info("加载所有服务区,道管信息成功,数据list数:{}", CacheUtil.allDeptMap.size());
 
     }

+ 1 - 1
Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties
Просмотреть файл 

@@ -1,5 +1,5 @@
 
 #Generated by Maven
 
-#Fri Aug 03 17:30:18 CST 2018
 
+#Thu Aug 09 14:20:45 CST 2018
 
 version=1.0-SNAPSHOT
 
 groupId=com.xintong.visuallnspection.inteface
 
 artifactId=visuallnspectioninteface

+ 14 - 12
Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
Просмотреть файл 

@@ -1,4 +1,3 @@
 
-com/xintong/visualinspection/service/CommonService.class
 
 com/xintong/visualinspection/pojo/fwq/TaskData_F.class
 
 com/xintong/visualinspection/bean/CheckApply_F.class
 
 com/xintong/visualinspection/bean/CheckAppeal_F.class
 
@@ -6,40 +5,43 @@ com/xintong/visualinspection/bean/Organ.class
 
 com/xintong/visualinspection/bean/FwqScore.class
 
 com/xintong/visualinspection/service/CheckAppealService_F.class
 
 com/xintong/visualinspection/service/CheckOtherService_F.class
 
-com/xintong/visualinspection/bean/FwqCheckOtherStatistics.class
 
 com/xintong/visualinspection/bean/FeeStation.class
 
-com/xintong/visualinspection/bean/User.class
 
-com/xintong/visualinspection/service/StatisticsService_F.class
 
-com/xintong/visualinspection/pojo/fwq/CheckAreaData.class
 
+com/xintong/visualinspection/pojo/qzd/TaskDate_Q.class
 
 com/xintong/visualinspection/bean/Constant.class
 
-com/xintong/visualinspection/bean/FwqCheckOther.class
 
 com/xintong/visualinspection/pojo/fwq/FwqRankingData.class
 
-com/xintong/visualinspection/service/TaskService_F.class
 
 com/xintong/visualinspection/bean/QzdCheckTask.class
 
-com/xintong/visualinspection/service/RecordService_Q.class
 
 com/xintong/visualinspection/service/JobService.class
 
 com/xintong/visualinspection/bean/Job.class
 
 com/xintong/visualinspection/bean/WreckerGroup.class
 
-com/xintong/visualinspection/service/ThreadTaskService_F.class
 
 com/xintong/visualinspection/util/DateUtil.class
 
-com/xintong/visualinspection/util/CacheUtil.class
 
 com/xintong/visualinspection/bean/FwqStatisticsBean.class
 
 com/xintong/visualinspection/bean/Item.class
 
 com/xintong/visualinspection/service/ScoreService_F.class
 
-com/xintong/visualinspection/bean/Role.class
 
 com/xintong/visualinspection/service/AreaInfoService_F.class
 
 com/xintong/visualinspection/bean/CheckTaskPeriod.class
 
 com/xintong/visualinspection/service/UserService.class
 
 com/xintong/visualinspection/bean/QzdRecord.class
 
 com/xintong/visualinspection/service/ItemService.class
 
 com/xintong/visualinspection/pojo/fwq/ServiceAreaStatistic.class
 
+com/xintong/visualinspection/util/AuthorUtil.class
 
+com/xintong/visualinspection/service/CommonService.class
 
+com/xintong/visualinspection/service/TaskService_Q.class
 
+com/xintong/visualinspection/bean/FwqCheckOtherStatistics.class
 
+com/xintong/visualinspection/bean/User.class
 
+com/xintong/visualinspection/service/StatisticsService_F.class
 
+com/xintong/visualinspection/pojo/fwq/CheckAreaData.class
 
+com/xintong/visualinspection/bean/FwqCheckOther.class
 
+com/xintong/visualinspection/service/TaskService_F.class
 
+com/xintong/visualinspection/service/RecordService_Q.class
 
+com/xintong/visualinspection/service/ThreadTaskService_F.class
 
+com/xintong/visualinspection/util/CacheUtil.class
 
+com/xintong/visualinspection/bean/Role.class
 
 com/xintong/visualinspection/pojo/fwq/FwqStatisiticPojo.class
 
 com/xintong/visualinspection/bean/FwqStatisticsBo.class
 
 com/xintong/visualinspection/bean/AreaInfo.class
 
 com/xintong/visualinspection/util/Constants.class
 
 com/xintong/visualinspection/service/DepartmentService.class
 
 com/xintong/visualinspection/util/CodeUtil.class
 
-com/xintong/visualinspection/util/AuthorUtil.class
 
 com/xintong/visualinspection/bean/TaskStatus.class
 
 com/xintong/visualinspection/bean/FwqCheckTask.class
 
 com/xintong/visualinspection/util/CustomJsonDateDeserializer.class

+ 19 - 17
Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
Просмотреть файл 

@@ -1,16 +1,11 @@
 
-/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/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/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/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/CheckTaskPeriod.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
 
@@ -18,31 +13,38 @@
 
 /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/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/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/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/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/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/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/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/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/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/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/JobService.java
 
 /Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckOtherService_F.java

+ 0 - 16
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqAreaDao.java
Просмотреть файл 

@@ -1,16 +0,0 @@
 
-package com.xintong.visualinspection.visuallnspection_qzd.dao;
 
-
 
-import com.xintong.visualinspection.bean.AreaInfo;
 
-import org.apache.ibatis.annotations.Mapper;
 
-
 
-import java.util.List;
 
-
 
-/**
 
- * 文件名：FwqAreaDao
 
- * 版本信息：日期：2018/5/7 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
 
- */
 
-@Mapper
 
-public interface FwqAreaDao {
 
-    public List<AreaInfo> getall(AreaInfo areaInfo);
 
-
 
-}

+ 0 - 22
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqTaskDao.java
Просмотреть файл 

@@ -1,22 +0,0 @@
 
-package com.xintong.visualinspection.visuallnspection_qzd.dao;
 
-
 
-import com.xintong.visualinspection.bean.FwqCheckTask;
 
-import com.xintong.visualinspection.bean.TaskStatus;
 
-import org.apache.ibatis.annotations.Mapper;
 
-
 
-import java.util.List;
 
-
 
-/**
 
- * 文件名：FwqTaskDao
 
- * 版本信息：日期：2018/4/11 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
 
- */
 
-@Mapper
 
-public interface FwqTaskDao {
 
-    public void addtask(FwqCheckTask fwqCheckTask);
 
-    public List<FwqCheckTask> getall(FwqCheckTask fwqCheckTask);
 
-    public void updateStatus(FwqCheckTask fwqCheckTask);
 
-    public FwqCheckTask getone(FwqCheckTask fwqCheckTask);
 
-    public void insertStatus(TaskStatus taskStatus);
 
-    public void insertStatusBatch(List<TaskStatus> taskStatusList);
 
-    public List<TaskStatus> getTaskStatusList(Long id);
 
-}

+ 2 - 2
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqCheckDeptStatisticsDao.java → Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/QzdCheckDeptStatisticsDao.java
Просмотреть файл 

@@ -6,11 +6,11 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 
 /**
 
- * 文件名：FwqCheckDeptStatisticsDao
 
+ * 文件名：QzdCheckDeptStatisticsDao
 
  * 版本信息：日期：2018/5/2 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
 
  */
 
 @Mapper
 
-public interface FwqCheckDeptStatisticsDao {
 
+public interface QzdCheckDeptStatisticsDao {
 
     void saveandupdate(FwqDeptStatistic ss);
 
 
     List<FwqDeptStatistic> selectdepts(FwqDeptStatistic obj);

+ 2 - 2
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqCheckOtherDao.java → Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/QzdCheckOtherDao.java
Просмотреть файл 

@@ -6,11 +6,11 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 
 /**
 
- * 文件名：FwqCheckOtherDao
 
+ * 文件名：QzdCheckOtherDao
 
  * 版本信息：日期：2018/5/2 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
 
  */
 
 @Mapper
 
-public interface FwqCheckOtherDao {
 
+public interface QzdCheckOtherDao {
 
     List<FwqCheckOther> getAllCheckOther(FwqCheckOther fwqCheckOther);
 
 
     void addCheckOther(FwqCheckOther fwqOtherCheck);

+ 2 - 2
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqStatisticsDao.java → Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/QzdStatisticsDao.java
Просмотреть файл 

@@ -7,11 +7,11 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 
 /**
 
- * 文件名：FwqCheckOtherDao
 
+ * 文件名：QzdCheckOtherDao
 
  * 版本信息：日期：2018/5/2 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
 
  */
 
 @Mapper
 
-public interface FwqStatisticsDao {
 
+public interface QzdStatisticsDao {
 
     List<FwqStatisticsBean> getselectFeeStationOperationScoreDetail(FwqStatisticsBean obj);
 
 
     List<FwqStatisticsBean> selectFeeStationCheckNum(FwqStatisticsBean obj);

+ 1 - 1
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CheckDeptStatisticsMapper.xml
Просмотреть файл 

@@ -1,6 +1,6 @@
 
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.FwqCheckDeptStatisticsDao">
 
+<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckDeptStatisticsDao">
 
 
     <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.FwqDeptStatistic">
 
         <id column="id" property="id" jdbcType="INTEGER"/>

+ 1 - 1
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CheckOtherMapper.xml
Просмотреть файл 

@@ -1,6 +1,6 @@
 
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.FwqCheckOtherDao">
 
+<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckOtherDao">
 
 
     <select id="getAllCheckOther" parameterType="com.xintong.visualinspection.bean.FwqCheckOther" resultType="com.xintong.visualinspection.bean.FwqCheckOther">
 
         SELECT *

+ 1 - 1
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/StatisticsMapper.xml
Просмотреть файл 

@@ -1,6 +1,6 @@
 
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.FwqStatisticsDao">
 
+<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.QzdStatisticsDao">
 
 
     <select id="getselectFeeStationOperationScoreDetail"
 
             parameterType="com.xintong.visualinspection.bean.FwqStatisticsBean"

+ 9 - 9
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CheckOtherServiceImpl.java
Просмотреть файл 

@@ -11,7 +11,7 @@ import com.xintong.visualinspection.bean.Item;
 
 import com.xintong.visualinspection.bean.Organ;
 
 import com.xintong.visualinspection.service.CheckOtherService_F;
 
 import com.xintong.visualinspection.service.CommonService;
 
-import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqCheckOtherDao;
 
+import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckOtherDao;
 
 import org.slf4j.Logger;
 
 import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -40,7 +40,7 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
 
     private static final Logger logger = LoggerFactory.getLogger(CheckOtherServiceImpl.class);
 
 
     @Autowired
 
-    private FwqCheckOtherDao fwqCheckOtherDao;
 
+    private QzdCheckOtherDao qzdCheckOtherDao;
 
 
     @Reference(version = "1.0.0",
 
             application = "${dubbo.application.id}",
 
@@ -60,7 +60,7 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
 
         if (!(page.equals(0) && size.equals(0))) {
 
             PageHelper.startPage(page, size);
 
         }
 
-        List<FwqCheckOther> checkOtherList = fwqCheckOtherDao.getAllCheckOther(fwqCheckOther == null ? new FwqCheckOther() : fwqCheckOther);
 
+        List<FwqCheckOther> checkOtherList = qzdCheckOtherDao.getAllCheckOther(fwqCheckOther == null ? new FwqCheckOther() : fwqCheckOther);
 
         Map<Long, Organ> deptMap = commonService.getDeptMap();
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
         Map<String, Constant> codeMap = commonService.getCodeMap();
 
@@ -99,7 +99,7 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
 
      */
 
     private Object getAllCheckOther(FwqCheckOther fwqCheckOther) {
 
 
-        List<FwqCheckOther> checkOtherList = fwqCheckOtherDao.getAllCheckOther(fwqCheckOther == null ? new FwqCheckOther() : fwqCheckOther);
 
+        List<FwqCheckOther> checkOtherList = qzdCheckOtherDao.getAllCheckOther(fwqCheckOther == null ? new FwqCheckOther() : fwqCheckOther);
 
         Map<Long, Organ> deptMap = commonService.getDeptMap();
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
         Map<String, Constant> codeMap = commonService.getCodeMap();
 
@@ -134,22 +134,22 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
 
      */
 
     @Override
 
     public void addCheckOther(FwqCheckOther fwqOtherCheck) {
 
-        fwqCheckOtherDao.addCheckOther(fwqOtherCheck);
 
+        qzdCheckOtherDao.addCheckOther(fwqOtherCheck);
 
     }
 
 
     @Override
 
     public void deleteCheckOther(Long id) {
 
-        fwqCheckOtherDao.deleteCheckOther(id);
 
+        qzdCheckOtherDao.deleteCheckOther(id);
 
     }
 
 
     @Override
 
     public void updateCheckOther(FwqCheckOther fwqCheckOther) {
 
-        fwqCheckOtherDao.updateCheckOther(fwqCheckOther);
 
+        qzdCheckOtherDao.updateCheckOther(fwqCheckOther);
 
     }
 
 
     @Override
 
     public FwqCheckOther selectCheckById(Long id) {
 
-        FwqCheckOther fwqCheckOther = fwqCheckOtherDao.selectCheckById(id);
 
+        FwqCheckOther fwqCheckOther = qzdCheckOtherDao.selectCheckById(id);
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
         fwqCheckOther.setCheck_item_name(itemMap.get(fwqCheckOther.getCheck_item_id()).getName());
 
         return fwqCheckOther;
 
@@ -168,7 +168,7 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
 
         List<FwqCheckOtherStatistics> fwqCheckOtherStatisticses = new ArrayList<>();
 
 
         fwqCheckOther.setCheck_time_name(fwqCheckOther.getCheck_period());
 
-        List<FwqCheckOther> checkOtherList = fwqCheckOtherDao.getAllCheckOther(fwqCheckOther);
 
+        List<FwqCheckOther> checkOtherList = qzdCheckOtherDao.getAllCheckOther(fwqCheckOther);
 
         Map<Long, Organ> deptMap = commonService.getDeptMap();
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
         Map<String, Constant> codeMap = commonService.getCodeMap();

+ 4 - 4
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CheckOtherService_FImpl.java
Просмотреть файл 

@@ -9,7 +9,7 @@ import com.xintong.visualinspection.bean.Item;
 
 import com.xintong.visualinspection.bean.Organ;
 
 import com.xintong.visualinspection.service.CommonService;
 
 import com.xintong.visualinspection.util.DateUtil;
 
-import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqCheckOtherDao;
 
+import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckOtherDao;
 
 import com.xintong.visualinspection.visuallnspection_qzd.service.CheckOtherService_F;
 
 import org.jxls.common.Context;
 
 import org.jxls.util.JxlsHelper;
 
@@ -45,7 +45,7 @@ public class CheckOtherService_FImpl implements CheckOtherService_F {
 
     private static final Logger logger = LoggerFactory.getLogger(CheckOtherService_FImpl.class);
 
 
     @Autowired
 
-    private FwqCheckOtherDao fwqCheckOtherDao;
 
+    private QzdCheckOtherDao qzdCheckOtherDao;
 
 
     @Reference(version = "1.0.0",
 
             application = "${dubbo.application.id}",
 
@@ -60,7 +60,7 @@ public class CheckOtherService_FImpl implements CheckOtherService_F {
 
      */
 
     private Object getAllCheckOther(FwqCheckOther fwqCheckOther) {
 
 
-        List<FwqCheckOther> checkOtherList = fwqCheckOtherDao.getAllCheckOther(fwqCheckOther == null ? new FwqCheckOther() : fwqCheckOther);
 
+        List<FwqCheckOther> checkOtherList = qzdCheckOtherDao.getAllCheckOther(fwqCheckOther == null ? new FwqCheckOther() : fwqCheckOther);
 
         Map<Long, Organ> deptMap = commonService.getDeptMap();
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
         Map<String, Constant> codeMap = commonService.getCodeMap();
 
@@ -101,7 +101,7 @@ public class CheckOtherService_FImpl implements CheckOtherService_F {
 
         List<FwqCheckOtherStatistics> fwqCheckOtherStatisticses = new ArrayList<>();
 
 
         fwqCheckOther.setCheck_time_name(fwqCheckOther.getCheck_period());
 
-        List<FwqCheckOther> checkOtherList = fwqCheckOtherDao.getAllCheckOther(fwqCheckOther);
 
+        List<FwqCheckOther> checkOtherList = qzdCheckOtherDao.getAllCheckOther(fwqCheckOther);
 
         Map<Long, Organ> deptMap = commonService.getDeptMap();
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
         Map<String, Constant> codeMap = commonService.getCodeMap();

+ 0 - 7
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/RecordServiceImpl.java
Просмотреть файл 

@@ -12,19 +12,12 @@ import com.alibaba.dubbo.config.annotation.Reference;
 
 import com.github.pagehelper.PageHelper;
 
 import com.github.pagehelper.PageInfo;
 
 import com.xintong.visualinspection.bean.*;
 
-import com.xintong.visualinspection.pojo.fwq.CheckAreaData;
 
-import com.xintong.visualinspection.pojo.fwq.TaskData_F;
 
 import com.xintong.visualinspection.service.CommonService;
 
 import com.xintong.visualinspection.service.RecordService_Q;
 
-import com.xintong.visualinspection.service.TaskService_F;
 
-import com.xintong.visualinspection.util.Constants;
 
-import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqTaskDao;
 
 import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdRecordDao;
 
-import org.apache.poi.util.StringUtil;
 
 import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 
-import java.util.ArrayList;
 
 import java.util.List;
 
 import java.util.Map;

+ 23 - 23
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/StatisticsServiceImpl.java
Просмотреть файл 

@@ -15,8 +15,8 @@ import com.xintong.visualinspection.pojo.fwq.FwqStatisiticPojo;
 
 import com.xintong.visualinspection.pojo.fwq.ServiceAreaStatistic;
 
 import com.xintong.visualinspection.service.CommonService;
 
 import com.xintong.visualinspection.service.StatisticsService_F;
 
-import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqCheckDeptStatisticsDao;
 
-import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqStatisticsDao;
 
+import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckDeptStatisticsDao;
 
+import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdStatisticsDao;
 
 import org.slf4j.Logger;
 
 import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -51,9 +51,9 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
     private static final Logger logger = LoggerFactory.getLogger(StatisticsServiceImpl.class);
 
 
     @Autowired
 
-    private FwqStatisticsDao fwqStatisticsDao;
 
+    private QzdStatisticsDao qzdStatisticsDao;
 
     @Autowired
 
-    private FwqCheckDeptStatisticsDao fwqCheckDeptStatisticsDao;
 
+    private QzdCheckDeptStatisticsDao qzdCheckDeptStatisticsDao;
 
 
     @Reference(version = "1.0.0",
 
             application = "${dubbo.application.id}",
 
@@ -77,10 +77,10 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
         List<FwqStatisticsBean> company_beans =  getFeeStationCheckItemScore(obj);
 
         // 获取第三方暗访稽查的某个服务区的受检次数和扣分合计
 
         obj.setCheck_type(8);
 
-        List<FwqStatisticsBean> third_beans = fwqStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
+        List<FwqStatisticsBean> third_beans = qzdStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
         // 获取现场稽查的某个服务区的受检次数和扣分合计
 
         obj.setCheck_type(9);
 
-        List<FwqStatisticsBean> onsite_beans = fwqStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
+        List<FwqStatisticsBean> onsite_beans = qzdStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
 
         for (FwqStatisticsBean company_bean : company_beans) {
 
             mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(company_bean.getChecked_num());
 
@@ -161,7 +161,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
                 ss.setIntegral(sortList.size() - s.getCompany_ranking2() + 1);
 
                 ss.setDept_id(s.getDept_id());
 
                 ss.setPeriod_id(period.getId());
 
-                fwqCheckDeptStatisticsDao.saveandupdate(ss);
 
+                qzdCheckDeptStatisticsDao.saveandupdate(ss);
 
             }
 
         }
 
 
@@ -196,7 +196,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
             obj.setEndperiod_id(checkTaskPeriods.get(checkTaskPeriods.size() - 1).getId());
 
         }
 
 
-        List<FwqDeptStatistic> deptStatistics = fwqCheckDeptStatisticsDao.selectdepts(obj);
 
+        List<FwqDeptStatistic> deptStatistics = qzdCheckDeptStatisticsDao.selectdepts(obj);
 
         Map<String, List<FwqDeptStatistic>> listMap = new HashMap<>();
 
         Map<Long, List<FwqDeptStatistic>> listMap1 = new HashMap<>();
 
         if (deptStatistics.size() > 0) {
 
@@ -394,7 +394,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
         }
 
 
         //服务区检查次数
 
-        List<FwqStatisticsBean> listCheckNum = fwqStatisticsDao.selectFeeStationCheckNum(obj);
 
+        List<FwqStatisticsBean> listCheckNum = qzdStatisticsDao.selectFeeStationCheckNum(obj);
 
         for (FwqStatisticsBean sta : listCheckNum) {
 
             if (mapStationInfos.containsKey(sta.getDept_id())) {
 
                 mapStationInfos.get(sta.getDept_id()).setChecked_num(sta.getChecked_num());
 
@@ -402,7 +402,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
             }
 
         }
 
 
-        List<FwqStatisticsBean> listCheckedScore = fwqStatisticsDao.selectFeeStationCheckedPersonScoreDetail(obj);
 
+        List<FwqStatisticsBean> listCheckedScore = qzdStatisticsDao.selectFeeStationCheckedPersonScoreDetail(obj);
 
 
         // 处理同一个服务区中,如果item的parent_id是一样的话,将这些数据结合在一起
 
         for (FwqStatisticsBean sta : listCheckedScore) {
 
@@ -512,7 +512,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
         if (!(page.equals(0) && size.equals(0))) {
 
             PageHelper.startPage(page, size);
 
         }
 
-        List<FwqStatisticsBean> list = fwqStatisticsDao.selectOneCheckedDetailInfo(obj);
 
+        List<FwqStatisticsBean> list = qzdStatisticsDao.selectOneCheckedDetailInfo(obj);
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
 
         for (FwqStatisticsBean sta : list) {
 
@@ -570,12 +570,12 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
 
     @Override
 
     public List<FwqStatisticsBean> getOneSACheckedInfo(FwqStatisticsBean obj) {
 
-        return fwqStatisticsDao.selectOneCheckedInfoData(obj);
 
+        return qzdStatisticsDao.selectOneCheckedInfoData(obj);
 
     }
 
 
     @Override
 
     public List<FwqStatisticsBean> getOneCheckedItemInfo(FwqStatisticsBean obj) {
 
-        List<FwqStatisticsBean> listCheckedScore = fwqStatisticsDao.selectOneCheckedItemInfo(obj);
 
+        List<FwqStatisticsBean> listCheckedScore = qzdStatisticsDao.selectOneCheckedItemInfo(obj);
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
         // 处理同一个服务区中,如果item的parent_id是一样的话,将这些数据结合在一起
 
         for (FwqStatisticsBean sta : listCheckedScore) {
 
@@ -601,7 +601,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
     public List<FwqStatisticsBo> getEmployeeCheckedInfo(FwqStatisticsBean obj) {
 
 
         // 将检索出来的数据放到如map中
 
-        List<FwqStatisticsBean> list = fwqStatisticsDao.selectStatistics(obj);
 
+        List<FwqStatisticsBean> list = qzdStatisticsDao.selectStatistics(obj);
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
         Map<Long, Organ> deptMap = commonService.getDeptMap();
 
         // 将list中的数据找到项目的父项目,然后去除重复的
 
@@ -618,7 +618,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
         }
 
 
         // 查询服务区受检次数
 
-        List<FwqStatisticsBean> timesList = fwqStatisticsDao.selectCheckedTimes(obj);
 
+        List<FwqStatisticsBean> timesList = qzdStatisticsDao.selectCheckedTimes(obj);
 
 
         Map<Long, FwqStatisticsBo> statisticBoMap = new HashMap<>();
 
 
@@ -755,7 +755,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
 
     @Override
 
     public List<FwqStatisticsBean> getYearScoreChange(FwqStatisticsBean obj) {
 
-        List<FwqStatisticsBean> list = fwqStatisticsDao.selectYearScoreInfo(obj);
 
+        List<FwqStatisticsBean> list = qzdStatisticsDao.selectYearScoreInfo(obj);
 
         return list;
 
 
     }
 
@@ -789,7 +789,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
         }
 
 
         // 检查次数
 
-        List<FwqStatisticsBean> listCheckNum = fwqStatisticsDao.selectFeeStationCheckNum(obj);
 
+        List<FwqStatisticsBean> listCheckNum = qzdStatisticsDao.selectFeeStationCheckNum(obj);
 
         for (FwqStatisticsBean sta : listCheckNum) {
 
             if (mapStationInfos.containsKey(sta.getDept_id())) {
 
                 mapStationInfos.get(sta.getDept_id()).setChecked_num(sta.getChecked_num());
 
@@ -802,7 +802,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
             listmap.put(b.getDept_id().intValue(), b);
 
         }
 
 
-        List<FwqStatisticsBean> listCheckedScore = fwqStatisticsDao.selectFeeStationCheckedScore(obj);
 
+        List<FwqStatisticsBean> listCheckedScore = qzdStatisticsDao.selectFeeStationCheckedScore(obj);
 
         for (FwqStatisticsBean sta : listCheckedScore) {
 
             if (mapStationInfos.containsKey(sta.getDept_id())) {
 
 
@@ -940,7 +940,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
 
     @Override
 
     public List<FwqStatisticsBean> getCheckedItemScoreInfo(FwqStatisticsBean obj) {
 
-        List<FwqStatisticsBean> list = fwqStatisticsDao.selectCheckedItemScoreInfo(obj);
 
+        List<FwqStatisticsBean> list = qzdStatisticsDao.selectCheckedItemScoreInfo(obj);
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
         Map<Long, Organ> deptMap = commonService.getDeptMap();
 
         for (FwqStatisticsBean sta : list) {
 
@@ -965,7 +965,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
     public Map<String, List<FwqStatisticsBean>> get2CheckedItemScoreInfo(FwqStatisticsBean obj) {
 
 
         Map<String, List<FwqStatisticsBean>> map = new HashMap<>();
 
-        List<FwqStatisticsBean> objList = fwqStatisticsDao.selectCheckedItemScoreInfo(obj);
 
+        List<FwqStatisticsBean> objList = qzdStatisticsDao.selectCheckedItemScoreInfo(obj);
 
         Map<Long, Item> itemMap = commonService.getItemMap();
 
         Map<Long, Organ> deptMap = commonService.getDeptMap();
 
         for (FwqStatisticsBean sta : objList) {
 
@@ -987,7 +987,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
 
         map.put("Tmth", objList);
 
         obj.setMth(obj.getPrev_mth());
 
-        objList = fwqStatisticsDao.selectCheckedItemScoreInfo(obj);
 
+        objList = qzdStatisticsDao.selectCheckedItemScoreInfo(obj);
 
 
         for (FwqStatisticsBean sta : objList) {
 
             sta.setItem_id(itemMap.get(sta.getCheck_item_id().longValue()).getParent_id().intValue());
 
@@ -1047,7 +1047,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM");
 
         //获取满足条件的服务区
 
-        List<ServiceAreaStatistic> fwqStatistics = fwqStatisticsDao.selectlimituser(obj);
 
+        List<ServiceAreaStatistic> fwqStatistics = qzdStatisticsDao.selectlimituser(obj);
 
 
         HashMap<Integer, List<ServiceAreaStatistic>> usm = new HashMap<>();
 
 
@@ -1116,7 +1116,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
     }
 
 
     private List<FwqStatisticsBean> reFeeStationScoreInfo(FwqStatisticsBean obj) {
 
-        List<FwqStatisticsBean> scoreList = fwqStatisticsDao.selectFeeStationScoreInfo(obj);
 
+        List<FwqStatisticsBean> scoreList = qzdStatisticsDao.selectFeeStationScoreInfo(obj);
 
         Map<Long, FwqStatisticsBean> feeStationMap = new HashMap<>();
 
 
         for (FwqStatisticsBean feeObj : scoreList) {

+ 9 - 9
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/StatisticsService_FImpl.java
Просмотреть файл 

@@ -8,8 +8,8 @@ import com.xintong.visualinspection.bean.FwqStatisticsBean;
 
 import com.xintong.visualinspection.bean.Item;
 
 import com.xintong.visualinspection.bean.Organ;
 
 import com.xintong.visualinspection.service.CommonService;
 
-import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqCheckDeptStatisticsDao;
 
-import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqStatisticsDao;
 
+import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckDeptStatisticsDao;
 
+import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdStatisticsDao;
 
 import com.xintong.visualinspection.visuallnspection_qzd.service.StatisticsService_F;
 
 import org.jxls.common.Context;
 
 import org.jxls.util.JxlsHelper;
 
@@ -50,9 +50,9 @@ public class StatisticsService_FImpl implements StatisticsService_F {
 
     private static final Logger logger = LoggerFactory.getLogger(StatisticsService_FImpl.class);
 
 
     @Autowired
 
-    private FwqStatisticsDao fwqStatisticsDao;
 
+    private QzdStatisticsDao qzdStatisticsDao;
 
     @Autowired
 
-    private FwqCheckDeptStatisticsDao fwqCheckDeptStatisticsDao;
 
+    private QzdCheckDeptStatisticsDao qzdCheckDeptStatisticsDao;
 
 
     @Reference(version = "1.0.0",
 
             application = "${dubbo.application.id}",
 
@@ -75,10 +75,10 @@ public class StatisticsService_FImpl implements StatisticsService_F {
 
         List<FwqStatisticsBean> company_beans =  getFeeStationCheckItemScore(obj);
 
         // 获取第三方暗访稽查的某个服务区的受检次数和扣分合计
 
         obj.setCheck_type(8);
 
-        List<FwqStatisticsBean> third_beans = fwqStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
+        List<FwqStatisticsBean> third_beans = qzdStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
         // 获取现场稽查的某个服务区的受检次数和扣分合计
 
         obj.setCheck_type(9);
 
-        List<FwqStatisticsBean> onsite_beans = fwqStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
+        List<FwqStatisticsBean> onsite_beans = qzdStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
 
         for (FwqStatisticsBean company_bean : company_beans) {
 
             mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(company_bean.getChecked_num());
 
@@ -188,7 +188,7 @@ public class StatisticsService_FImpl implements StatisticsService_F {
 
             obj.setEndperiod_id(checkTaskPeriods.get(checkTaskPeriods.size() - 1).getId());
 
         }
 
 
-        List<FwqDeptStatistic> deptStatistics = fwqCheckDeptStatisticsDao.selectdepts(obj);
 
+        List<FwqDeptStatistic> deptStatistics = qzdCheckDeptStatisticsDao.selectdepts(obj);
 
         Map<String, List<FwqDeptStatistic>> listMap = new HashMap<>();
 
         Map<Long, List<FwqDeptStatistic>> listMap1 = new HashMap<>();
 
         if (deptStatistics.size() > 0) {
 
@@ -402,7 +402,7 @@ public class StatisticsService_FImpl implements StatisticsService_F {
 
         }
 
 
         //服务区检查次数
 
-        List<FwqStatisticsBean> listCheckNum = fwqStatisticsDao.selectFeeStationCheckNum(obj);
 
+        List<FwqStatisticsBean> listCheckNum = qzdStatisticsDao.selectFeeStationCheckNum(obj);
 
         for (FwqStatisticsBean sta : listCheckNum) {
 
             if (mapStationInfos.containsKey(sta.getDept_id())) {
 
                 mapStationInfos.get(sta.getDept_id()).setChecked_num(sta.getChecked_num());
 
@@ -410,7 +410,7 @@ public class StatisticsService_FImpl implements StatisticsService_F {
 
             }
 
         }
 
 
-        List<FwqStatisticsBean> listCheckedScore = fwqStatisticsDao.selectFeeStationCheckedPersonScoreDetail(obj);
 
+        List<FwqStatisticsBean> listCheckedScore = qzdStatisticsDao.selectFeeStationCheckedPersonScoreDetail(obj);
 
 
         // 处理同一个服务区中,如果item的parent_id是一样的话,将这些数据结合在一起
 
         for (FwqStatisticsBean sta : listCheckedScore) {

+ 3 - 3
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/ThreadTaskServiceImpl.java
Просмотреть файл 

@@ -6,7 +6,7 @@ import com.xintong.visualinspection.bean.FwqDeptStatistic;
 
 import com.xintong.visualinspection.bean.FwqStatisticsBean;
 
 import com.xintong.visualinspection.service.CommonService;
 
 import com.xintong.visualinspection.service.ThreadTaskService_F;
 
-import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqCheckDeptStatisticsDao;
 
+import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckDeptStatisticsDao;
 
 import org.slf4j.Logger;
 
 import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -32,7 +32,7 @@ public class ThreadTaskServiceImpl implements ThreadTaskService_F {
 
     private static final Logger logger = LoggerFactory.getLogger(ThreadTaskServiceImpl.class);
 
 
     @Autowired
 
-    private FwqCheckDeptStatisticsDao fwqCheckDeptStatisticsDao;
 
+    private QzdCheckDeptStatisticsDao qzdCheckDeptStatisticsDao;
 
 
     @Reference(version = "1.0.0",
 
             application = "${dubbo.application.id}",
 
@@ -55,7 +55,7 @@ public class ThreadTaskServiceImpl implements ThreadTaskService_F {
 
             ss.setIntegral(statisticsBos.size() - s.getCompany_ranking2() + 1);
 
             ss.setDept_id(s.getDept_id());
 
             ss.setPeriod_id(period.getId());
 
-            fwqCheckDeptStatisticsDao.saveandupdate(ss);
 
+            qzdCheckDeptStatisticsDao.saveandupdate(ss);
 
         }
 
     }
 
 }

+ 1 - 1
Visuallnspection_qzd/src/main/resources/application.properties
Просмотреть файл 

@@ -18,7 +18,7 @@ dubbo.protocol.status = server
 
 ## RegistryConfig Bean
 
 dubbo.registry.id = qzd_service
 
 #dubbo.registry.address = zookeeper://git.topm.win:9994
 
-dubbo.registry.address = zookeeper://192.168.45.158:2181
 
+dubbo.registry.address = zookeeper://127.0.0.1:2181
 
 dubbo.registry.file = ./output/dubbo1.cache
 
 dubbo.reference.check=false
 
 dubbo.consumer.check=false

+ 1 - 1
Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqCheckDeptStatisticsDao.java
Просмотреть файл 

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 
 /**
 
- * 文件名：FwqCheckDeptStatisticsDao
 
+ * 文件名：QzdCheckDeptStatisticsDao
 
  * 版本信息：日期：2018/5/2 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
 
  */
 
 @Mapper

+ 1 - 1
Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqCheckOtherDao.java
Просмотреть файл 

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 
 /**
 
- * 文件名：FwqCheckOtherDao
 
+ * 文件名：QzdCheckOtherDao
 
  * 版本信息：日期：2018/5/2 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
 
  */
 
 @Mapper

+ 1 - 1
Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/FwqStatisticsDao.java
Просмотреть файл 

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 
 /**
 
- * 文件名：FwqCheckOtherDao
 
+ * 文件名：QzdCheckOtherDao
 
  * 版本信息：日期：2018/5/2 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
 
  */
 
 @Mapper

+ 1 - 1
Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CheckDeptStatisticsMapper.xml
Просмотреть файл 

@@ -1,6 +1,6 @@
 
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.FwqCheckDeptStatisticsDao">
 
+<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckDeptStatisticsDao">
 
 
     <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.FwqDeptStatistic">
 
         <id column="id" property="id" jdbcType="INTEGER"/>

+ 1 - 1
Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CheckOtherMapper.xml
Просмотреть файл 

@@ -1,6 +1,6 @@
 
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.FwqCheckOtherDao">
 
+<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckOtherDao">
 
 
     <select id="getAllCheckOther" parameterType="com.xintong.visualinspection.bean.FwqCheckOther" resultType="com.xintong.visualinspection.bean.FwqCheckOther">
 
         SELECT *

+ 1 - 1
Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/StatisticsMapper.xml
Просмотреть файл 

@@ -1,6 +1,6 @@
 
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.FwqStatisticsDao">
 
+<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.QzdStatisticsDao">
 
 
     <select id="getselectFeeStationOperationScoreDetail"
 
             parameterType="com.xintong.visualinspection.bean.FwqStatisticsBean"

+ 0 - 1
Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/RecordServiceImpl.java
Просмотреть файл 

@@ -18,7 +18,6 @@ import com.xintong.visualinspection.service.CommonService;
 
 import com.xintong.visualinspection.service.RecordService_Q;
 
 import com.xintong.visualinspection.service.TaskService_F;
 
 import com.xintong.visualinspection.util.Constants;
 
-import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqTaskDao;
 
 import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdRecordDao;
 
 import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;

+ 0 - 1
Visuallnspection_qzd/visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/TaskServiceImpl.java
Просмотреть файл 

@@ -17,7 +17,6 @@ import com.xintong.visualinspection.pojo.fwq.TaskData_F;
 
 import com.xintong.visualinspection.service.CommonService;
 
 import com.xintong.visualinspection.service.TaskService_F;
 
 import com.xintong.visualinspection.util.Constants;
 
-import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqTaskDao;
 
 import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;

Некоторые файлы не были показаны из-за большого количества измененных файлов