添加手动生成服务区任务

VisualInspection/fwq/js/task/add.js

@@ -0,0 +1,12 @@
+$(document).ready(function() {
+    $.jeDate("#month_date", {
+        isinitVal: true,
+        format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+    });
+    var checked_dept = null;
+    if (roleContains("SERVICEAREA")) {
+        checked_dept = getCurrentUser().organid;
+    }
+    setSASelect("#fwq", checked_dept);
+
+});

VisualInspection/fwq/view/task/add.html

@@ -0,0 +1,66 @@
+<script src="/fwq/js/task/add.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/css/other_check/other_check.css">
+<div class="container-fluid ">
+    <div class="row">
+
+        <span style="float: left;
+        padding-top: 5px;">时间：</span>
+        <div class="div-month">
+            <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
+        </div>
+        <span style="float: left;
+        padding-top: 5px;">服务区：</span>
+        <div class="div-station">
+            <select class="form-control" id="fwq"></select>
+        </div>
+
+        <div class="col-xs-1">
+            <div class="input-group">
+                <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <table id="table">
+
+
+        </table>
+    </div>
+    <div class="row">
+        <div class="col-xs-4">
+            <div class="row">
+                <span style="float: left;
+                padding-top: 5px;">已选任务：</span>
+            </div>
+
+            <table id="selected_table">
+
+
+            </table>
+        </div>
+        <div class="col-xs-4">
+            <div class="row">
+                <span style="float: left;
+                padding-top: 5px;">稽查时间段：</span>
+            </div>
+
+
+            <div class="row">
+                <span style="float: left;
+                padding-top: 5px;">分配稽查任务：</span>
+            </div>
+
+        </div>
+        <div class="col-xs-4">
+            <div class="col-xs-1">
+                <div class="input-group">
+                    <button class="btn btn-primary " type="button" id="conditional_query">生成任务</button>
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+
+</div>

VisualInspection/js/util/util.js

@@ -256,8 +256,25 @@ function setSASelect(div, selectId) {
     }
 }
 
+var hasall = true;
+
+function setSASelecttemp(div, selectId, hasall1) {
+    var feeList = $.zui.store.get("cache_sa_station_list");
+    hasall = hasall1;
+    if (feeList) {
+        setSASelectValue(feeList, div, selectId);
+    } else {
+        get_common_service("/dept/getAllSA", null, function(data) {
+            setSASelectValue(data, div, selectId);
+        });
+    }
+}
+
 function setSASelectValue(data, div, selectId) {
     var optStr = '<option value="">全部</option>';
+    if (!hasall) {
+        optStr = "";
+    }
     for (var i in data) {
         if (data[i].deptid == selectId)
             optStr += '<option value="' + data[i].deptid + '" selected="selected">' + data[i].name + '</option>';

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/dao/FwqAreaDao.java

@@ -0,0 +1,12 @@
+package com.xintong.visualinspection.visuallnspection_fjq.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文件名：FwqAreaDao
+ * 版本信息：日期：2018/5/7 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+@Mapper
+public class FwqAreaDao {
+
+}

Visuallnspection_fjq/visuallnspectioninteface/.idea/workspace.xml

@@ -34,11 +34,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TaskService_F.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="TaskService_F.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="9" column="56" lean-forward="true" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" />
+            <state relative-caret-position="150">
+              <caret line="10" column="59" lean-forward="true" selection-start-line="10" selection-start-column="59" selection-end-line="10" selection-end-column="59" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -88,8 +88,8 @@
       <file leaf-file-name="FwqCheckTask.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="555">
-              <caret line="43" column="28" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="28" />
+            <state relative-caret-position="182">
+              <caret line="35" column="28" lean-forward="true" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -97,6 +97,15 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="AreaInfo.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/AreaInfo.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="CustomJsonDateDeserializer.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/CustomJsonDateDeserializer.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -109,15 +118,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FeeStation.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FeeStation.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="12" column="47" selection-start-line="12" selection-start-column="47" selection-end-line="12" selection-end-column="47" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -155,6 +155,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/CustomJsonDateDeserializer.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/AreaInfo.java" />
       </list>
     </option>
   </component>
@@ -243,24 +244,6 @@
             </path>
             <path>
               <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
-              <item name="util" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
             </path>
           </expand>
@@ -389,10 +372,11 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="27018000" />
+    <option name="totallyTimeSpent" value="27271000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -413,18 +397,43 @@
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.3260606" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23748212" />
+      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.3260606" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23748212" />
       <window_info anchor="right" id="Bean Validation" order="4" />
       <window_info id="Web" order="3" side_tool="true" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23748212" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.24964234" />
+      <window_info anchor="bottom" id="Java Enterprise" order="8" />
+      <window_info anchor="right" id="Theme Preview" order="3" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Palette&#9;" order="3" />
+      <window_info anchor="right" id="Maven Projects" order="3" />
+      <window_info id="Web" order="3" side_tool="true" />
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Spring" order="8" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info id="Image Layers" order="2" />
+      <window_info anchor="right" id="Bean Validation" order="4" />
+      <window_info anchor="right" id="Database" order="3" />
+      <window_info id="Capture Tool" order="2" />
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
+      <window_info anchor="right" id="Capture Analysis" order="3" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32946146" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.3260606" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info id="Designer" order="2" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -438,16 +447,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Role.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="11" column="41" selection-start-line="11" selection-start-column="41" selection-end-line="11" selection-end-column="41" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/User.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
@@ -762,8 +761,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="555">
-          <caret line="43" column="28" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="28" />
+        <state relative-caret-position="182">
+          <caret line="35" column="28" lean-forward="true" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -772,14 +771,21 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="56" lean-forward="true" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" />
+        <state relative-caret-position="150">
+          <caret line="10" column="59" lean-forward="true" selection-start-line="10" selection-start-column="59" selection-end-line="10" selection-end-column="59" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/AreaInfo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/AreaInfo.java

@@ -0,0 +1,16 @@
+package com.xintong.visualinspection.bean;
+
+import lombok.Data;
+
+/**
+ * 文件名：AreaInfo
+ * 版本信息：日期：2018/5/7 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+@Data
+public class AreaInfo {
+    private Integer id;
+    private Integer dept_id;
+    private String name;
+    private String video_ids;
+    private Integer type;
+}

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Apr 26 15:03:41 CST 2018
+#Mon May 07 17:43:37 CST 2018
 version=1.0-SNAPSHOT
 groupId=com.xintong.visuallnspection.inteface
 artifactId=visuallnspectioninteface

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

@@ -6,6 +6,7 @@ com/xintong/visualinspection/bean/Role.class
 com/xintong/visualinspection/service/UserService.class
 com/xintong/visualinspection/bean/FeeStation.class
 com/xintong/visualinspection/bean/User.class
+com/xintong/visualinspection/bean/AreaInfo.class
 com/xintong/visualinspection/util/Constants.class
 com/xintong/visualinspection/bean/Constant.class
 com/xintong/visualinspection/service/TaskService_F.class

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

@@ -9,6 +9,7 @@
 /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/util/DateUtil.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/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/UserService.java
 /Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/TaskService_F.java