diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d0c9fa4..8ce1d20 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,15 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MOVED" beforePath="D:\PipeGallery\PgInterface\接口说明新需求.docx" afterPath="$PROJECT_DIR$/~WRL0458.tmp" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -98,12 +92,12 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       </list>
     </option>
   </component>
@@ -164,7 +158,7 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-10" />
+    <option name="x" value="-2" />
     <option name="y" value="-8" />
     <option name="width" value="1382" />
     <option name="height" value="744" />
@@ -351,7 +345,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="patroler" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -385,71 +379,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="patroler" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="manager" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -888,7 +818,7 @@
       <workItem from="1523321007177" duration="1598000" />
       <workItem from="1523324624594" duration="6759000" />
       <workItem from="1523340421442" duration="3752000" />
-      <workItem from="1523432830885" duration="3104000" />
+      <workItem from="1523432830885" duration="6753000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1034,11 +964,15 @@
       <created>1523331535754</created>
       <updated>1523331535754</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="修改时间检索的格式">
+      <created>1523436516632</created>
+      <updated>1523436516632</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="517099000" />
+    <option name="totallyTimeSpent" value="520748000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1061,7 +995,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-10" y="-8" width="1382" height="744" extended-state="0" />
+    <frame x="-2" y="-8" width="1382" height="744" extended-state="0" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1087,7 +1021,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32820514" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25302115" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -1151,8 +1085,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新增设备监测对象表" />
-    <MESSAGE value="增加管廊内气体实体类和接口" />
     <MESSAGE value="按资产表修改设备表" />
     <MESSAGE value="按资产表修改设备表," />
     <MESSAGE value="按资产表修改设备表123" />
@@ -1176,7 +1108,9 @@
     <MESSAGE value="修改施工功能" />
     <MESSAGE value="修改施工文档和不能反馈JSON问题" />
     <MESSAGE value="新增项目状态管理" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增项目状态管理" />
+    <MESSAGE value="修改时间检索的格式" />
+    <MESSAGE value="新增当天在建工程统计" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增当天在建工程统计" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1188,13 +1122,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="2610" max-vertical-offset="3146">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1281" max-vertical-offset="1804">
@@ -1436,14 +1363,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="6306" max-vertical-offset="7062">
-          <caret line="314" column="25" selection-start-line="314" selection-start-column="25" selection-end-line="314" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.39426523" vertical-offset="0" max-vertical-offset="558">
@@ -1487,19 +1406,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3437" max-vertical-offset="3982">
-          <caret line="191" column="0" selection-start-line="191" selection-start-column="0" selection-end-line="191" selection-end-column="0" />
-          <folding>
-            <element signature="method#setPgPartitionManager#0;class#PgConstructionManager#0" expanded="false" />
-            <element signature="method#setPgConstructionTypeManager#0;class#PgConstructionManager#0" expanded="false" />
-            <element signature="e#7792#7811#0" expanded="true" />
-            <marker date="1523434442035" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1444" max-vertical-offset="2002">
@@ -1613,6 +1519,38 @@
         </state>
       </provider>
     </entry>
+    <entry file="jar://D:/java/jdk1.7.0_09/src.zip!/java/lang/Object.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.56989247" vertical-offset="100" max-vertical-offset="11682">
+          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7577982" vertical-offset="3283" max-vertical-offset="3938">
+          <caret line="190" column="0" selection-start-line="190" selection-start-column="0" selection-end-line="190" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgPartitionManager#0;class#PgConstructionManager#0" expanded="false" />
+            <element signature="method#setPgConstructionTypeManager#0;class#PgConstructionManager#0" expanded="false" />
+            <element signature="e#7792#7811#0" expanded="true" />
+            <marker date="1523438885853" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.63669723" vertical-offset="6187" max-vertical-offset="7128">
+          <caret line="318" column="24" selection-start-line="318" selection-start-column="24" selection-end-line="318" selection-end-column="24" />
+          <folding>
+            <element signature="e#9171#9186#0" expanded="true" />
+            <element signature="e#9282#9301#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d0c9fa4..8ce1d20 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,15 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MOVED" beforePath="D:\PipeGallery\PgInterface\接口说明新需求.docx" afterPath="$PROJECT_DIR$/~WRL0458.tmp" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -98,12 +92,12 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       </list>
     </option>
   </component>
@@ -164,7 +158,7 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-10" />
+    <option name="x" value="-2" />
     <option name="y" value="-8" />
     <option name="width" value="1382" />
     <option name="height" value="744" />
@@ -351,7 +345,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="patroler" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -385,71 +379,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="patroler" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="manager" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -888,7 +818,7 @@
       <workItem from="1523321007177" duration="1598000" />
       <workItem from="1523324624594" duration="6759000" />
       <workItem from="1523340421442" duration="3752000" />
-      <workItem from="1523432830885" duration="3104000" />
+      <workItem from="1523432830885" duration="6753000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1034,11 +964,15 @@
       <created>1523331535754</created>
       <updated>1523331535754</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="修改时间检索的格式">
+      <created>1523436516632</created>
+      <updated>1523436516632</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="517099000" />
+    <option name="totallyTimeSpent" value="520748000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1061,7 +995,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-10" y="-8" width="1382" height="744" extended-state="0" />
+    <frame x="-2" y="-8" width="1382" height="744" extended-state="0" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1087,7 +1021,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32820514" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25302115" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -1151,8 +1085,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新增设备监测对象表" />
-    <MESSAGE value="增加管廊内气体实体类和接口" />
     <MESSAGE value="按资产表修改设备表" />
     <MESSAGE value="按资产表修改设备表," />
     <MESSAGE value="按资产表修改设备表123" />
@@ -1176,7 +1108,9 @@
     <MESSAGE value="修改施工功能" />
     <MESSAGE value="修改施工文档和不能反馈JSON问题" />
     <MESSAGE value="新增项目状态管理" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增项目状态管理" />
+    <MESSAGE value="修改时间检索的格式" />
+    <MESSAGE value="新增当天在建工程统计" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增当天在建工程统计" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1188,13 +1122,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="2610" max-vertical-offset="3146">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1281" max-vertical-offset="1804">
@@ -1436,14 +1363,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="6306" max-vertical-offset="7062">
-          <caret line="314" column="25" selection-start-line="314" selection-start-column="25" selection-end-line="314" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.39426523" vertical-offset="0" max-vertical-offset="558">
@@ -1487,19 +1406,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3437" max-vertical-offset="3982">
-          <caret line="191" column="0" selection-start-line="191" selection-start-column="0" selection-end-line="191" selection-end-column="0" />
-          <folding>
-            <element signature="method#setPgPartitionManager#0;class#PgConstructionManager#0" expanded="false" />
-            <element signature="method#setPgConstructionTypeManager#0;class#PgConstructionManager#0" expanded="false" />
-            <element signature="e#7792#7811#0" expanded="true" />
-            <marker date="1523434442035" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1444" max-vertical-offset="2002">
@@ -1613,6 +1519,38 @@
         </state>
       </provider>
     </entry>
+    <entry file="jar://D:/java/jdk1.7.0_09/src.zip!/java/lang/Object.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.56989247" vertical-offset="100" max-vertical-offset="11682">
+          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7577982" vertical-offset="3283" max-vertical-offset="3938">
+          <caret line="190" column="0" selection-start-line="190" selection-start-column="0" selection-end-line="190" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgPartitionManager#0;class#PgConstructionManager#0" expanded="false" />
+            <element signature="method#setPgConstructionTypeManager#0;class#PgConstructionManager#0" expanded="false" />
+            <element signature="e#7792#7811#0" expanded="true" />
+            <marker date="1523438885853" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.63669723" vertical-offset="6187" max-vertical-offset="7128">
+          <caret line="318" column="24" selection-start-line="318" selection-start-column="24" selection-end-line="318" selection-end-column="24" />
+          <folding>
+            <element signature="e#9171#9186#0" expanded="true" />
+            <element signature="e#9282#9301#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index ae9deae..d7099a2 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -184,14 +184,12 @@
 
         List<PgConstruction> pgConstructionList=(List<PgConstruction>)this.getSession().createQuery(hql).list();
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
-
         for(PgConstruction pgConstruction : pgConstructionList)
         {
-
+            pgConstructionDtoList.add(new PgConstructionDto(pgConstruction));
         }
 
         return pgConstructionDtoList;
     }
 
-
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d0c9fa4..8ce1d20 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,15 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MOVED" beforePath="D:\PipeGallery\PgInterface\接口说明新需求.docx" afterPath="$PROJECT_DIR$/~WRL0458.tmp" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -98,12 +92,12 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       </list>
     </option>
   </component>
@@ -164,7 +158,7 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-10" />
+    <option name="x" value="-2" />
     <option name="y" value="-8" />
     <option name="width" value="1382" />
     <option name="height" value="744" />
@@ -351,7 +345,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="patroler" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -385,71 +379,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="patroler" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="manager" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -888,7 +818,7 @@
       <workItem from="1523321007177" duration="1598000" />
       <workItem from="1523324624594" duration="6759000" />
       <workItem from="1523340421442" duration="3752000" />
-      <workItem from="1523432830885" duration="3104000" />
+      <workItem from="1523432830885" duration="6753000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1034,11 +964,15 @@
       <created>1523331535754</created>
       <updated>1523331535754</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="修改时间检索的格式">
+      <created>1523436516632</created>
+      <updated>1523436516632</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="517099000" />
+    <option name="totallyTimeSpent" value="520748000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1061,7 +995,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-10" y="-8" width="1382" height="744" extended-state="0" />
+    <frame x="-2" y="-8" width="1382" height="744" extended-state="0" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1087,7 +1021,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32820514" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25302115" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -1151,8 +1085,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新增设备监测对象表" />
-    <MESSAGE value="增加管廊内气体实体类和接口" />
     <MESSAGE value="按资产表修改设备表" />
     <MESSAGE value="按资产表修改设备表," />
     <MESSAGE value="按资产表修改设备表123" />
@@ -1176,7 +1108,9 @@
     <MESSAGE value="修改施工功能" />
     <MESSAGE value="修改施工文档和不能反馈JSON问题" />
     <MESSAGE value="新增项目状态管理" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增项目状态管理" />
+    <MESSAGE value="修改时间检索的格式" />
+    <MESSAGE value="新增当天在建工程统计" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增当天在建工程统计" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1188,13 +1122,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="2610" max-vertical-offset="3146">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1281" max-vertical-offset="1804">
@@ -1436,14 +1363,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="6306" max-vertical-offset="7062">
-          <caret line="314" column="25" selection-start-line="314" selection-start-column="25" selection-end-line="314" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.39426523" vertical-offset="0" max-vertical-offset="558">
@@ -1487,19 +1406,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3437" max-vertical-offset="3982">
-          <caret line="191" column="0" selection-start-line="191" selection-start-column="0" selection-end-line="191" selection-end-column="0" />
-          <folding>
-            <element signature="method#setPgPartitionManager#0;class#PgConstructionManager#0" expanded="false" />
-            <element signature="method#setPgConstructionTypeManager#0;class#PgConstructionManager#0" expanded="false" />
-            <element signature="e#7792#7811#0" expanded="true" />
-            <marker date="1523434442035" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1444" max-vertical-offset="2002">
@@ -1613,6 +1519,38 @@
         </state>
       </provider>
     </entry>
+    <entry file="jar://D:/java/jdk1.7.0_09/src.zip!/java/lang/Object.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.56989247" vertical-offset="100" max-vertical-offset="11682">
+          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7577982" vertical-offset="3283" max-vertical-offset="3938">
+          <caret line="190" column="0" selection-start-line="190" selection-start-column="0" selection-end-line="190" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgPartitionManager#0;class#PgConstructionManager#0" expanded="false" />
+            <element signature="method#setPgConstructionTypeManager#0;class#PgConstructionManager#0" expanded="false" />
+            <element signature="e#7792#7811#0" expanded="true" />
+            <marker date="1523438885853" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.63669723" vertical-offset="6187" max-vertical-offset="7128">
+          <caret line="318" column="24" selection-start-line="318" selection-start-column="24" selection-end-line="318" selection-end-column="24" />
+          <folding>
+            <element signature="e#9171#9186#0" expanded="true" />
+            <element signature="e#9282#9301#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index ae9deae..d7099a2 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -184,14 +184,12 @@
 
         List<PgConstruction> pgConstructionList=(List<PgConstruction>)this.getSession().createQuery(hql).list();
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
-
         for(PgConstruction pgConstruction : pgConstructionList)
         {
-
+            pgConstructionDtoList.add(new PgConstructionDto(pgConstruction));
         }
 
         return pgConstructionDtoList;
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 0c68382..023ee55 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -308,27 +308,30 @@
         return resultMap;
     }
 
-        /*
+    /*
     当天在建工程
      */
     @POST
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<Object,String> getConstructionToday() throws Exception{
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+    public Map<String,Object> getConstructionToday() throws Exception{
+        Map<String,Object > resultMap = new HashMap<String,Object>();
         String msg = "";
-
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
-        try{
-
+        try {
+            pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            if (pgConstructionDtoList == null)
+                msg = "不存在施工信息";
+            else
+                msg = "施工信息获取成功";
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="施工信息统计失败";
+            msg="施工信息获取失败";
         }
         resultMap.put("msg",msg);
-       // resultMap.put("result",pgConstructionDtoList);
+        resultMap.put("result",pgConstructionDtoList);
 
         return resultMap;
     }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d0c9fa4..8ce1d20 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,15 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MOVED" beforePath="D:\PipeGallery\PgInterface\接口说明新需求.docx" afterPath="$PROJECT_DIR$/~WRL0458.tmp" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -98,12 +92,12 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       </list>
     </option>
   </component>
@@ -164,7 +158,7 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-10" />
+    <option name="x" value="-2" />
     <option name="y" value="-8" />
     <option name="width" value="1382" />
     <option name="height" value="744" />
@@ -351,7 +345,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="patroler" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -385,71 +379,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="patroler" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="manager" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -888,7 +818,7 @@
       <workItem from="1523321007177" duration="1598000" />
       <workItem from="1523324624594" duration="6759000" />
       <workItem from="1523340421442" duration="3752000" />
-      <workItem from="1523432830885" duration="3104000" />
+      <workItem from="1523432830885" duration="6753000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1034,11 +964,15 @@
       <created>1523331535754</created>
       <updated>1523331535754</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="修改时间检索的格式">
+      <created>1523436516632</created>
+      <updated>1523436516632</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="517099000" />
+    <option name="totallyTimeSpent" value="520748000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1061,7 +995,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-10" y="-8" width="1382" height="744" extended-state="0" />
+    <frame x="-2" y="-8" width="1382" height="744" extended-state="0" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1087,7 +1021,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32820514" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25302115" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -1151,8 +1085,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新增设备监测对象表" />
-    <MESSAGE value="增加管廊内气体实体类和接口" />
     <MESSAGE value="按资产表修改设备表" />
     <MESSAGE value="按资产表修改设备表," />
     <MESSAGE value="按资产表修改设备表123" />
@@ -1176,7 +1108,9 @@
     <MESSAGE value="修改施工功能" />
     <MESSAGE value="修改施工文档和不能反馈JSON问题" />
     <MESSAGE value="新增项目状态管理" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增项目状态管理" />
+    <MESSAGE value="修改时间检索的格式" />
+    <MESSAGE value="新增当天在建工程统计" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增当天在建工程统计" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1188,13 +1122,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="2610" max-vertical-offset="3146">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1281" max-vertical-offset="1804">
@@ -1436,14 +1363,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="6306" max-vertical-offset="7062">
-          <caret line="314" column="25" selection-start-line="314" selection-start-column="25" selection-end-line="314" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.39426523" vertical-offset="0" max-vertical-offset="558">
@@ -1487,19 +1406,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="3437" max-vertical-offset="3982">
-          <caret line="191" column="0" selection-start-line="191" selection-start-column="0" selection-end-line="191" selection-end-column="0" />
-          <folding>
-            <element signature="method#setPgPartitionManager#0;class#PgConstructionManager#0" expanded="false" />
-            <element signature="method#setPgConstructionTypeManager#0;class#PgConstructionManager#0" expanded="false" />
-            <element signature="e#7792#7811#0" expanded="true" />
-            <marker date="1523434442035" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1444" max-vertical-offset="2002">
@@ -1613,6 +1519,38 @@
         </state>
       </provider>
     </entry>
+    <entry file="jar://D:/java/jdk1.7.0_09/src.zip!/java/lang/Object.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.56989247" vertical-offset="100" max-vertical-offset="11682">
+          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7577982" vertical-offset="3283" max-vertical-offset="3938">
+          <caret line="190" column="0" selection-start-line="190" selection-start-column="0" selection-end-line="190" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgPartitionManager#0;class#PgConstructionManager#0" expanded="false" />
+            <element signature="method#setPgConstructionTypeManager#0;class#PgConstructionManager#0" expanded="false" />
+            <element signature="e#7792#7811#0" expanded="true" />
+            <marker date="1523438885853" expanded="true" signature="-1:-1" placeholder="select count..PG_CONSTRUCTION..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.63669723" vertical-offset="6187" max-vertical-offset="7128">
+          <caret line="318" column="24" selection-start-line="318" selection-start-column="24" selection-end-line="318" selection-end-column="24" />
+          <folding>
+            <element signature="e#9171#9186#0" expanded="true" />
+            <element signature="e#9282#9301#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index ae9deae..d7099a2 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -184,14 +184,12 @@
 
         List<PgConstruction> pgConstructionList=(List<PgConstruction>)this.getSession().createQuery(hql).list();
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
-
         for(PgConstruction pgConstruction : pgConstructionList)
         {
-
+            pgConstructionDtoList.add(new PgConstructionDto(pgConstruction));
         }
 
         return pgConstructionDtoList;
     }
 
-
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 0c68382..023ee55 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -308,27 +308,30 @@
         return resultMap;
     }
 
-        /*
+    /*
     当天在建工程
      */
     @POST
     @Path("getConstructionToday")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<Object,String> getConstructionToday() throws Exception{
-        Map<Object, String> resultMap = new HashMap<Object, String>();
+    public Map<String,Object> getConstructionToday() throws Exception{
+        Map<String,Object > resultMap = new HashMap<String,Object>();
         String msg = "";
-
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
-        try{
-
+        try {
+            pgConstructionDtoList = pgConstructionManager.getConstructionToday();
+            if (pgConstructionDtoList == null)
+                msg = "不存在施工信息";
+            else
+                msg = "施工信息获取成功";
         }
         catch(Exception e)
         {
             e.printStackTrace();
-            msg="施工信息统计失败";
+            msg="施工信息获取失败";
         }
         resultMap.put("msg",msg);
-       // resultMap.put("result",pgConstructionDtoList);
+        resultMap.put("result",pgConstructionDtoList);
 
         return resultMap;
     }
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index bcfda82..92792df 100644
--- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ