Merge branch 'master' of http://111.61.77.35:9999/wanghao/zh-baseversion-project

zh-baseversion-admin/src/main/java/com/zehong/web/controller/risk/TRiskDevMajInforController.java

@@ -46,7 +46,9 @@ public class TRiskDevMajInforController extends BaseController
     {
         List<TRiskDevMajInfor> list = tRiskDevMajInforService.exportRiskDevMajInforList(tRiskDevMajInfor);
         ExcelUtil<TRiskDevMajInfor> util = new ExcelUtil<TRiskDevMajInfor>(TRiskDevMajInfor.class);
-        return util.exportExcel(list, "重要风险点管控数据");
+        AjaxResult ajaxResult = util.exportExcel(list, "重要风险点管控数据");
+        ExcelUtil.hiddencolumns.clear();
+        return ajaxResult;
     }
 
     /**
@@ -58,6 +60,14 @@ public class TRiskDevMajInforController extends BaseController
         return AjaxResult.success(tRiskDevMajInforService.selectTRiskDevMajInforById(fRiskDevMajInforId));
     }
 
+    /**
+     * 获取重要风险点管控详细信息
+     */
+    @GetMapping(value = "/getInfoForDetail/{fRiskDevMajInforId}")
+    public AjaxResult getInfoForDetail(@PathVariable("fRiskDevMajInforId") Long fRiskDevMajInforId)
+    {
+        return AjaxResult.success(tRiskDevMajInforService.selectTRiskDevMajInforByIdForDetail(fRiskDevMajInforId));
+    }
     /**
      * 新增重要风险点管控
      */

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supplybalance/TSupBalGasSupController.java

@@ -3,6 +3,7 @@ package com.zehong.web.controller.supplybalance;
 import com.zehong.common.annotation.Log;
 import com.zehong.common.core.controller.BaseController;
 import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.domain.model.LoginUser;
 import com.zehong.common.core.page.TableDataInfo;
 import com.zehong.common.enums.BusinessType;
 import com.zehong.common.utils.SecurityUtils;
@@ -86,23 +87,32 @@ public class TSupBalGasSupController extends BaseController
     @Log(title = "供需平衡-气量监管", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TSupBalGasSup tSupBalGasSup){
-        if("-2".equals(SecurityUtils.getLoginUser().getUser().getDeptId())){
+
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
             tSupBalGasSup.setfRepStatus("1");
         }
         List<TSupBalGasSup> list = tSupBalGasSupService.selectTSupBalGasSupList(tSupBalGasSup);
         ExcelUtil<TSupBalGasSup> util = new ExcelUtil<>(TSupBalGasSup.class);
-        if("-2".equals(SecurityUtils.getLoginUser().getUser().getDeptId())){
-            List<String> columns = new ArrayList<>();
-            columns.add("fRepStatus");
-            columns.add("fRepDate");
-            util.hideColumns(util.clazz,columns);
+        if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
+//            List<String> columns = new ArrayList<>();
+//            columns.add("fRepStatus");
+//            columns.add("fRepDate");
+//            util.hideColumns(util.clazz,columns);
+            ExcelUtil.hiddencolumns.add(6);
+            ExcelUtil.hiddencolumns.add(7);
         }else{
-            List<String> columns = new ArrayList<>();
-            columns.add("fGovUploadStatus");
-            columns.add("fGovUploadTime");
-            util.hideColumns(util.clazz,columns);
+//            List<String> columns = new ArrayList<>();
+//            columns.add("fGovUploadStatus");
+//            columns.add("fGovUploadTime");
+//            util.hideColumns(util.clazz,columns);
+            ExcelUtil.hiddencolumns.add(9);
+            ExcelUtil.hiddencolumns.add(10);
         }
-        return util.exportExcel(list, "供需平衡-气量监管数据");
+        AjaxResult ajaxResult = util.exportExcel(list, "供需平衡-气量监管数据");
+        ExcelUtil.hiddencolumns.clear();
+        return ajaxResult;
     }
 
     /**

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supplybalance/TSupBalStopSupController.java

@@ -3,6 +3,7 @@ package com.zehong.web.controller.supplybalance;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.zehong.common.core.domain.model.LoginUser;
 import com.zehong.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,25 +60,32 @@ public class TSupBalStopSupController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(TSupBalStopSup tSupBalStopSup)
     {
-        if(!"-2".equals(SecurityUtils.getLoginUser().getUser().getDeptId())){
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(loginUser.getUser().getRoles().get(0).getRoleId()==5){
             tSupBalStopSup.setfCompanyInfoId(SecurityUtils.getLoginUser().getUser().getDeptId());
         }else{
             tSupBalStopSup.setfRepStatus("1");
         }
         List<TSupBalStopSup> list = tSupBalStopSupService.selectTSupBalStopSupList(tSupBalStopSup);
         ExcelUtil<TSupBalStopSup> util = new ExcelUtil<TSupBalStopSup>(TSupBalStopSup.class);
-        if("-2".equals(SecurityUtils.getLoginUser().getUser().getDeptId())){
-            List<String> columns = new ArrayList<>();
-            columns.add("fRepStatus");
-            columns.add("entRepTime");
-            util.hideColumns(util.clazz,columns);
+        if(loginUser.getUser().getRoles().get(0).getRoleId()==5){
+//            List<String> columns = new ArrayList<>();
+//            columns.add("fRepStatus");
+//            columns.add("entRepTime");
+//            util.hideColumns(util.clazz,columns);
+            ExcelUtil.hiddencolumns.add(12);
+            ExcelUtil.hiddencolumns.add(13);
         }else{
-            List<String> columns = new ArrayList<>();
-            columns.add("fGovUploadStatus");
-            columns.add("fGovUploadTime");
-            util.hideColumns(util.clazz,columns);
+//            List<String> columns = new ArrayList<>();
+//            columns.add("fGovUploadStatus");
+//            columns.add("fGovUploadTime");
+//            util.hideColumns(util.clazz,columns);
+            ExcelUtil.hiddencolumns.add(8);
+            ExcelUtil.hiddencolumns.add(9);
         }
-        return util.exportExcel(list, "供需平衡-停气监管数据");
+        AjaxResult ajaxResult = util.exportExcel(list, "供需平衡-停气监管数据");
+        ExcelUtil.hiddencolumns.clear();
+        return ajaxResult;
     }
 
     /**

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supplybalance/TSupBalUsgDayController.java

@@ -3,6 +3,7 @@ package com.zehong.web.controller.supplybalance;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.zehong.common.core.domain.model.LoginUser;
 import com.zehong.common.utils.SecurityUtils;
 import com.zehong.system.domain.TSupBalGasSup;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -49,23 +50,30 @@ public class TSupBalUsgDayController extends BaseController
     @Log(title = "供需平衡-企业每日填报", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TSupBalUsgDay tSupBalUsgDay){
-        if("-2".equals(SecurityUtils.getLoginUser().getUser().getDeptId())){
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
             tSupBalUsgDay.setfReportStatus("1");
         }
         List<TSupBalUsgDay> list = tSupBalUsgDayService.selectTSupBalUsgDayList(tSupBalUsgDay);
         ExcelUtil<TSupBalUsgDay> util = new ExcelUtil<TSupBalUsgDay>(TSupBalUsgDay.class);
-        if("-2".equals(SecurityUtils.getLoginUser().getUser().getDeptId())){
-            List<String> columns = new ArrayList<>();
-            columns.add("fReportStatus");
-            columns.add("fReportTime");
-            util.hideColumns(util.clazz,columns);
+        if(loginUser.getUser().getRoles().get(0).getRoleId()==5){
+//            List<String> columns = new ArrayList<>();
+//            columns.add("fReportStatus");
+//            columns.add("fReportTime");
+//            util.hideColumns(util.clazz,columns);
+            ExcelUtil.hiddencolumns.add(24);
+            ExcelUtil.hiddencolumns.add(25);
         }else{
-            List<String> columns = new ArrayList<>();
-            columns.add("fGovUploadStatus");
-            columns.add("fGovUploadTime");
-            util.hideColumns(util.clazz,columns);
+//            List<String> columns = new ArrayList<>();
+//            columns.add("fGovUploadStatus");
+//            columns.add("fGovUploadTime");
+//            util.hideColumns(util.clazz,columns);
+            ExcelUtil.hiddencolumns.add(19);
+            ExcelUtil.hiddencolumns.add(20);
         }
-        return util.exportExcel(list, "供需平衡-企业每日填报数据");
+        AjaxResult ajaxResult = util.exportExcel(list, "供需平衡-企业每日填报数据");
+        ExcelUtil.hiddencolumns.clear();
+        return ajaxResult;
     }
 
     /**

zh-baseversion-admin/src/main/java/com/zehong/web/controller/thirdbuild/TConGasProIncController.java

@@ -53,7 +53,9 @@ public class TConGasProIncController extends BaseController
     {
         List<TConGasProInc> list = tConGasProIncService.exportTConGasProIncList(tConGasProInc);
         ExcelUtil<TConGasProInc> util = new ExcelUtil<TConGasProInc>(TConGasProInc.class);
-        return util.exportExcel(list, "第三方施工-涉气第三方施工意外事件数据");
+        AjaxResult ajaxResult = util.exportExcel(list, "第三方施工-涉气第三方施工意外事件数据");
+        ExcelUtil.hiddencolumns.clear();
+        return ajaxResult;
     }
 
     /**

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

@@ -57,24 +57,26 @@ public class TConGasProInc extends BaseEntity
 
     /**
      * 企业端上传状态 0-未上传，1-已上传*/
-    @Excel(name = "上传状态",readConverterExp = "1=已上传,0=未上传")
+    @Excel(name = "上报状态",readConverterExp = "1=已上报,0=未上报")
     private String entUploadState;
 
     /**
      * 企业端上传时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上传时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date entUploadTime;
 
+    /**
+     * 企业端上传状态 0-未上报，1-已上报*/
+    @Excel(name = "上报省厅状态",readConverterExp = "1=已上报,0=未上报")
+    private String govUploadState;
 
     /**
      * 政府端上传时间 */
+    @Excel(name = "上报省厅时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date govUploadTime;
 
-    /**
-     * 企业端上传状态 0-未上传，1-已上传*/
-    private String govUploadState;
 
     public void updateFields() {
         this.entUploadState = govUploadState;

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

@@ -193,26 +193,26 @@ public class TConGasProInfor extends BaseEntity
 
     /**
      * 企业端上传状态 0-未上传，1-已上传*/
-    @Excel(name = "上传状态",readConverterExp = "1=已上传,0=未上传")
+    @Excel(name = "上报状态",readConverterExp = "1=已上报,0=未上报")
     private String entUploadState;
 
     /**
      * 企业端上传时间 */
-    @Excel(name = "上传时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date entUploadTime;
 
 
     /**
-     * 企业端上传状态 0-未上传，1-已上传*/
-    @Excel(name = "上传状态",readConverterExp = "1=已上传,0=未上传")
+     * 企业端上传状态 0-未上报，1-已上报*/
+    @Excel(name = "上报省厅状态",readConverterExp = "1=已上报,0=未上报")
     private String govUploadState;
 
 
     /**
      * 政府端上传时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上传时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上传省厅时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date govUploadTime;
 
     public void updateFields() {

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

@@ -112,11 +112,11 @@ public class TPipeOldPlanProcess extends BaseEntity
     private Float fFundsDisbursementProgress;
 
     /** 是否已上传，1-是，0-否 */
-    @Excel(name = "上传状态",readConverterExp = "1=已上传,0=未上传")
+    @Excel(name = "上报状态",readConverterExp = "1=已上报,0=未上报")
     private String fUploadType;
 
     /** 上传时间，yyyy-MM-dd hh:mm:ss */
-    @Excel(name = "上传时间")
+    @Excel(name = "上报时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String fUploadTime;
 
@@ -124,12 +124,12 @@ public class TPipeOldPlanProcess extends BaseEntity
      * 政府端上传数据
      */
     /** 是否已上传，1-是，0-否 */
-    @Excel(name = " 上传状态",readConverterExp = "1=已上传,0=未上传")
+    @Excel(name = "上报省厅状态",readConverterExp = "1=已上报,0=未上报")
     private String govUploadState;
 
     /** 政府端上传时间，yyyy-MM-dd hh:mm:ss */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = " 上传时间")
+    @Excel(name = "上报省厅时间")
     private Date govUploadTime;
 
     public String getEnterpriseName() {

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

@@ -30,12 +30,22 @@ public class TRiskDevMajInfor extends BaseEntity
     private String fRiskName;
 
     /** 重要风险点涉及燃气企业编码 */
-    @Excel(name = "重要风险点涉及燃气企业编码")
     private String fCompanyId;
 
+    /**
+     * 企业名称
+     */
+    @Excel(name = "燃气企业")
+    private String companyName;
+
     /** 县级行政区ID */
-    @Excel(name = "县级行政区ID")
-    private String fRegionId;
+    private Long fRegionId;
+
+    /**
+     * 行政区名称
+     */
+    @Excel(name = "县级行政区")
+    private String regionName;
 
     /** 重要风险点类型，1 密闭空间，2 人员密集场
 
@@ -77,24 +87,26 @@ public class TRiskDevMajInfor extends BaseEntity
     /**
      * 企业端上传状态 0-未上传，1-已上传,Excel 企业和政府通用
      */
-    @Excel(name = "上传状态",readConverterExp = "1=已上传,0=未上传")
+    @Excel(name = "上报状态",readConverterExp = "1=已上报,0=未上报")
     private String entUploadState;
 
     /**
      * 企业端上传时间 Excel 企业和政府通用
      */
-    @Excel(name = "上传时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date entUploadTime;
 
     /**
      * 政府端上传 状态
      */
+    @Excel(name = "上报省厅状态",readConverterExp = "1=已上报,0=未上报")
     private String govUploadState;
 
     /**
      * 政府端上传 时间
      */
+    @Excel(name = "上报省厅时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date govUploadTime;
 
@@ -106,7 +118,24 @@ public class TRiskDevMajInfor extends BaseEntity
             this.entUploadTime = null;
         }
     }
-    public void setfRiskDevMajInforId(Long fRiskDevMajInforId) 
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public void setfRiskDevMajInforId(Long fRiskDevMajInforId)
     {
         this.fRiskDevMajInforId = fRiskDevMajInforId;
     }
@@ -142,12 +171,12 @@ public class TRiskDevMajInfor extends BaseEntity
     {
         return fCompanyId;
     }
-    public void setfRegionId(String fRegionId)
+    public void setfRegionId(Long fRegionId)
     {
         this.fRegionId = fRegionId;
     }
 
-    public String getfRegionId()
+    public Long getfRegionId()
     {
         return fRegionId;
     }

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

@@ -48,7 +48,7 @@ public class TSupBalGasSup extends BaseEntity
     private Date fSupDate;
 
     /** 上报状态 0-未上报，1-已上报 */
-    @Excel(name = "上报状态",readConverterExp = "0=未上报,1=已上报",isExport = false)
+    @Excel(name = "上报状态",readConverterExp = "0=未上报,1=已上报")
     private String fRepStatus;
 
     /** 上报日期 */
@@ -81,12 +81,12 @@ public class TSupBalGasSup extends BaseEntity
     private Date endCurrentMonthDate;
 
     /** 政府端上报状态 */
-    @Excel(name = "上报状态",readConverterExp = "0=未上报,1=已上报")
+    @Excel(name = "上报省厅状态",readConverterExp = "0=未上报,1=已上报")
     private String fGovUploadStatus;
 
     /** 政府端上报时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报省厅日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date fGovUploadTime;
 
     public void setfGasSupId(Long fGasSupId) 

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

@@ -69,7 +69,7 @@ public class TSupBalStopSup extends BaseEntity
      * 企业端上传时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间", width = 30)
     private String entRepTime;
 
     /** 停气区域 */
@@ -83,12 +83,12 @@ public class TSupBalStopSup extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    @Excel(name = "上报状态",readConverterExp = "0=未上报,1=已上报")
+    @Excel(name = "上报省厅状态",readConverterExp = "0=未上报,1=已上报")
     private String fGovUploadStatus;
 
     /** 政府端上报时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报省厅时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date fGovUploadTime;
 
     public void setfGasStopId(Long fGasStopId) 

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

@@ -127,12 +127,12 @@ public class TSupBalUsgDay extends BaseEntity
     private Date fCalendarDate;
 
     /** 政府端上报状态0-未上报，1-已上报，默认0 */
-    @Excel(name = "上报状态",readConverterExp = " 0=未上报,1=已上报")
+    @Excel(name = "上报省厅状态",readConverterExp = " 0=未上报,1=已上报")
     private String fGovUploadStatus;
 
     /** 政府端上报时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报省厅时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date fGovUploadTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -21,6 +21,15 @@ public interface TRiskDevMajInforMapper
      */
     public TRiskDevMajInfor selectTRiskDevMajInforById(Long fRiskDevMajInforId);
 
+
+    /**
+     * 查询重要风险点管控
+     *
+     * @param fRiskDevMajInforId 重要风险点管控ID - 详情用
+     * @return 重要风险点管控
+     */
+    public TRiskDevMajInfor selectTRiskDevMajInforByIdForDetail(Long fRiskDevMajInforId);
+
     /**
      * 企业端上传数据
      * @return

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

@@ -19,6 +19,15 @@ public interface ITRiskDevMajInforService
      */
     public TRiskDevMajInfor selectTRiskDevMajInforById(Long fRiskDevMajInforId);
 
+
+    /**
+     * 查询重要风险点管控
+     *
+     * @param fRiskDevMajInforId 重要风险点管控ID - 详情用
+     * @return 重要风险点管控
+     */
+    public TRiskDevMajInfor selectTRiskDevMajInforByIdForDetail(Long fRiskDevMajInforId);
+
     /**
      * 查询重要风险点管控列表
      * 

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

@@ -7,6 +7,7 @@ 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.poi.ExcelUtil;
 import com.zehong.system.domain.TConGasProInc;
 import com.zehong.system.domain.TConGasProInfor;
 import com.zehong.system.domain.vo.TConGasProIncVo;
@@ -84,17 +85,15 @@ public class TConGasProIncServiceImpl implements ITConGasProIncService
 
         LoginUser loginUser = SecurityUtils.getLoginUser();
 
-        // 如果是 政府端 则 把 govUploadState 赋值给 entUploadState, 把 govUploadTime 赋值给 entUploadTime
         if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
             tConGasProInc.setEntUploadState("1");
+            ExcelUtil.hiddencolumns.add(7);
+            ExcelUtil.hiddencolumns.add(8);
         }
 
-        List<TConGasProInc> tConGasProIncs = tConGasProIncMapper.selectTConGasProIncList(tConGasProInc);
-
-        if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
-            if(tConGasProIncs.size() > 0) {
-                return tConGasProIncs.stream().peek(TConGasProInc::updateFields).collect(Collectors.toList());
-            }
+        if(loginUser.getUser().getRoles().get(0).getRoleId()==5){
+            ExcelUtil.hiddencolumns.add(9);
+            ExcelUtil.hiddencolumns.add(10);
         }
 
         return tConGasProIncMapper.selectTConGasProIncList(tConGasProInc);

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

@@ -97,7 +97,6 @@ public class TConGasProInforServiceImpl implements ITConGasProInforService
         if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
             tConGasProInfor.setEntUploadState("1");
         }
-        List<TConGasProInfor> tConGasProInfors = tConGasProInforMapper.exportTConGasProInforList(tConGasProInfor);
 
         if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
             ExcelUtil.hiddencolumns.add(36);

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

@@ -7,6 +7,7 @@ import com.zehong.common.utils.GovernmentDataCopyUtil;
 import com.zehong.common.utils.GovernmentDataUtil;
 import com.zehong.common.utils.SecurityUtils;
 import com.zehong.common.utils.StringUtils;
+import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.system.domain.TConGasProInfor;
 import com.zehong.system.domain.TRiskDevMajInfor;
 import com.zehong.system.domain.vo.TRiskDevMajInfoVo;
@@ -58,6 +59,17 @@ public class TRiskDevMajInforServiceImpl implements ITRiskDevMajInforService
         return tRiskDevMajInforMapper.selectTRiskDevMajInforById(fRiskDevMajInforId);
     }
 
+    /**
+     * 查询重要风险点管控 - 详情使用
+     *
+     * @param fRiskDevMajInforId 重要风险点管控ID
+     * @return 重要风险点管控
+     */
+    @Override
+    public TRiskDevMajInfor selectTRiskDevMajInforByIdForDetail(Long fRiskDevMajInforId) {
+        return tRiskDevMajInforMapper.selectTRiskDevMajInforByIdForDetail(fRiskDevMajInforId);
+    }
+
     /**
      * 查询重要风险点管控列表
      * 
@@ -89,12 +101,12 @@ public class TRiskDevMajInforServiceImpl implements ITRiskDevMajInforService
             tRiskDevMajInfor.setEntUploadState("1");
         }
 
-        List<TRiskDevMajInfor> tRiskDevMajInfors = tRiskDevMajInforMapper.exportRiskDevMajInforList(tRiskDevMajInfor);
-
         if(sysRole.getRoleId()==3){
-            if(tRiskDevMajInfors.size() > 0) {
-                return tRiskDevMajInfors.stream().peek(TRiskDevMajInfor::updateFields).collect(Collectors.toList());
-            }
+            ExcelUtil.hiddencolumns.add(11);
+            ExcelUtil.hiddencolumns.add(12);
+        } else {
+            ExcelUtil.hiddencolumns.add(13);
+            ExcelUtil.hiddencolumns.add(14);
         }
 
         return tRiskDevMajInforMapper.exportRiskDevMajInforList(tRiskDevMajInfor);

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

@@ -50,8 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select f_risk_dev_maj_infor_id,
                f_risk_code,
                f_risk_name,
-               enterprise.enterprise_name as f_company_id,
-               region.f_name as f_region_id,
+               enterprise.enterprise_name as companyName,
+               region.f_name as regionName,
                f_risk_type,
                f_risk_place_detail,
                f_lon,
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTRiskDevMajInforList" parameterType="TRiskDevMajInfor" resultMap="TRiskDevMajInforResult">
-        <include refid="exportRiskDevMajInforVo"/>
+        <include refid="selectTRiskDevMajInforVo"/>
         <where>  
             <if test="fRiskCode != null  and fRiskCode != ''"> and f_risk_code like concat('%', #{fRiskCode}, '%')</if>
             <if test="fRiskName != null  and fRiskName != ''"> and f_risk_name like concat('%', #{fRiskName}, '%')</if>
@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCompanyId != null and fCompanyId != '' "> and f_company_id = #{fCompanyId}</if>
             <if test="govUploadState != null and govUploadState !='' "> and f_gov_upload_state = #{govUploadState}</if>
         </where>
-        order by riskInfor.f_update_time desc
+        order by f_update_time desc
     </select>
 
     <select id="exportRiskDevMajInforList" parameterType="TRiskDevMajInfor" resultMap="TRiskDevMajInforResult">
@@ -97,6 +97,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectTRiskDevMajInforById" parameterType="Long" resultMap="TRiskDevMajInforResult">
+        <include refid="selectTRiskDevMajInforVo"/>
+        where f_risk_dev_maj_infor_id = #{fRiskDevMajInforId}
+    </select>
+
+    <select id="selectTRiskDevMajInforByIdForDetail" parameterType="Long" resultMap="TRiskDevMajInforResult">
         <include refid="exportRiskDevMajInforVo"/>
         where f_risk_dev_maj_infor_id = #{fRiskDevMajInforId}
     </select>

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

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="fCompanyInfoId != null  and fCompanyInfoId != ''"> and da.f_company_info_id = #{fCompanyInfoId}</if>
             <if test="beginRepDate != null and endRepDate != null">and da.f_gov_upload_time between #{beginRepDate} and #{endRepDate}</if>
-            <if test="fReportStatus != null and fReportStatus != ''">da.f_report_status = #{fReportStatus}</if>
+            <if test="fReportStatus != null and fReportStatus != ''">and da.f_report_status = #{fReportStatus}</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and en.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="fCalendarDate != null"> and f_calendar_date = #{fCalendarDate}</if>
             <if test="beginCurrentMonthDate != null and endCurrentMonthDate != null">and da.f_calendar_date between #{beginCurrentMonthDate} and #{endCurrentMonthDate}</if>

zh-baseversion-web/src/api/risk/info.js

@@ -17,6 +17,13 @@ export function getInfor(fRiskDevMajInforId) {
   })
 }
 
+// 查询重要风险点管控详细
+export function getInforForDetail(fRiskDevMajInforId) {
+  return request({
+    url: '/risk/info/getInfoForDetail/' + fRiskDevMajInforId,
+    method: 'get'
+  })
+}
 // 新增重要风险点管控
 export function addInfor(data) {
   return request({

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

@@ -113,13 +113,13 @@
     <el-form label-width="170px">
       <el-row class="el-row-table">   
           <el-col :span="12">
-                <el-form-item label="上报状态" >
+                <el-form-item :label="fUploadTypeLable" >
                   <span>{{fUploadType}}</span> 
                 </el-form-item>
           </el-col>
 
           <el-col :span="12">
-              <el-form-item label="上报时间" >
+              <el-form-item :label="fUploadTimeLable" >
                 <span>{{ fUploadTime }}</span> 
               </el-form-item>
           </el-col>
@@ -150,6 +150,8 @@
           detailInfo: {},
           enterpriseName:"",
           detailOpen: false,
+          fUploadTimeLable: "",
+          fUploadTypeLable: "",
           fUploadType: "",
           fUploadTime: null
         }
@@ -165,9 +167,11 @@
         console.log("roleId == 3" + (roleId == 3))
         if (roleId == 3) {
           this.fUploadType =  this.detailInfo.govUploadState
+          this.fUploadTypeLable = "上报省厅状态"
         }
         if (roleId == 5) {
           this.fUploadType =  this.detailInfo.fUploadType
+          this.fUploadTypeLable = "上报状态"
         }
 
         if (this.fUploadType == '0') {
@@ -181,10 +185,12 @@
 
         let roleId = this.$store.state.user.roleId;
         if (roleId == 3) {
-          this.fUploadTime =  this.detailInfo.govUploadTime
+          this.fUploadTime =  this.detailInfo.govUploadTime 
+          this.fUploadTimeLable = "上报省厅时间"
         }
         if (roleId == 5) {
-          this.fUploadTime =  this.detailInfo.fUploadTime
+          this.fUploadTime =  this.detailInfo.fUploadTime 
+          this.fUploadTimeLable = "上报时间"
         }
       },
       //获取县级

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

@@ -112,9 +112,9 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报状态" align="center" prop="fUploadType" :formatter="uploadStateFormat"> 
+      <el-table-column :label="fUploadTypeLable" align="center" prop="fUploadType" :formatter="uploadStateFormat"> 
       </el-table-column>
-      <el-table-column label="上报时间" align="center" prop="fUploadTime" width="150" :formatter="uploadTimeFormat"> 
+      <el-table-column :label="fUploadTimeLable" align="center" prop="fUploadTime" width="150" :formatter="uploadTimeFormat"> 
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template slot-scope="scope">
@@ -339,6 +339,8 @@ export default {
       isDisabledEnterprise: false,
       enterprises: [],
       countyInfo: [],
+      fUploadTypeLable: "",
+      fUploadTimeLable: "",
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -495,12 +497,14 @@ export default {
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
       if (roleId == 5) {
+        this.fUploadTypeLable = "上报状态"
         if (row.fUploadType == '0') {
           return "未上报"
         } else{
           return "已上报"
         } 
       } else { 
+        this.fUploadTypeLable = "上报省厅状态"
         if (row.govUploadState == '0') {
           return "未上报"
         } else{
@@ -513,8 +517,10 @@ export default {
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
       if (roleId == 5) {
+        this.fUploadTimeLable = "上报时间"
         return row.fUploadTime;
       } else {
+        this.fUploadTimeLable = "上报省厅时间"
         return row.govUploadTime;
       }
 

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

@@ -18,14 +18,14 @@
 
           <el-col :span="12">
             <el-form-item label="燃气企业"> 
-              <span v-if="detailInfo.fCompanyId">{{ detailInfo.fCompanyId }}</span>
+              <span v-if="detailInfo.companyName">{{ detailInfo.companyName }}</span>
               <span v-else>-</span>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="县级行政区">
-              <span v-if="detailInfo.fRegionId">{{ detailInfo.fRegionId }}</span>
+              <span v-if="detailInfo.regionName">{{ detailInfo.regionName }}</span>
               <span v-else>-</span>
             </el-form-item>
           </el-col>
@@ -77,13 +77,13 @@
     <el-form label-width="170px">
       <el-row class="el-row-table">   
           <el-col :span="12">
-                <el-form-item label="上报状态" >
+                <el-form-item :label="fUploadTypeLable" >
                   <span>{{fUploadType}}</span> 
                 </el-form-item>
           </el-col>
 
           <el-col :span="12">
-              <el-form-item label="上报时间" >
+              <el-form-item :label="fUploadTimeLabel" >
                 <span>{{ fUploadTime }}</span> 
               </el-form-item>
           </el-col>
@@ -101,12 +101,16 @@
 </template>
 
 <script>
-  import { getInfor } from "@/api/risk/info";
+  import { getInforForDetail } from "@/api/risk/info";
   import { EditorMap } from "@/utils/mapClass/getPath.js";
+  import { getDefaultCountyList } from "@/api/area/county";
+  import { enterpriseLists } from "@/api/regulation/info";
   export default {
     name: "detail-info",
     data(){
         return{
+          fUploadTypeLable: "",
+          fUploadTimeLabel: "",
           enterprises: [],
           countyInfo: [],
           detailInfo: {},
@@ -123,6 +127,8 @@
         }
       }
     },
+    created(){
+    },
     methods:{
       //获取县级
       getCountyInfo(){
@@ -134,9 +140,10 @@
       },
       //所属单位
       getEnterpriseLists(){ 
-        queryAllEnterprise().then(response => { 
-          this.enterprises = response; 
-        }); 
+        const param = {};
+          enterpriseLists(param).then(response => {
+            this.enterprises = response.rows; 
+        });
       },
       beyondCountyFormat(row){
         let info = this.countyInfo.find(item => item.fId == row.fRegionId);
@@ -151,9 +158,11 @@
         let roleId = this.$store.state.user.roleId;
         console.log("roleId == 3" + (roleId == 3))
         if (roleId == 3) {
+          this.fUploadTypeLable = "上报省厅状态"
           this.fUploadType =  this.detailInfo.govUploadState
         }
         if (roleId == 5) {
+          this.fUploadTypeLable = "上报状态"
           this.fUploadType =  this.detailInfo.entUploadState
         }
 
@@ -169,15 +178,17 @@
         let roleId = this.$store.state.user.roleId;
         if (roleId == 3) {
           this.fUploadTime =  this.detailInfo.govUploadTime
+          this.fUploadTimeLabel = "上报省厅时间"
         }
         if (roleId == 5) {
           this.fUploadTime =  this.detailInfo.entUploadTime
+          this.fUploadTimeLabel = "上报时间"
         }
       },
       getDetailInfo(id){
-        getInfor(id).then(res =>{
-          if(res.code == 200 && res.data){
-            this.detailInfo = res.data;
+        getInforForDetail(id).then(res =>{
+          if(res.code == 200 && res.data){ 
+            this.detailInfo = res.data; 
             this.showUploadType();
             this.showUploadTime();
             this.detailOpen = true;

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

@@ -92,13 +92,13 @@
     <el-table v-loading="loading" :data="inforList" @selection-change="handleSelectionChange"> 
       <el-table-column label="重要风险点编码" align="center" prop="fRiskCode" />
       <el-table-column label="重要风险点名称" align="center" prop="fRiskName" :show-overflow-tooltip="true"/>
-      <el-table-column label="燃气企业" align="center" prop="fCompanyId"  width="250"/>
-      <el-table-column label="县级行政区" align="center" prop="fRegionId" />
+      <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="fUploadType" :formatter="uploadStateFormat"> 
+      <el-table-column :label="uploadStateLabel" align="center" prop="fUploadType" :formatter="uploadStateFormat"> 
       </el-table-column>
-      <el-table-column label="上报时间" align="center" prop="fUploadTime" width="150" :formatter="uploadTimeFormat"> 
+      <el-table-column :label="uploadTimeLabel" align="center" prop="fUploadTime" width="150" :formatter="uploadTimeFormat"> 
       </el-table-column>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -169,11 +169,7 @@
           <el-col :span="12">
             <el-form-item label="县级行政区" prop="fRegionId"> 
               
-              <el-select
-                v-model="form.fRegionId"
-                placeholder="请选择县级行政区"
-                style="width: 100%"
-              >
+              <el-select v-model="form.fRegionId" placeholder="请选择县级行政区" style="width: 100%" >
                 <el-option
                   v-for="county in countyInfo"
                   :key="county.fId"
@@ -271,6 +267,8 @@ export default {
   },
   data() {
     return {
+      uploadStateLabel:"",
+      uploadTimeLabel:"",
       // 遮罩层
       loading: true,
       user:{},
@@ -356,7 +354,7 @@ export default {
     //判断 上报是否需要显示，上报分为企业上报 和 政府端上报
     judgeUploadIsShow(row) { 
 
-      //角色 1 超级管理员  5 企业
+      //角色 3 政府角色 5 企业角色
       let roleId = this.user.roleId;
 
       // 企业端 上报状态 0-未上报，1-已上报
@@ -373,8 +371,12 @@ export default {
       // 如果企业端上报了，则企业端就不能显示了，政府端和 超级管理员能显示
       if(entUploadState === '1' && govUploadState === '0') {
         if (roleId === 5) {
+          this.uploadStateLabel = "上报状态"
+          this.uploadTimeLabel = "上报时间"
           return false;
         } else {
+          this.uploadStateLabel = "上报省厅状态"
+          this.uploadTimeLabel = "上报省厅时间"
           return true;
         }
       }
@@ -422,6 +424,18 @@ export default {
         this.loading = false;
       });
     },
+    
+    // 燃气企业
+    fCompanyIdFormat(row, column) {  
+      let info = this.enterprises.find(item => item.enterpriseId == row.fCompanyId);
+      return info?info.enterpriseName:"-";
+    },
+    
+    // 行政区
+    fRegionIdFormat(row, column) {  
+      let info = this.countyInfo.find(item => item.fId == row.fRegionId);
+      return info?info.fName:"-";
+    },
     // 重要风险点类型，1 密闭空间，2 人员密集场
     fRiskTypeFormat(row, column) {
       const riskType = this.selectDictLabel(this.fRiskTypeOptions, row.fRiskType);
@@ -488,6 +502,11 @@ export default {
       getInfor(fRiskDevMajInforId).then(response => {
         this.form = response.data;
         this.open = true;
+      // 说明是 企业在新增，直接赋值显示就行了。
+      if (this.enterprises.length == 1) {
+        this.form.fCompanyId = this.enterprises[0].enterpriseId 
+        this.isDisabledEnterprise = true;
+      }
         this.title = "修改重要风险点管控";
       });
     },

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

@@ -162,22 +162,26 @@
 
     <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-row class="el-row-table">     
         
         <el-col :span="12">
-          <el-form-item label="企业端上报时间">
-            <span v-if="detailInfo.fReportTime">{{ detailInfo.fReportTime }}</span>
-            <span v-else>-</span>
-          </el-form-item>
-        </el-col>
+                <el-form-item label="上报省厅状态" >
+                  <span>{{fUploadType}}</span> 
+                </el-form-item>
+          </el-col>
+
+          <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.fReportTime }}</span>
+            </el-form-item>
+          </el-col>   
+         
       </el-row>
     </el-form>
 
@@ -192,6 +196,8 @@
     name: "detail-info",
     data(){
         return{
+          fUploadType: "",
+          fUploadTime: null,
           detailInfo: {
             fDeleteFlag: 0
           },
@@ -199,10 +205,39 @@
         }
     },
     methods:{
+      //根据不同角色显示不同字段
+      showUploadType() {
+        let roleId = this.$store.state.user.roleId;
+        if (roleId == 3) {
+          this.fUploadType =  this.detailInfo.fGovUploadStatus
+        }
+        if (roleId == 5) {
+          this.fUploadType =  this.detailInfo.fRepStatus
+        }
+
+        if (this.fUploadType == '0') {
+          this.fUploadType = "未上报"
+        }
+        if (this.fUploadType == '1') {
+          this.fUploadType = "已上报"
+        }
+      },
+      showUploadTime() {
+
+        let roleId = this.$store.state.user.roleId;
+        if (roleId == 3) {
+          this.fUploadTime =  this.detailInfo.fGovUploadTime
+        }
+        if (roleId == 5) {
+          this.fUploadTime =  this.detailInfo.entRepTime
+        }
+      },
       getDetailInfo(id){
         getDay(id).then(res =>{
           if(res.code == 200 && res.data){
             this.detailInfo = res.data;
+            this.showUploadType();
+            this.showUploadTime();
             this.detailOpen = true;
           }
         })

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

@@ -104,14 +104,14 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="上报状态" align="center" prop="fGovUploadStatus">
+        <el-table-column label="上报省厅状态" align="center" prop="fGovUploadStatus">
           <template slot-scope="scope">
             <span v-if="scope.row.fGovUploadStatus == '0'">未上报</span>
             <span v-else-if="scope.row.fGovUploadStatus == '1'">已上报</span>
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="上报日期" align="center" prop="fGovUploadTime" width="180">
+        <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-else>-</span>

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

@@ -70,21 +70,26 @@
 
     <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-row class="el-row-table">      
         
         <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-form-item label="上报省厅状态" >
+                  <span>{{fUploadType}}</span> 
+                </el-form-item>
+          </el-col>
+
+          <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.fRepDate }}</span>
+            </el-form-item>
+          </el-col>   
+        
       </el-row>
     </el-form>
 
@@ -99,6 +104,8 @@
     name: "detail-info",
     data(){
         return{
+          fUploadType: "",
+          fUploadTime: null,
           detailInfo: {
             fDeleteFlag: 0
           },
@@ -106,10 +113,39 @@
         }
     },
     methods:{
+      //根据不同角色显示不同字段
+      showUploadType() {
+        let roleId = this.$store.state.user.roleId;
+        if (roleId == 3) {
+          this.fUploadType =  this.detailInfo.fGovUploadStatus
+        }
+        if (roleId == 5) {
+          this.fUploadType =  this.detailInfo.fRepStatus
+        }
+
+        if (this.fUploadType == '0') {
+          this.fUploadType = "未上报"
+        }
+        if (this.fUploadType == '1') {
+          this.fUploadType = "已上报"
+        }
+      },
+      showUploadTime() {
+
+        let roleId = this.$store.state.user.roleId;
+        if (roleId == 3) {
+          this.fUploadTime =  this.detailInfo.fGovUploadTime
+        }
+        if (roleId == 5) {
+          this.fUploadTime =  this.detailInfo.entRepTime
+        }
+      },
       getDetailInfo(id){
         getSup(id).then(res =>{
           if(res.code == 200 && res.data){
             this.detailInfo = res.data;
+            this.showUploadType();
+            this.showUploadTime();
             this.detailOpen = true;
           }
         })

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

@@ -80,14 +80,14 @@
       <el-table-column label="供气量/wm³" align="center" prop="fSupGasVol" />
       <el-table-column label="存储量/wm³" align="center" prop="fStorageVol" />
       <el-table-column label="监管气量日期" align="center" prop="fSupDate" />
-      <el-table-column label="上报状态" align="center" prop="fGovUploadStatus">
+      <el-table-column label="上报省厅状态" align="center" prop="fGovUploadStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.fGovUploadStatus == '0'">未上报</span>
           <span v-else-if="scope.row.fGovUploadStatus == '1'">已上报</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报日期" align="center" prop="fGovUploadTime" width="180">
+      <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-else>-</span>

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

@@ -103,20 +103,24 @@
     <el-form label-width="170px">
       <el-row class="el-row-table">    
         
+          <el-col :span="12">
+                <el-form-item :label="fUploadTypeLable"  >
+                  <span>{{fUploadType}}</span> 
+                </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+              <el-form-item :label="fUploadTimeLable" >
+                <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.entRepTime }}</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.entRepTime">{{ detailInfo.entRepTime }}</span>
-            <span v-else>-</span>
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
 
@@ -137,6 +141,10 @@
           detailOpen: false,
           stopLog: [],
           total: 0,
+          fUploadType: "",
+          fUploadTime: null,
+          fUploadTimeLable: "",
+          fUploadTypeLable: "",
           queryParams: {
             pageNum: 1,
             pageSize: 5,
@@ -156,11 +164,44 @@
       }
     },
     methods:{
+      //根据不同角色显示不同字段
+      showUploadType() {
+        let roleId = this.$store.state.user.roleId;
+        if (roleId == 3) {
+          this.fUploadType =  this.detailInfo.fGovUploadStatus
+          this.fUploadTypeLable = "上报省厅状态"
+        }
+        if (roleId == 5) {
+          this.fUploadType =  this.detailInfo.fRepStatus
+          this.fUploadTypeLable = "上报状态"
+        }
+
+        if (this.fUploadType == '0') {
+          this.fUploadType = "未上报"
+        }
+        if (this.fUploadType == '1') {
+          this.fUploadType = "已上报"
+        }
+      },
+      showUploadTime() {
+
+        let roleId = this.$store.state.user.roleId;
+        if (roleId == 3) {
+          this.fUploadTime =  this.detailInfo.fGovUploadTime
+          this.fUploadTimeLable = "上报省厅时间"
+        }
+        if (roleId == 5) {
+          this.fUploadTime =  this.detailInfo.entRepTime
+          this.fUploadTimeLable = "上报时间"
+        }
+      },
       getDetailInfo(id){
         this.queryParams.fGasStopId = id;
         getSup(id).then(res =>{
           if(res.code == 200 && res.data){
             this.detailInfo = res.data;
+            this.showUploadType();
+            this.showUploadTime();
             this.detailOpen = true;
           }
         })

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

@@ -114,27 +114,27 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报状态" align="center" prop="fRepStatus" v-if="-2 != $store.state.user.enterpriseId">
+      <el-table-column label="上报状态" align="center" prop="fRepStatus" v-if="this.$store.state.user.roleId == 5">
         <template slot-scope="scope">
           <span v-if="scope.row.fRepStatus == '0'">未上报</span>
           <span v-else-if="scope.row.fRepStatus == '1'">已上报</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报时间" align="center" prop="entRepTime" width="150" v-if="-2 != $store.state.user.enterpriseId">
+      <el-table-column label="上报时间" align="center" prop="entRepTime" width="150" v-if="this.$store.state.user.roleId == 5">
         <template slot-scope="scope">
           <span v-if="scope.row.entRepTime">{{ parseTime(scope.row.entRepTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报状态" align="center" prop="fGovUploadStatus" v-if="-2 == $store.state.user.enterpriseId">
+      <el-table-column label="上报省厅状态" align="center" prop="fGovUploadStatus" v-if="this.$store.state.user.roleId == 3">
         <template slot-scope="scope">
           <span v-if="scope.row.fGovUploadStatus == '0'">未上报</span>
           <span v-else-if="scope.row.fGovUploadStatus == '1'">已上报</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报时间" align="center" prop="fRecoveryGasTime" width="150" v-if="-2 == $store.state.user.enterpriseId">
+      <el-table-column label="上报省厅时间" align="center" prop="fRecoveryGasTime" width="150" v-if="this.$store.state.user.roleId == 3">
         <template slot-scope="scope">
           <span v-if="scope.row.fGovUploadTime">{{ parseTime(scope.row.fGovUploadTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           <span v-else>-</span>

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

@@ -56,13 +56,13 @@
     <el-form label-width="170px">
       <el-row class="el-row-table">   
           <el-col :span="12">
-                <el-form-item label="上报状态" >
+                <el-form-item :label="fUploadTypeLable" >
                   <span>{{fUploadType}}</span> 
                 </el-form-item>
           </el-col>
 
           <el-col :span="12">
-              <el-form-item label="上报时间" >
+              <el-form-item :label="fUploadTimeLabel" >
                 <span>{{ fUploadTime }}</span> 
               </el-form-item>
           </el-col>
@@ -86,6 +86,8 @@
     data(){
         return{
           detailInfo: {},
+          fUploadTypeLable: "",
+          fUploadTimeLabel: "",
           detailOpen: false,
           fUploadType: "",
           fUploadTime: null
@@ -97,9 +99,11 @@
         let roleId = this.$store.state.user.roleId;
         if (roleId == 3) {
           this.fUploadType =  this.detailInfo.govUploadState
+          this.fUploadTypeLable = "上报省厅状态"
         }
         if (roleId == 5) {
           this.fUploadType =  this.detailInfo.entUploadState
+          this.fUploadTypeLable = "上报状态"
         }
 
         if (this.fUploadType == '0') {
@@ -114,9 +118,11 @@
         let roleId = this.$store.state.user.roleId;
         if (roleId == 3) {
           this.fUploadTime =  this.detailInfo.govUploadTime
+          this.fUploadTimeLabel = "上报省厅时间"
         }
         if (roleId == 5) {
           this.fUploadTime =  this.detailInfo.entUploadTime
+          this.fUploadTimeLabel = "上报时间"
         }
       },
       getDetailInfo(id){

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

@@ -104,8 +104,8 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报状态" align="center" prop="uploadState" :formatter="uploadStateFormat" />
-      <el-table-column label="上报时间" align="center" prop="uploadTime" :formatter="uploadTimeFormat" />
+      <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">
         <template slot-scope="scope">
           <el-button
@@ -240,6 +240,8 @@ export default {
   data() {
     return {
       user:{},
+      uploadStateLabel:"",
+      uploadTimeLabel:"",
       enterprises: [],
       // 遮罩层
       loading: true,
@@ -329,12 +331,14 @@ export default {
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
       if (roleId == 5) {
+        this.uploadStateLabel = "上报状态"
         if (row.entUploadState == '0') {
           return "未上报"
         } else{
           return "已上报"
         } 
       } else { 
+        this.uploadStateLabel = "上报省厅状态"
         if (row.govUploadState == '0') {
           return "未上报"
         } else{
@@ -347,8 +351,10 @@ export default {
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
       if (roleId == 5) {
+        this.uploadTimeLabel = "上报时间"
         return row.entUploadTime;
       } else {
+        this.uploadTimeLabel = "上报省厅时间"
         return row.govUploadTime;
       }
 

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

@@ -251,13 +251,13 @@
     <el-form label-width="170px">
       <el-row class="el-row-table">   
           <el-col :span="12">
-                <el-form-item label="上报状态" >
+                <el-form-item :label="fUploadTypeLable" >
                   <span>{{fUploadType}}</span> 
                 </el-form-item>
           </el-col>
 
           <el-col :span="12">
-              <el-form-item label="上报时间" >
+              <el-form-item :label="fUploadTimeLabel" >
                 <span>{{ fUploadTime }}</span> 
               </el-form-item>
           </el-col>
@@ -284,6 +284,8 @@
         return{
           enterprises: [],
           countyInfo: [],
+          fUploadTypeLable: "",
+          fUploadTimeLabel: "",
           enterpriseName:"",
           detailInfo: {},
           detailOpen: false,
@@ -302,9 +304,11 @@
         let roleId = this.$store.state.user.roleId;
         if (roleId == 3) {
           this.fUploadType =  this.detailInfo.govUploadState
+          this.fUploadTypeLable = "上报省厅状态"
         }
         if (roleId == 5) {
           this.fUploadType =  this.detailInfo.entUploadState
+          this.fUploadTypeLable = "上报状态"
         }
 
         if (this.fUploadType == '0') {
@@ -319,9 +323,11 @@
         let roleId = this.$store.state.user.roleId;
         if (roleId == 3) {
           this.fUploadTime =  this.detailInfo.govUploadTime
+          this.fUploadTimeLabel = "上报省厅时间"
         }
         if (roleId == 5) {
           this.fUploadTime =  this.detailInfo.entUploadTime
+          this.fUploadTimeLabel = "上报时间"
         }
       },
       //获取县级

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

@@ -106,8 +106,8 @@
         </template>
       </el-table-column>
       <el-table-column label="管道压力等级分类" align="center" prop="fPipePress" :formatter="fPipePressFormat" />
-      <el-table-column label="上报状态" align="center" prop="uploadState" :formatter="uploadStateFormat" />
-      <el-table-column label="上报时间" align="center" prop="uploadTime" :formatter="uploadTimeFormat" />
+      <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" width="210">
         <template slot-scope="scope">
           <el-button
@@ -498,6 +498,8 @@ export default {
   },
   data() {
     return {
+      uploadStateLabel:"",
+      uploadTimeLabel:"",
       enterpriseName:"",
       enterprises: [],
       user:{},
@@ -642,12 +644,14 @@ export default {
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
       if (roleId == 5) {
+        this.uploadStateLabel = "上报状态"
         if (row.entUploadState == '0') {
           return "未上报"
         } else{
           return "已上报"
         } 
       } else { 
+        this.uploadStateLabel = "上报省厅状态"
         if (row.govUploadState == '0') {
           return "未上报"
         } else{
@@ -660,8 +664,10 @@ export default {
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
       if (roleId == 5) {
+        this.uploadTimeLabel = "上报时间"
         return row.entUploadTime;
       } else {
+        this.uploadTimeLabel = "上报省厅时间"
         return row.govUploadTime;
       }