1 上报时间 和 上报状态 显示调整, 有个别 上报时 上传时间 格式不对问题调整。

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TPipeOldPlanProcessMapper.java

@@ -58,7 +58,7 @@ public interface TPipeOldPlanProcessMapper
      * 企业端上传数据
      * @return
      */
-    public int entReportPipeOldPlanProcess(@Param("state")  String state, @Param("entUploadTime") Date entUploadTime,
+    public int entReportPipeOldPlanProcess(@Param("state")  String state, @Param("entUploadTime") String entUploadTime,
                                            @Param("fOldPlanProcessId") Long fOldPlanProcessId);
 
     /**

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TPipeOldPlanProcessServiceImpl.java

@@ -3,10 +3,7 @@ package com.zehong.system.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.zehong.common.core.domain.model.LoginUser;
 import com.zehong.common.exception.CustomException;
-import com.zehong.common.utils.GovernmentDataCopyUtil;
-import com.zehong.common.utils.GovernmentDataUtil;
-import com.zehong.common.utils.SecurityUtils;
-import com.zehong.common.utils.ServletUtils;
+import com.zehong.common.utils.*;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.common.utils.uuid.IdUtils;
 import com.zehong.system.domain.TPipeOldPlanProcess;
@@ -169,7 +166,8 @@ public class TPipeOldPlanProcessServiceImpl implements ITPipeOldPlanProcessServi
      */
     @Override
     public int entReportPipeOldPlanProcess(Long fOldPlanProcessId) {
-        tPipeOldPlanProcessMapper.entReportPipeOldPlanProcess("1",new Date(),fOldPlanProcessId);
+        String s = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
+        tPipeOldPlanProcessMapper.entReportPipeOldPlanProcess("1",s,fOldPlanProcessId);
         return 1;
     }
 }

zh-baseversion-web/src/views/oldpipesystem/process/components/DetailInfo.vue

@@ -112,7 +112,6 @@
     <el-divider content-position="left">上报时态</el-divider>
     <el-form label-width="170px">
       <el-row class="el-row-table">   
-          
           <el-col :span="12">
                 <el-form-item label="上报状态" >
                   <span>{{fUploadType}}</span> 
@@ -130,8 +129,6 @@
               <span>{{ detailInfo.fUploadTime }}</span>
             </el-form-item>
           </el-col> 
-
-
       </el-row>
     </el-form>
 

zh-baseversion-web/src/views/risk/components/DetailInfo.vue

@@ -64,7 +64,18 @@
               <span v-else>-</span>
             </el-form-item>
           </el-col>  
+          <el-col :span="24">
+            <el-form-item label="经纬度位置"> 
+              <div id="risk-map" style="height: 300px"></div>
+            </el-form-item>
+          </el-col>
 
+      </el-row>
+    </el-form>
+    
+    <el-divider content-position="left">上报时态</el-divider>
+    <el-form label-width="170px">
+      <el-row class="el-row-table">   
           <el-col :span="12">
                 <el-form-item label="上报状态" >
                   <span>{{fUploadType}}</span> 
@@ -82,15 +93,9 @@
               <span>{{ detailInfo.entUploadTime }}</span>
             </el-form-item>
           </el-col> 
-
-          <el-col :span="24">
-            <el-form-item label="经纬度位置"> 
-              <div id="risk-map" style="height: 300px"></div>
-            </el-form-item>
-          </el-col>
-
       </el-row>
     </el-form>
+
   </el-dialog>
 
 </template>

zh-baseversion-web/src/views/supplybalance/day/components/DetailInfo.vue

@@ -143,37 +143,45 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="企业端上报时间">
-            <span v-if="detailInfo.fReportTime">{{ detailInfo.fReportTime }}</span>
+          <el-form-item label="创建时间">
+            <span v-if="detailInfo.fCreateTime">{{ detailInfo.fCreateTime }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
 
-        <el-col :span="12" v-if="-2 == $store.state.user.enterpriseId">
-          <el-form-item label="政府端上报时间">
-            <span v-if="detailInfo.fGovUploadTime">{{ detailInfo.fGovUploadTime }}</span>
+        <el-col :span="12">
+          <el-form-item label="最后修改时间">
+            <span v-if="detailInfo.fUpdateTime">{{ detailInfo.fUpdateTime }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="创建时间">
-            <span v-if="detailInfo.fCreateTime">{{ detailInfo.fCreateTime }}</span>
+      </el-row>
+
+    </el-form>
+
+    <el-divider content-position="left">上报时态</el-divider>
+    <el-form label-width="170px">
+      <el-row class="el-row-table">    
+        
+
+        <el-col :span="12" v-if="-2 == $store.state.user.enterpriseId">
+          <el-form-item label="政府端上报时间">
+            <span v-if="detailInfo.fGovUploadTime">{{ detailInfo.fGovUploadTime }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
         
         <el-col :span="12">
-          <el-form-item label="最后修改时间">
-            <span v-if="detailInfo.fUpdateTime">{{ detailInfo.fUpdateTime }}</span>
+          <el-form-item label="企业端上报时间">
+            <span v-if="detailInfo.fReportTime">{{ detailInfo.fReportTime }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
-
       </el-row>
-
     </el-form>
 
+
   </el-dialog>
 
 </template>

zh-baseversion-web/src/views/supplybalance/gas/components/DetailInfo.vue

@@ -44,45 +44,51 @@
             <span v-else>-</span>
           </el-form-item>
         </el-col> 
-
         <el-col :span="12">
-          <el-form-item label="企业端上报时间">
-            <span v-if="detailInfo.fRepDate">{{ detailInfo.fRepDate }}</span>
+          <el-form-item label="创建时间">
+            <span v-if="detailInfo.createTime">{{ detailInfo.createTime }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
 
-        <el-col :span="12" v-if="-2 == $store.state.user.enterpriseId">
-          <el-form-item label="政府端上报时间">
-            <span v-if="detailInfo.fGovUploadTime">{{ detailInfo.fGovUploadTime }}</span>
+        <el-col :span="12">
+          <el-form-item label="更新时间">
+            <span v-if="detailInfo.updateTime">{{ detailInfo.updateTime }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="创建时间">
-            <span v-if="detailInfo.createTime">{{ detailInfo.createTime }}</span>
+          <el-form-item label="备注">
+            <span v-if="detailInfo.remarks">{{ detailInfo.remarks }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
+      </el-row>
 
-        <el-col :span="12">
-          <el-form-item label="更新时间">
-            <span v-if="detailInfo.updateTime">{{ detailInfo.updateTime }}</span>
+    </el-form>
+
+    <el-divider content-position="left">上报时态</el-divider>
+    <el-form label-width="170px">
+      <el-row class="el-row-table">    
+        
+        <el-col :span="12" v-if="-2 == $store.state.user.enterpriseId">
+          <el-form-item label="政府端上报时间">
+            <span v-if="detailInfo.fGovUploadTime">{{ detailInfo.fGovUploadTime }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
         
         <el-col :span="12">
-          <el-form-item label="备注">
-            <span v-if="detailInfo.remarks">{{ detailInfo.remarks }}</span>
+          <el-form-item label="企业端上报时间">
+            <span v-if="detailInfo.fRepDate">{{ detailInfo.fRepDate }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
       </el-row>
-
     </el-form>
 
+
   </el-dialog>
 
 </template>

zh-baseversion-web/src/views/supplybalance/stop/components/DetailInfo.vue

@@ -53,21 +53,6 @@
                 <span v-else>-</span>
               </el-form-item>
             </el-col>  
-
-            <el-col :span="12" v-if="detailInfo.fRepStatus == '1'">
-              <el-form-item label="企业上报时间">
-                <span v-if="detailInfo.entRepTime">{{ detailInfo.entRepTime }}</span>
-                <span v-else>-</span>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12" v-if="-2 == $store.state.user.enterpriseId">
-              <el-form-item label="政府端上报时间">
-                <span v-if="detailInfo.fGovUploadTime">{{ detailInfo.fGovUploadTime }}</span>
-                <span v-else>-</span>
-              </el-form-item>
-            </el-col>
-
             <el-col :span="12">
               <el-form-item label="创建时间">
                 <span v-if="detailInfo.createTime">{{ detailInfo.createTime }}</span>
@@ -113,6 +98,29 @@
 
     </el-form>
 
+
+    <el-divider content-position="left">上报时态</el-divider>
+    <el-form label-width="170px">
+      <el-row class="el-row-table">    
+        
+
+        <el-col :span="12" v-if="-2 == $store.state.user.enterpriseId">
+          <el-form-item label="政府端上报时间">
+            <span v-if="detailInfo.fGovUploadTime">{{ detailInfo.fGovUploadTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+        
+        <el-col :span="12">
+          <el-form-item label="企业端上报时间">
+            <span v-if="detailInfo.entRepTime">{{ detailInfo.entRepTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+
   </el-dialog>
 
 </template>

zh-baseversion-web/src/views/thirdbuild/accident/components/DetailInfo.vue

@@ -49,8 +49,12 @@
             <span v-else>-</span>
           </el-form-item>
         </el-col> 
+      </el-row>
+    </el-form>
     
-
+    <el-divider content-position="left">上报时态</el-divider>
+    <el-form label-width="170px">
+      <el-row class="el-row-table">   
           <el-col :span="12">
                 <el-form-item label="上报状态" >
                   <span>{{fUploadType}}</span> 
@@ -59,7 +63,7 @@
 
           <el-col :span="12">
               <el-form-item label="上报时间" >
-              <span>{{fUploadTime}}</span> 
+                <span>{{ fUploadTime }}</span> 
               </el-form-item>
           </el-col>
               
@@ -68,9 +72,9 @@
               <span>{{ detailInfo.entUploadTime }}</span>
             </el-form-item>
           </el-col> 
-
       </el-row>
     </el-form>
+
   </el-dialog>
 
 </template>

zh-baseversion-web/src/views/thirdbuild/project/components/DetailInfo.vue

@@ -243,7 +243,13 @@
             <span v-else>-</span>
           </el-form-item>
         </el-col> 
+      </el-row>
+    </el-form>
+
     
+    <el-divider content-position="left">上报时态</el-divider>
+    <el-form label-width="170px">
+      <el-row class="el-row-table">   
           <el-col :span="12">
                 <el-form-item label="上报状态" >
                   <span>{{fUploadType}}</span> 
@@ -252,7 +258,7 @@
 
           <el-col :span="12">
               <el-form-item label="上报时间" >
-              <span>{{fUploadTime}}</span> 
+                <span>{{ fUploadTime }}</span> 
               </el-form-item>
           </el-col>
               
@@ -261,9 +267,9 @@
               <span>{{ detailInfo.entUploadTime }}</span>
             </el-form-item>
           </el-col> 
-
       </el-row>
     </el-form>
+
   </el-dialog>
 
 </template>