1 老旧官网改造-供需平衡-第三方施工-重要风险点管控 界面优化。

zh-baseversion-system/src/main/java/com/zehong/system/domain/TConGasProInc.java

@@ -62,8 +62,8 @@ public class TConGasProInc extends BaseEntity
 
     /**
      * 企业端上传时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm")
     private Date entUploadTime;
 
     /**
@@ -73,8 +73,8 @@ public class TConGasProInc extends BaseEntity
 
     /**
      * 政府端上传时间 */
-    @Excel(name = "上报省厅时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报省厅时间",dateFormat = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date govUploadTime;
 
 

zh-baseversion-system/src/main/java/com/zehong/system/domain/TConGasProInfor.java

@@ -198,8 +198,8 @@ public class TConGasProInfor extends BaseEntity
 
     /**
      * 企业端上传时间 */
-    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date entUploadTime;
 
 
@@ -211,8 +211,8 @@ public class TConGasProInfor extends BaseEntity
 
     /**
      * 政府端上传时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上传省厅时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "上传省厅时间",dateFormat = "yyyy-MM-dd HH:mm")
     private Date govUploadTime;
 
     public void updateFields() {

zh-baseversion-system/src/main/java/com/zehong/system/domain/TPipeOldPlanProcess.java

@@ -117,7 +117,7 @@ public class TPipeOldPlanProcess extends BaseEntity
 
     /** 上传时间，yyyy-MM-dd hh:mm:ss */
     @Excel(name = "上报时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:m")
     private String fUploadTime;
 
     /**
@@ -128,7 +128,7 @@ public class TPipeOldPlanProcess extends BaseEntity
     private String govUploadState;
 
     /** 政府端上传时间，yyyy-MM-dd hh:mm:ss */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @Excel(name = "上报省厅时间")
     private Date govUploadTime;
 

zh-baseversion-system/src/main/java/com/zehong/system/domain/TRiskDevMajInfor.java

@@ -93,8 +93,8 @@ public class TRiskDevMajInfor extends BaseEntity
     /**
      * 企业端上传时间 Excel 企业和政府通用
      */
-    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date entUploadTime;
 
     /**
@@ -106,8 +106,8 @@ public class TRiskDevMajInfor extends BaseEntity
     /**
      * 政府端上传 时间
      */
-    @Excel(name = "上报省厅时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报省厅时间",dateFormat = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date govUploadTime;
 
     public void updateFields() {

zh-baseversion-system/src/main/java/com/zehong/system/domain/TSupBalGasSup.java

@@ -52,8 +52,8 @@ public class TSupBalGasSup extends BaseEntity
     private String fRepStatus;
 
     /** 上报日期 */
-    @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date fRepDate;
 
 
@@ -85,8 +85,8 @@ public class TSupBalGasSup extends BaseEntity
     private String fGovUploadStatus;
 
     /** 政府端上报时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上报省厅日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "上报省厅日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date fGovUploadTime;
 
     public void setfGasSupId(Long fGasSupId) 

zh-baseversion-system/src/main/java/com/zehong/system/domain/TSupBalUsgDay.java

@@ -131,8 +131,8 @@ public class TSupBalUsgDay extends BaseEntity
     private String fGovUploadStatus;
 
     /** 政府端上报时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上报省厅时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "上报省厅时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date fGovUploadTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

zh-baseversion-system/src/main/resources/mapper/system/TConGasProInforMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fChiefEngineerName"    column="f_chief_engineer_name"    />
         <result property="fChiefEngineerPhone"    column="f_chief_engineer_phone"    />
         <result property="fCompanyInfoId"    column="f_company_info_id"    />
+        <result property="companyInfoName"    column="enterpriseName"    />
         <result property="fPatrolSafetyOfficerNo"    column="f_patrol_safety_officer_no"    />
         <result property="fPartrolSafetyOfficerName"    column="f_partrol_safety_officer_name"    />
         <result property="fPatrolSafetyOfficerPhone"    column="f_patrol_safety_officer_phone"    />
@@ -53,7 +54,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTConGasProInforVo">
-        select f_con_gas_pro_infor_id, f_project_code, f_project_no, f_project_name, f_construction_start, f_construction_end, f_address, f_district_id, f_construction_longitude, f_construction_latitude, f_construction_point_type, f_village_id, f_pipe_press, f_report_flag, f_construction_status, f_build_department, f_project_leader, f_project_leader_phone, f_industry, f_department_name, f_construct_department, f_build_project_leader_name, f_build_project_leader_phone, f_technical_leader_name, f_technical_leader_phone, f_supervision_unit_name, f_chief_engineer_name, f_chief_engineer_phone, f_company_info_id, f_patrol_safety_officer_no, f_partrol_safety_officer_name, f_patrol_safety_officer_phone, f_resident_safety_officer_no, f_resident_safety_officer_name, f_resident_safety_officer_phone, f_gas_company_station_no, f_gas_company_station_name, f_gas_company_station_phone, f_remark, f_update_time,f_ent_upload_time,f_ent_upload_state,f_gov_upload_time,f_gov_upload_state from t_con_gas_pro_infor
+        select f_con_gas_pro_infor_id, f_project_code, f_project_no, f_project_name, f_construction_start,
+               f_construction_end, f_address, f_district_id,
+               f_construction_longitude, f_construction_latitude,
+               f_construction_point_type, f_village_id, f_pipe_press, f_report_flag, f_construction_status,
+               f_build_department, f_project_leader, f_project_leader_phone, f_industry, f_department_name,
+               f_construct_department, f_build_project_leader_name, f_build_project_leader_phone,
+               f_technical_leader_name, f_technical_leader_phone, f_supervision_unit_name, f_chief_engineer_name,
+               f_chief_engineer_phone, f_company_info_id,
+               enterprise.enterprise_name as enterpriseName,f_patrol_safety_officer_no, f_partrol_safety_officer_name,
+               f_patrol_safety_officer_phone, f_resident_safety_officer_no, f_resident_safety_officer_name,
+               f_resident_safety_officer_phone, f_gas_company_station_no, f_gas_company_station_name,
+               f_gas_company_station_phone, f_remark, f_update_time,f_ent_upload_time,f_ent_upload_state,
+               f_gov_upload_time,f_gov_upload_state from t_con_gas_pro_infor gasInfo left join t_enterprise_info enterprise on gasInfo.f_company_info_id = enterprise.enterprise_id
     </sql>
 
 

zh-baseversion-system/src/main/resources/mapper/system/TPipeOldPlanProcessMapper.xml

@@ -27,13 +27,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fUploadType"    column="f_upload_type"    />
         <result property="fUploadTime"    column="f_upload_time"    />
         <result property="fEnterpriseId"    column="f_enterprise_id"    />
+        <result property="enterpriseName"    column="enterpriseName"    />
 
         <result property="govUploadState"    column="f_gov_upload_state"    />
         <result property="govUploadTime"    column="f_gov_upload_time"    />
     </resultMap>
 
     <sql id="selectTPipeOldPlanProcessVo">
-        select f_old_plan_process_id, f_uuid, f_enterprise_id,f_ent_uuid, f_region, f_project_name, f_relation_object_type, f_year, f_start_time, f_end_time, f_total_investment, f_create_time, f_update_time, f_subject_implementation, f_concat_person, f_concat_tel, f_construction_content, f_actual_finish_time, f_reconstruction_progress, f_funds_disbursement_progress, f_upload_type, f_upload_time,f_gov_upload_state, f_gov_upload_time from t_pipe_old_plan_process
+        select process.f_old_plan_process_id,
+               process.f_uuid,
+               process.f_enterprise_id,
+               enterprise.enterprise_name as enterpriseName,
+               process.f_ent_uuid,
+               process.f_region,
+               process.f_project_name,
+               process.f_relation_object_type,
+               process.f_year,
+               process.f_start_time,
+               process.f_end_time,
+               process.f_total_investment,
+               process.f_create_time,
+               process.f_update_time,
+               process.f_subject_implementation,
+               process.f_concat_person,
+               process.f_concat_tel,
+               process.f_construction_content,
+               process.f_actual_finish_time,
+               process.f_reconstruction_progress,
+               process.f_funds_disbursement_progress,
+               process.f_upload_type,
+               process.f_upload_time,
+               process.f_gov_upload_state,
+               process.f_gov_upload_time
+        from t_pipe_old_plan_process process left join t_enterprise_info enterprise on process.f_enterprise_id = enterprise.enterprise_id
     </sql>
 
 

zh-baseversion-web/src/views/oldpipesystem/process/index.vue

@@ -80,7 +80,7 @@
 
     <el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange">
       <el-table-column label="项目名称" align="center" prop="fProjectName" />
-      <el-table-column label="县级行政区" align="center" prop="fRegion" :formatter="beyondCountyFormat"></el-table-column>
+      <el-table-column label="燃气企业" align="center" prop="enterpriseName" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column label="关联对象类型" align="center" prop="fRelationObjectType" :formatter="fRelationObjectTypeFormat" />
       <el-table-column label="年度" align="center" prop="fYear">
         <template slot-scope="scope">

zh-baseversion-web/src/views/risk/index.vue

@@ -95,7 +95,7 @@
       <el-table-column label="燃气企业" align="center" prop="fCompanyId"  width="250" :formatter="fCompanyIdFormat"/>
       <el-table-column label="县级行政区" align="center" prop="fRegionId" :formatter="fRegionIdFormat"/>
       <el-table-column label="重要风险点类型" align="center" prop="fRiskType" :formatter="fRiskTypeFormat" :show-overflow-tooltip="true"/>
-      <el-table-column label="备注" align="center" prop="fRemark" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="备注" align="center" prop="fRemark" :show-overflow-tooltip="true"/> -->
       <el-table-column :label="uploadStateLabel" align="center" prop="fUploadType" :formatter="uploadStateFormat"> 
       </el-table-column>
       <el-table-column :label="uploadTimeLabel" align="center" prop="fUploadTime" width="150" :formatter="uploadTimeFormat"> 

zh-baseversion-web/src/views/supplybalance/gas/index.vue

@@ -89,7 +89,7 @@
       </el-table-column>
       <el-table-column label="上报省厅时间" align="center" prop="fGovUploadTime" width="180">
         <template slot-scope="scope">
-          <span v-if="scope.row.fGovUploadTime">{{ parseTime(scope.row.fGovUploadTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span v-if="scope.row.fGovUploadTime">{{ parseTime(scope.row.fGovUploadTime, '{y}-{m}-{d} {h}:{i}') }}</span>
           <span v-else>-</span>
         </template>
       </el-table-column>

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

@@ -43,7 +43,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="备注">
             <span v-if="detailInfo.fRemark">{{ detailInfo.fRemark }}</span>
             <span v-else>-</span>

zh-baseversion-web/src/views/thirdbuild/accident/index.vue

@@ -81,8 +81,10 @@
 
     <el-table v-loading="loading" :data="incList" @selection-change="handleSelectionChange">
       <el-table-column label="项目编码" align="center" prop="projectCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="燃气企业" align="center" prop="fCompanyInfoId" :show-overflow-tooltip="true"/>
+
       <el-table-column label="意外事件标题" align="center" prop="fTitle" :show-overflow-tooltip="true"/>
-      <el-table-column label="意外事件描述" align="center" prop="fDescription" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="意外事件描述" align="center" prop="fDescription" :show-overflow-tooltip="true"/> -->
       <el-table-column label="意外事件发生时间" align="center" prop="fOccurrenctTime" :show-overflow-tooltip="true"/>
       <el-table-column label="附件" align="center" prop="fAttachment">
         <template slot-scope="scope">
@@ -96,14 +98,14 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="fRemark" :show-overflow-tooltip="true">
+      <!-- <el-table-column label="备注" align="center" prop="fRemark" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.fRemark">
             {{ scope.row.fRemark }}
           </span>
           <span v-else>-</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="uploadStateLabel" align="center" prop="uploadState" :formatter="uploadStateFormat" />
       <el-table-column :label="uploadTimeLabel" align="center" prop="uploadTime" :formatter="uploadTimeFormat" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

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

@@ -16,12 +16,12 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="外部工程编码">
             <span v-if="detailInfo.fProjectNo">{{ detailInfo.fProjectNo }}</span>
             <span v-else>-</span>
           </el-form-item>
-        </el-col>
+        </el-col> -->
 
         <el-col :span="12">
           <el-form-item label="施工工程项目名称">

zh-baseversion-web/src/views/thirdbuild/project/index.vue

@@ -93,12 +93,13 @@
 
     <el-table v-loading="loading" :data="inforList" @selection-change="handleSelectionChange"> 
       <el-table-column label="项目编码" align="center" prop="fProjectCode" />
-      <el-table-column label="外部工程编码" align="center" prop="fProjectNo" />
+      <!-- <el-table-column label="外部工程编码" align="center" prop="fProjectNo" /> -->
+      <el-table-column label="燃气企业" align="center" prop="companyInfoName" :show-overflow-tooltip="true"/>
       <el-table-column label="施工工程项目名称" align="center" prop="fProjectName" />
       <el-table-column label="开工时间" align="center" prop="fConstructionStart" />
       <el-table-column label="计划竣工时间" align="center" prop="fConstructionEnd" />
       <el-table-column label="所属县级行政区" align="center" prop="fDistrictId" :formatter="beyondCountyFormat"/>
-      <el-table-column label="涉气施工点位位置属性" align="center" prop="fConstructionPointType" >
+      <el-table-column label="涉气施工点位属性" align="center" prop="fConstructionPointType" >
         <template slot-scope="scope">
           <span v-if="scope.row.fConstructionPointType == '1'">城镇</span>
           <span v-else-if="scope.row.fConstructionPointType == '2'">农村</span>