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

f225b791 · wanghao · c8a78e28 · f225b791 · f225b791 · f225b791
Commit f225b791 authored Jul 19, 2024 by wanghao
9 changed files
--- a/zh-baseversion-system/src/main/java/com/zehong/system/mapper/TPipeOldPlanProcessMapper.java
+++ b/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);

    /**

--- a/zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TPipeOldPlanProcessServiceImpl.java
+++ b/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;
    }
 }
--- a/zh-baseversion-web/src/views/oldpipesystem/process/components/DetailInfo.vue
+++ b/zh-baseversion-web/src/views/oldpipesystem/process/components/DetailInfo.vue
@@ -111,8 +111,7 @@

    <el-divider content-position="left">上报时态</el-divider>
    <el-form label-width="170px">
-      <el-row class="el-row-table">  
-          
+      <el-row class="el-row-table">   
          <el-col :span="12">
                <el-form-item label="上报状态" >
                  <span>{{fUploadType}}</span> 
@@ -129,9 +128,7 @@
            <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
              <span>{{ detailInfo.fUploadTime }}</span>
            </el-form-item>
-          </el-col>
-
-
+          </el-col> 
      </el-row>
    </el-form>


--- a/zh-baseversion-web/src/views/risk/components/DetailInfo.vue
+++ b/zh-baseversion-web/src/views/risk/components/DetailInfo.vue
@@ -63,12 +63,23 @@
              <span v-if="detailInfo.fRemark">{{ detailInfo.fRemark }}</span>
              <span v-else>-</span>
            </el-form-item>
-          </el-col> 
+          </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> 
-            </el-form-item>
+                <el-form-item label="上报状态" >
+                  <span>{{fUploadType}}</span> 
+                </el-form-item>
          </el-col>

          <el-col :span="12">
@@ -76,21 +87,15 @@
                <span>{{ fUploadTime }}</span> 
              </el-form-item>
          </el-col>
-          
+              
          <el-col :span="12"> 
            <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
              <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-col> 
      </el-row>
    </el-form>
+
  </el-dialog>

 </template>

--- a/zh-baseversion-web/src/views/supplybalance/day/components/DetailInfo.vue
+++ b/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>

--- a/zh-baseversion-web/src/views/supplybalance/gas/components/DetailInfo.vue
+++ b/zh-baseversion-web/src/views/supplybalance/gas/components/DetailInfo.vue
@@ -43,22 +43,7 @@
            <span v-if="detailInfo.fSupDate">{{ detailInfo.fSupDate }}</span>
            <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>
-            <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> 
        <el-col :span="12">
          <el-form-item label="创建时间">
            <span v-if="detailInfo.createTime">{{ detailInfo.createTime }}</span>
@@ -83,6 +68,27 @@

    </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.fRepDate">{{ detailInfo.fRepDate }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+
  </el-dialog>

 </template>

--- a/zh-baseversion-web/src/views/supplybalance/stop/components/DetailInfo.vue
+++ b/zh-baseversion-web/src/views/supplybalance/stop/components/DetailInfo.vue
@@ -52,22 +52,7 @@
                <span v-if="detailInfo.fStopRange">{{ detailInfo.fStopRange }}</span>
                <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>  
            <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>

--- a/zh-baseversion-web/src/views/thirdbuild/accident/components/DetailInfo.vue
+++ b/zh-baseversion-web/src/views/thirdbuild/accident/components/DetailInfo.vue
@@ -48,29 +48,33 @@
            <span v-if="detailInfo.fRemark">{{ detailInfo.fRemark }}</span>
            <span v-else>-</span>
          </el-form-item>
-        </el-col>
-
-
-        <el-col :span="12">
-          <el-form-item label="上报状态" >
-            <span>{{fUploadType}}</span> 
-          </el-form-item>
-        </el-col>
+        </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> 
+                </el-form-item>
+          </el-col>

-        <el-col :span="12">
-            <el-form-item label="上报时间" >
-              <span>{{fUploadTime}}</span> 
+          <el-col :span="12">
+              <el-form-item label="上报时间" >
+                <span>{{ fUploadTime }}</span> 
+              </el-form-item>
+          </el-col>
+              
+          <el-col :span="12"> 
+            <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
+              <span>{{ detailInfo.entUploadTime }}</span>
            </el-form-item>
-        </el-col>
-        
-        <el-col :span="12"> 
-          <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
-            <span>{{ detailInfo.entUploadTime }}</span>
-          </el-form-item>
-        </el-col>
-
+          </el-col> 
      </el-row>
    </el-form>
+
  </el-dialog>

 </template>

--- a/zh-baseversion-web/src/views/thirdbuild/project/components/DetailInfo.vue
+++ b/zh-baseversion-web/src/views/thirdbuild/project/components/DetailInfo.vue
@@ -242,28 +242,34 @@
            <span v-if="detailInfo.fGasCompanyStationPhone">{{ detailInfo.fGasCompanyStationPhone }}</span>
            <span v-else>-</span>
          </el-form-item>
-        </el-col>
+        </el-col> 
+      </el-row>
+    </el-form>

-        <el-col :span="12">
-          <el-form-item label="上报状态" >
-            <span>{{fUploadType}}</span> 
-          </el-form-item>
-        </el-col>
+    
+    <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> 
+                </el-form-item>
+          </el-col>

-        <el-col :span="12">
-            <el-form-item label="上报时间" >
-              <span>{{fUploadTime}}</span> 
+          <el-col :span="12">
+              <el-form-item label="上报时间" >
+                <span>{{ fUploadTime }}</span> 
+              </el-form-item>
+          </el-col>
+              
+          <el-col :span="12"> 
+            <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
+              <span>{{ detailInfo.entUploadTime }}</span>
            </el-form-item>
-        </el-col>
-        
-        <el-col :span="12"> 
-          <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
-            <span>{{ detailInfo.entUploadTime }}</span>
-          </el-form-item>
-        </el-col>
-
+          </el-col> 
      </el-row>
    </el-form>
+
  </el-dialog>

 </template>