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

zh-baseversion-admin/src/main/java/com/zehong/web/controller/oldpipesystem/TPipeOldPlanProcessController.java

@@ -107,7 +107,7 @@ public class TPipeOldPlanProcessController extends BaseController
     }
 
     /**
-     * 上传计划和进度
+     * 政府端 上传计划和进度
      * @param fOldPlanProcessId 计划id
      * @return
      */
@@ -120,4 +120,14 @@ public class TPipeOldPlanProcessController extends BaseController
             return AjaxResult.error("上传计划和进度接口异常");
         }
     }
+
+    /**
+     * 企业端 上传计划和进度
+     * @param fOldPlanProcessId 计划id
+     * @return
+     */
+    @GetMapping("/entReportPipeOldPlanProcess")
+    public AjaxResult entReportPipeOldPlanProcess(Long fOldPlanProcessId) {
+        return toAjax(tPipeOldPlanProcessService.entReportPipeOldPlanProcess(fOldPlanProcessId));
+    }
 }

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TEnterpriseInfoController.java

@@ -74,6 +74,18 @@ public class TEnterpriseInfoController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     *无条件查询所有企业
+     * @return
+     */
+    @GetMapping("/queryAllEnterprise")
+    public List<TEnterpriseInfo> queryAllEnterprise()
+    {
+        //获取用户信息
+        return tEnterpriseInfoService.queryAllEnterprise();
+    }
+
+
     /**
      *查询所有企业信息
      * @param tEnterpriseInfo

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

@@ -109,4 +109,15 @@ public class TConGasProIncController extends BaseController
             return AjaxResult.error("上传第三方施工意外事件接口异常");
         }
     }
+
+
+    /**
+     * 企业端上传第三方施工意外事件
+     * @param fConGasProIncId 第三方施工意外事件id
+     * @return
+     */
+    @GetMapping("/entReportConGasProInfo")
+    public AjaxResult entReportConGasProInfo(Long fConGasProIncId){
+        return toAjax(tConGasProIncService.entReportConGasProInfo(fConGasProIncId));
+    }
 }

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

 package com.zehong.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 第三方施工-涉气第三方施工意外事件对象 t_con_gas_pro_inc
  * 
@@ -48,6 +51,68 @@ public class TConGasProInc extends BaseEntity
     @Excel(name = "最后修改时间")
     private String fUpdateTime;
 
+    /**
+     * 企业端上传时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date entUploadTime;
+
+    /**
+     * 企业端上传状态 0-未上传，1-已上传*/
+    private String entUploadState;
+
+    /**
+     * 政府端上传时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date govUploadTime;
+
+    /**
+     * 企业端上传状态 0-未上传，1-已上传*/
+    private String govUploadState;
+
+    /** 燃气企业编码 */
+    @Excel(name = "燃气企业编码")
+    private String fCompanyInfoId;
+
+    public Date getEntUploadTime() {
+        return entUploadTime;
+    }
+
+    public void setEntUploadTime(Date entUploadTime) {
+        this.entUploadTime = entUploadTime;
+    }
+
+    public String getEntUploadState() {
+        return entUploadState;
+    }
+
+    public void setEntUploadState(String entUploadState) {
+        this.entUploadState = entUploadState;
+    }
+
+    public Date getGovUploadTime() {
+        return govUploadTime;
+    }
+
+    public void setGovUploadTime(Date govUploadTime) {
+        this.govUploadTime = govUploadTime;
+    }
+
+    public String getGovUploadState() {
+        return govUploadState;
+    }
+
+    public void setGovUploadState(String govUploadState) {
+        this.govUploadState = govUploadState;
+    }
+
+    public String getfCompanyInfoId() {
+        return fCompanyInfoId;
+    }
+
+    public void setfCompanyInfoId(String fCompanyInfoId) {
+        this.fCompanyInfoId = fCompanyInfoId;
+    }
+
     public void setfConGasProIncId(Long fConGasProIncId)
     {
         this.fConGasProIncId = fConGasProIncId;

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

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 老旧管网-改造计划和进度对象 t_pipe_old_plan_process
  * 
@@ -89,11 +91,11 @@ public class TPipeOldPlanProcess extends BaseEntity
 
     /** 当前改造进度，填写百分比，100为完成 */
     @Excel(name = "当前改造进度")
-    private Long fReconstructionProgress;
+    private Float fReconstructionProgress;
 
     /** 当前资金拨付进度，填写百分比，100为完成 */
     @Excel(name = "当前资金拨付进度")
-    private Long fFundsDisbursementProgress;
+    private Float fFundsDisbursementProgress;
 
     /** 是否已上传，1-是，0-否 */
     @Excel(name = "是否已上传",readConverterExp = "1=是,0=否")
@@ -105,6 +107,29 @@ public class TPipeOldPlanProcess extends BaseEntity
 
     private Long fEnterpriseId;
 
+    /**
+     * 政府端上传数据
+     */
+    private String govUploadState;
+
+    private Date govUploadTime;
+
+    public String getGovUploadState() {
+        return govUploadState;
+    }
+
+    public void setGovUploadState(String govUploadState) {
+        this.govUploadState = govUploadState;
+    }
+
+    public Date getGovUploadTime() {
+        return govUploadTime;
+    }
+
+    public void setGovUploadTime(Date govUploadTime) {
+        this.govUploadTime = govUploadTime;
+    }
+
     public Long getfEnterpriseId() {
         return fEnterpriseId;
     }
@@ -266,21 +291,21 @@ public class TPipeOldPlanProcess extends BaseEntity
     {
         return fActualFinishTime;
     }
-    public void setfReconstructionProgress(Long fReconstructionProgress) 
+    public void setfReconstructionProgress(Float fReconstructionProgress)
     {
         this.fReconstructionProgress = fReconstructionProgress;
     }
 
-    public Long getfReconstructionProgress() 
+    public Float getfReconstructionProgress()
     {
         return fReconstructionProgress;
     }
-    public void setfFundsDisbursementProgress(Long fFundsDisbursementProgress) 
+    public void setfFundsDisbursementProgress(Float fFundsDisbursementProgress)
     {
         this.fFundsDisbursementProgress = fFundsDisbursementProgress;
     }
 
-    public Long getfFundsDisbursementProgress() 
+    public Float getfFundsDisbursementProgress()
     {
         return fFundsDisbursementProgress;
     }

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

 package com.zehong.system.mapper;
 
+import java.util.Date;
 import java.util.List;
 import com.zehong.system.domain.TConGasProInc;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 第三方施工-涉气第三方施工意外事件Mapper接口
@@ -43,6 +45,11 @@ public interface TConGasProIncMapper
      */
     public int updateTConGasProInc(TConGasProInc tConGasProInc);
 
+    /**
+     *
+     * 根据id修改 企业端上传状态*/
+    public int updateEntUploadStateById(@Param("state")  String state, @Param("entUploadTime") Date entUploadTime,
+                                        @Param("fConGasProIncId") Long fConGasProIncId);
     /**
      * 删除第三方施工-涉气第三方施工意外事件
      * 

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

@@ -35,6 +35,12 @@ public interface TEnterpriseInfoMapper
      */
     public List<TEnterpriseInfo> selectTEnterpriseInfoList(TEnterpriseInfo tEnterpriseInfo);
 
+    /**
+     * 无条件查询所有企业
+     * @return r
+     */
+    public List<TEnterpriseInfo> queryAllEnterprise();
+
     /**
      * 新增企业信息
      * 

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

 package com.zehong.system.mapper;
 
+import java.util.Date;
 import java.util.List;
 import com.zehong.system.domain.TPipeOldPlanProcess;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 老旧管网-改造计划和进度Mapper接口
@@ -43,6 +45,13 @@ public interface TPipeOldPlanProcessMapper
      */
     public int updateTPipeOldPlanProcess(TPipeOldPlanProcess tPipeOldPlanProcess);
 
+    /**
+     * 企业端上传数据
+     * @return
+     */
+    public int entReportPipeOldPlanProcess(@Param("state")  String state, @Param("entUploadTime") Date entUploadTime,
+                                           @Param("fOldPlanProcessId") Long fOldPlanProcessId);
+
     /**
      * 删除老旧管网-改造计划和进度
      * 

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

@@ -65,4 +65,11 @@ public interface ITConGasProIncService
      * @return
      */
     int reportAccidentInfo(Long fConGasProIncId) throws Exception ;
+
+    /**
+     * 企业端上传第三方施工意外事件
+     * @param fConGasProIncId 意外事件工id
+     * @return
+     */
+    int entReportConGasProInfo(Long fConGasProIncId);
 }

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

@@ -30,6 +30,11 @@ public interface ITEnterpriseInfoService
      */
     public List<TEnterpriseInfo> selectTEnterpriseInfoList(TEnterpriseInfo tEnterpriseInfo);
 
+    /**
+     * 无条件查询所有企业
+     */
+    public List<TEnterpriseInfo> queryAllEnterprise();
+
     /**
      * 新增企业信息
      *

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

@@ -65,4 +65,11 @@ public interface ITPipeOldPlanProcessService
      * @return
      */
     int reportPipeOldPlanProcess(Long fOldPlanProcessId) throws Exception;
+
+    /**
+     * 企业端上传 计划
+     * @param fOldPlanProcessId f
+     * @return r
+     */
+    int entReportPipeOldPlanProcess(Long fOldPlanProcessId);
 }

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

 package com.zehong.system.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.zehong.common.core.domain.entity.SysRole;
 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.system.domain.TConGasProInc;
 import com.zehong.system.domain.vo.TConGasProIncVo;
 import com.zehong.system.mapper.TConGasProIncMapper;
@@ -30,7 +32,7 @@ public class TConGasProIncServiceImpl implements ITConGasProIncService
 {
     private static final Logger log = LoggerFactory.getLogger(TConGasProIncServiceImpl.class);
 
-    @Autowired
+    @Resource
     private TConGasProIncMapper tConGasProIncMapper;
 
     @Resource
@@ -58,6 +60,12 @@ public class TConGasProIncServiceImpl implements ITConGasProIncService
     @Override
     public List<TConGasProInc> selectTConGasProIncList(TConGasProInc tConGasProInc)
     {
+        SysRole sysRole = SecurityUtils.getLoginUser().getUser().getRoles().get(0);
+        // 不是超级管理员也不是企业
+        if (sysRole.getRoleId() != 1 && sysRole.getRoleId() != 5) {
+            tConGasProInc.setEntUploadState("1");
+        }
+
         return tConGasProIncMapper.selectTConGasProIncList(tConGasProInc);
     }
 
@@ -127,6 +135,20 @@ public class TConGasProIncServiceImpl implements ITConGasProIncService
         JSONObject reportResult = governmentDataUtil.setInfo("construction/gas/project/incident","WRITE",data);
         log.info("上传第三方施工意外事件结果===================" + reportResult.toJSONString());
         if(!"0".equals(reportResult.getString("resultCode"))) throw new CustomException("上传第三方施意外事件工接口失败");
+        conGasProInc.setGovUploadState("1");
+        conGasProInc.setGovUploadTime(new Date());
+        tConGasProIncMapper.updateTConGasProInc(conGasProInc);
+        return 1;
+    }
+
+    /**
+     * 企业端上传
+     * @param fConGasProIncId 意外事件工id
+     * @return r
+     */
+    @Override
+    public int entReportConGasProInfo(Long fConGasProIncId) {
+        tConGasProIncMapper.updateEntUploadStateById("1",new Date(),fConGasProIncId);
         return 1;
     }
 }

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

@@ -76,6 +76,16 @@ public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService
         return tEnterpriseInfoMapper.selectTEnterpriseInfoList(tEnterpriseInfo);
     }
 
+
+    /**
+     * 无条件查询所有企业
+     * @return re
+     */
+    @Override
+    public List<TEnterpriseInfo> queryAllEnterprise() {
+        return tEnterpriseInfoMapper.queryAllEnterprise();
+    }
+
     /**
      * 新增企业信息
      * 

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

@@ -31,7 +31,7 @@ public class TPipeOldPlanProcessServiceImpl implements ITPipeOldPlanProcessServi
 {
     private static final Logger log = LoggerFactory.getLogger(TPipeOldPlanProcessServiceImpl.class);
 
-    @Autowired
+    @Resource
     private TPipeOldPlanProcessMapper tPipeOldPlanProcessMapper;
 
     @Resource
@@ -121,6 +121,20 @@ public class TPipeOldPlanProcessServiceImpl implements ITPipeOldPlanProcessServi
         JSONObject reportResult = governmentDataUtil.setInfo("pipeline/old/plan/process","WRITE",data);
         log.info("上传计划和进度结果===================" + reportResult.toJSONString());
         if(!"0".equals(reportResult.getString("resultCode"))) throw new CustomException("上传计划和进度接口失败");
+        tPipeOldPlanProcess.setGovUploadState("1");
+        tPipeOldPlanProcess.setGovUploadTime(new Date());
+        tPipeOldPlanProcessMapper.updateTPipeOldPlanProcess(tPipeOldPlanProcess);
+        return 1;
+    }
+
+    /**
+     * 企业端上传数据
+     * @param fOldPlanProcessId f
+     * @return r
+     */
+    @Override
+    public int entReportPipeOldPlanProcess(Long fOldPlanProcessId) {
+        tPipeOldPlanProcessMapper.entReportPipeOldPlanProcess("1",new Date(),fOldPlanProcessId);
         return 1;
     }
 }

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

@@ -13,6 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fAttachment"    column="f_attachment"    />
         <result property="fRemark"    column="f_remark"    />
         <result property="fUpdateTime"    column="f_update_time"    />
+
+        <result property="fCompanyInfoId"    column="f_company_info_id"    />
+        <result property="entUploadTime"    column="f_ent_upload_time"    />
+        <result property="entUploadState"    column="f_ent_upload_state"    />
+        <result property="govUploadTime"    column="f_gov_upload_time"    />
+        <result property="govUploadState"    column="f_gov_upload_state"    />
     </resultMap>
 
     <sql id="selectTConGasProIncVo">
@@ -25,6 +31,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             inc.f_attachment,
             inc.f_remark,
             inc.f_update_time,
+            inc.f_ent_upload_time,
+            inc.f_ent_upload_state,
+            inc.f_gov_upload_time,
+            inc.f_gov_upload_state,
             info.f_project_code AS projectCode
         FROM
             t_con_gas_pro_inc inc
@@ -34,13 +44,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTConGasProIncList" parameterType="TConGasProInc" resultMap="TConGasProIncResult">
         <include refid="selectTConGasProIncVo"/>
         <where>  
-            <if test="fIntersectConstructionId != null  and fIntersectConstructionId != ''"> and inc.f_intersect_construction_id = #{fIntersectConstructionId}</if>
-            <if test="fTitle != null  and fTitle != ''"> and inc.f_title = #{fTitle}</if>
+            <if test="fIntersectConstructionId != null  and fIntersectConstructionId != ''"> and info.f_project_code like concat('%', #{fIntersectConstructionId}, '%')</if>
+            <if test="fTitle != null  and fTitle != ''"> and inc.f_title like concat('%', #{fTitle}, '%')</if>
             <if test="fDescription != null  and fDescription != ''"> and inc.f_description = #{fDescription}</if>
             <if test="fOccurrenctTime != null  and fOccurrenctTime != ''"> and inc.f_occurrenct_time = #{fOccurrenctTime}</if>
             <if test="fAttachment != null  and fAttachment != ''"> and inc.f_attachment = #{fAttachment}</if>
             <if test="fRemark != null  and fRemark != ''"> and inc.f_remark = #{fRemark}</if>
             <if test="fUpdateTime != null  and fUpdateTime != ''"> and inc.f_update_time = #{fUpdateTime}</if>
+            <if test="fCompanyInfoId != null  and fCompanyInfoId != ''"> and inc.f_company_info_id = #{fCompanyInfoId}</if>
+            <if test="entUploadState != null  and entUploadState != ''"> and inc.f_ent_upload_state = #{entUploadState}</if>
         </where>
         order by f_update_time desc
     </select>
@@ -60,6 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fAttachment != null and fAttachment != ''">f_attachment,</if>
             <if test="fRemark != null and fRemark != ''">f_remark,</if>
             <if test="fUpdateTime != null and fUpdateTime != ''">f_update_time,</if>
+
+            <if test="fCompanyInfoId != null and fCompanyInfoId != ''">f_company_info_id,</if>
+            <if test="entUploadTime != null and entUploadTime != ''">f_ent_upload_time,</if>
+            <if test="entUploadState != null and entUploadState != ''">f_ent_upload_state,</if>
+            <if test="govUploadTime != null and govUploadTime != ''">f_gov_upload_time,</if>
+            <if test="govUploadState != null and govUploadState != ''">f_gov_upload_state,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fIntersectConstructionId != null and fIntersectConstructionId != ''">#{fIntersectConstructionId},</if>
@@ -69,6 +87,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fAttachment != null and fAttachment != ''">#{fAttachment},</if>
             <if test="fRemark != null and fRemark != ''">#{fRemark},</if>
             <if test="fUpdateTime != null and fUpdateTime != ''">#{fUpdateTime},</if>
+
+            <if test="fCompanyInfoId != null and fCompanyInfoId != ''">#{fCompanyInfoId},</if>
+            <if test="entUploadTime != null and entUploadTime != ''">#{entUploadTime},</if>
+            <if test="entUploadState != null and entUploadState != ''">#{entUploadState},</if>
+            <if test="govUploadTime != null and govUploadTime != ''">#{govUploadTime},</if>
+            <if test="govUploadState != null and govUploadState != ''">#{govUploadState},</if>
          </trim>
     </insert>
 
@@ -82,6 +106,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fAttachment != null and fAttachment != ''">f_attachment = #{fAttachment},</if>
             <if test="fRemark != null and fRemark != ''">f_remark = #{fRemark},</if>
             <if test="fUpdateTime != null and fUpdateTime != ''">f_update_time = #{fUpdateTime},</if>
+
+            <if test="entUploadTime != null">f_ent_upload_time = #{entUploadTime},</if>
+            <if test="entUploadState != null and entUploadState != ''">f_ent_upload_state = #{entUploadState},</if>
+            <if test="govUploadTime != null">f_gov_upload_time = #{govUploadTime},</if>
+            <if test="govUploadState != null and govUploadState != ''">f_gov_upload_state = #{govUploadState},</if>
         </trim>
         where f_con_gas_pro_inc_id = #{fConGasProIncId}
     </update>
@@ -90,6 +119,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from t_con_gas_pro_inc where f_con_gas_pro_inc_id = #{fConGasProIncId}
     </delete>
 
+    <update id="updateEntUploadStateById">
+        update t_con_gas_pro_inc set f_ent_upload_state = #{state}, f_ent_upload_time = #{entUploadTime} where  f_con_gas_pro_inc_id = #{fConGasProIncId}
+    </update>
+
     <delete id="deleteTConGasProIncByIds" parameterType="String">
         delete from t_con_gas_pro_inc where f_con_gas_pro_inc_id in 
         <foreach item="fConGasProIncId" collection="array" open="(" separator="," close=")">

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

@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fProjectName != null  and fProjectName != ''"> and f_project_name like concat('%', #{fProjectName}, '%')</if>
             <if test="fPipePress != null  and fPipePress != ''"> and f_pipe_press = #{fPipePress}</if>
             <if test="entUploadState != null  and entUploadState != ''"> and f_ent_upload_state = #{entUploadState}</if>
+            <if test="fCompanyInfoId != null  and fCompanyInfoId != ''"> and f_company_info_id = #{fCompanyInfoId}</if>
         </where>
         order by f_update_time desc
     </select>

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

@@ -52,6 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by enterprise_id desc
     </select>
+    <select id="queryAllEnterprise" resultMap="TEnterpriseInfoResult">
+        <include refid="selectTEnterpriseInfoVo"/>
+    </select>
 
     <select id="selectTEnterpriseInfoById" parameterType="String" resultMap="TEnterpriseInfoResult">
         <include refid="selectTEnterpriseInfoVo"/>

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

@@ -27,10 +27,13 @@ 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="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 from t_pipe_old_plan_process
+        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
     </sql>
 
     <select id="selectTPipeOldPlanProcessList" parameterType="TPipeOldPlanProcess" resultMap="TPipeOldPlanProcessResult">
@@ -42,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fConcatTel != null  and fConcatTel != ''"> and f_concat_tel like concat('%', #{fConcatTel}, '%')</if>
             <if test="fFundsDisbursementProgress != null "> and f_funds_disbursement_progress = #{fFundsDisbursementProgress}</if>
             <if test="fUploadType != null  and fUploadType != ''"> and f_upload_type = #{fUploadType}</if>
+            <if test="fEnterpriseId != null  and fEnterpriseId != ''"> and f_enterprise_id = #{fEnterpriseId}</if>
         </where>
     </select>
     
@@ -74,6 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUploadType != null">f_upload_type,</if>
             <if test="fUploadTime != null">f_upload_time,</if>
             <if test="fEnterpriseId != null">f_enterprise_id,</if>
+
+            <if test="govUploadState != null">f_gov_upload_state,</if>
+            <if test="govUploadTime != null">f_gov_upload_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fUuid != null and fUuid != ''">#{fUuid},</if>
@@ -97,6 +104,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUploadType != null">#{fUploadType},</if>
             <if test="fUploadTime != null">#{fUploadTime},</if>
             <if test="fEnterpriseId != null">#{fEnterpriseId},</if>
+
+            <if test="govUploadState != null">#{govUploadState},</if>
+            <if test="govUploadTime != null">#{govUploadTime},</if>
          </trim>
     </insert>
 
@@ -124,6 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUploadType != null">f_upload_type = #{fUploadType},</if>
             <if test="fUploadTime != null">f_upload_time = #{fUploadTime},</if>
             <if test="fEnterpriseId != null">f_enterprise_id = #{fEnterpriseId},</if>
+
+            <if test="govUploadState != null">f_gov_upload_state = #{govUploadState},</if>
+            <if test="govUploadTime != null">f_gov_upload_time = #{govUploadTime},</if>
         </trim>
         where f_old_plan_process_id = #{fOldPlanProcessId}
     </update>
@@ -132,6 +145,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from t_pipe_old_plan_process where f_old_plan_process_id = #{fOldPlanProcessId}
     </delete>
 
+    <update id="entReportPipeOldPlanProcess">
+        update t_pipe_old_plan_process set f_upload_type = #{state}, f_upload_time = #{entUploadTime} where  f_old_plan_process_id = #{fOldPlanProcessId}
+    </update>
     <delete id="deleteTPipeOldPlanProcessByIds" parameterType="String">
         delete from t_pipe_old_plan_process where f_old_plan_process_id in 
         <foreach item="fOldPlanProcessId" collection="array" open="(" separator="," close=")">

zh-baseversion-web/src/api/oldpipesystem/process.js

@@ -51,3 +51,21 @@ export function exportProcess(query) {
     params: query
   })
 }
+
+// 企业端上传 老旧官网
+export function entReportPipeOldPlanProcess(query) {
+  return request({
+    url: '/oldPipeSystem/plan/entReportPipeOldPlanProcess',
+    method: 'get',
+    params: query
+  })
+}
+
+// 政府端上传 老旧官网
+export function reportPipeOldPlanProcess(query) {
+  return request({
+    url: '/oldPipeSystem/plan/reportPipeOldPlanProcess',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

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

@@ -19,6 +19,14 @@ export function enterpriseLists(query) {
 }
 
 
+// 无条件查询企业所有信息
+export function queryAllEnterprise() {
+  return request({
+    url: '/regulation/info/queryAllEnterprise',
+    method: 'get',
+  })
+}
+
 
 // 查询企业信息详细
 export function getInfo(enterpriseId) {

zh-baseversion-web/src/api/thirdbuild/accident.js

@@ -59,3 +59,11 @@ export function reportAccidentInfo(query) {
     params: query
   })
 }
+
+export function entReportConGasProInfo(query) {
+  return request({
+    url: '/third/accident/entReportConGasProInfo',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

zh-baseversion-web/src/assets/styles/all.scss

@@ -746,3 +746,7 @@
   // pointer-events:auto !important;
   // top:-30px !important;
 }
+
+
+
+

zh-baseversion-web/src/components/bigWindow/PipeColor.vue

@@ -8,7 +8,7 @@
 -->
 <template>
   <div>
-    <div class="pipePressure">
+    <!-- <div class="pipePressure"> -->
 <!-- 
       <div style="float: left;margin-right: 5px;">
         <div class="hasColorBox">
@@ -32,7 +32,7 @@
           监控
         </div>
       </div> -->
-      <div>
+      <!-- <div>
         <div class="hasColorBox" :style="{ color: pipeColor[`1`] }">
           <div :style="{ backgroundColor: pipeColor[`1`] }"></div>
           低压管线
@@ -50,7 +50,7 @@
           高压管线
         </div>
       </div>
-    </div>
+    </div> -->
 
     <div class="mapChange">
       <div :class="{ active: mapStyle }" @click="mapChange(2)">全景地图</div>

zh-baseversion-web/src/components/bigWindow/rightBar.vue

@@ -1151,6 +1151,7 @@ export default {
 .rightb {
   width: 98%;
   height: 100%;
+ 
 }
 .rightbar1 {
   width: 90%;
@@ -1161,7 +1162,7 @@ export default {
 .rightbar2 {
   width: 76%;
   height: 37%;
-  padding-top: 15px;
+  padding-top: 30px;
   margin-left: 20%;
   pointer-events: auto;
 }

zh-baseversion-web/src/views/bigWindow/components/BottomOld.vue

+<!--
+ * @Author: 纪泽龙 jizelong@qq.com
+ * @Date: 2023-07-12 13:58:25
+ * @LastEditors: 纪泽龙 jizelong@qq.com
+ * @LastEditTime: 2023-07-12 17:12:59
+ * @FilePath: /gassafetyprogress-web/src/views/bigWindow/components/Bottom.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div class="bigwindow-bottom listingsSty">
+    <img
+      src="~@/assets/firstimage/bottombk.svg"
+      alt=""
+      style="backdrop-filter: blur(4px)"
+    />
+    <div class="listingsSty">
+      <div
+        class="firsty selectAll"
+        @click.stop="selectAll"
+        :class="[
+          {
+            active:
+              selectActive.length == listFlatArr.length &&
+              selectActive.length > 1,
+          },
+        ]"
+      >
+        全部
+      </div>
+      <div class="firsty item" v-for="(item, index) in list" :key="item.value">
+        <div
+          class="itemCompany"
+          @click.stop="selectChange(item.value)"
+          :class="[
+            { active: selectSome(index) },
+            { activeAll: selectEvery(index) },
+          ]"
+        >
+          {{ item.label }}
+        </div>
+
+        <div
+          class="up-select"
+          :class="[{ hide: !selectShowNum.includes(item.value) }]"
+          :style="{ height: item.children.length * 35 + 'px' }"
+        >
+          <div
+            class="selectItem"
+            v-for="selectItem in item.children"
+            :class="[{ active: selectActive.includes(selectItem.value) }]"
+            :key="selectItem.value"
+            @click.stop="selectActiveChange(selectItem.value)"
+          >
+            {{ selectItem.label }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from "vuex";
+export default {
+  name: "",
+  data() {
+    return {
+      list: [
+        {
+          value: 1,
+          label: "天然气公司",
+          children: [
+            // { value: 10, label: "东阿道夫阿" },
+            // { value: 11, label: "阿发送到" },
+            // { value: 19, label: "发打算发大水" },
+          ],
+        },
+        {
+          value: 2,
+          label: "液化气公司",
+          children: [
+            // { value: 21, label: "2-1" },
+            // { value: 22, label: "2-2" },
+          ],
+        },
+        {
+          value: 3,
+          label: "加气站",
+          children: [
+            // { value: 31, label: "3-1" },
+            // { value: 32, label: "3-2" },
+          ],
+        },
+      ],
+      selectShowNum: [],
+      // 被选中的值
+      selectActive: [],
+      listFlatArr: [],
+    };
+  },
+  computed: {
+    ...mapGetters(["company", "systemSetting"]),
+  },
+  beforeCreate() {},
+
+  mounted() {
+    this.GetCompany().then((res) => {
+      this.company.forEach((item) => {
+        this.list[item.companyType-1].children.push({
+          value: item.conpanyId,
+          label: item.companyName,
+        });
+      });
+      this.selectAll();
+    });
+  },
+  methods: {
+    ...mapActions({
+      GetCompany: "bigWindowCompany/GetCompany",
+    }),
+    // 把下拉框放下
+    selectUpClear(){
+      this.selectShowNum=[];
+    },
+    selectAll() {
+      // 生成所有都选中的数组
+      this.listFlatArr = this.list
+        .map((item) => {
+          return item.children.map((iten) => {
+            return iten.value;
+          });
+        })
+        .flat();
+
+      // 如果是全选中状态，则全取消，否则全选
+
+      if (this.selectActive.length == this.listFlatArr.length) {
+        this.selectActive = [];
+      } else {
+        this.selectActive = [...this.listFlatArr];
+      }
+      this.$emit("listChange", this.selectActive);
+    },
+    selectChange(value) {
+      const num = this.selectShowNum.indexOf(value);
+      if (num >= 0) {
+        this.selectShowNum.splice(num, 1);
+      } else {
+        this.selectShowNum.push(value);
+      }
+    },
+    selectActiveChange(value) {
+      const num = this.selectActive.indexOf(value);
+      if (num >= 0) {
+        this.selectActive.splice(num, 1);
+      } else {
+        this.selectActive.push(value);
+      }
+      this.$emit("listChange", this.selectActive);
+    },
+    // 至少有一个被选中
+    selectSome(index) {
+      return (
+        this.list[index].children.length > 0 &&
+        this.list[index].children.some((item) => {
+          return this.selectActive.includes(item.value);
+        })
+      );
+    },
+    // 都被选中
+    selectEvery(index) {
+      return (
+        this.list[index].children.length > 0 &&
+        this.list[index].children.every((item) => {
+          return this.selectActive.includes(item.value);
+        })
+      );
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.bigwindow-bottom {
+  width: 40%;
+  height: 70px;
+  position: fixed;
+  bottom: 0;
+  margin-left: 30%;
+  display: flex;
+  // z-index: 1000;
+  img {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    z-index: -1;
+    bottom: -10px;
+  }
+  .listingsSty {
+    padding-left: 15%;
+    padding-right: 15%;
+    box-sizing: border-box;
+    width: 180%;
+    display: flex;
+    justify-content: space-between;
+    .firsty {
+      // width: 15%;
+      min-width: 80px;
+      height: 35px;
+      text-align: center;
+      line-height: 35px;
+      color: #fff;
+      font-size: 16px;
+      cursor: pointer;
+      &.selectAll {
+        transition: all 0.5s ease;
+
+        &.active {
+          color: #00ffff;
+          text-shadow: 0 0 20px rgba(0, 255, 255, 1),
+            0 0 35px rgb(0, 255, 255, 1);
+        }
+      }
+
+      &.item {
+        min-width: 180px;
+        position: relative;
+        .itemCompany {
+          transition: all 0.5s ease;
+          &.active {
+            color: #00ffff;
+            text-shadow: 0 0 20px rgba(0, 255, 255, 0.3),
+              0 0 35px rgb(0, 255, 255, 0.3);
+          }
+          &.activeAll {
+            color: #00ffff;
+            text-shadow: 0 0 20px rgba(0, 255, 255, 1),
+              0 0 35px rgb(0, 255, 255, 1);
+          }
+        }
+        .up-select {
+          transition: all 0.5s ease;
+          position: absolute;
+          bottom: 50px;
+          left: 0;
+          width: 100%;
+          background: rgb(18, 92, 155, 0.3);
+          overflow: hidden;
+          &.hide {
+            height: 0px !important;
+          }
+          .selectItem {
+            transition: all 0.5s ease;
+            &.active {
+              color: #00ffff;
+              text-shadow: 0 0 20px #00ffff, 0 0 35px #00ffff;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

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

@@ -2,22 +2,22 @@
   <el-dialog title="详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
     <el-form label-width="170px">
       <el-row class="el-row-table"> 
+
         <el-col :span="12">
-          <el-form-item label="项目名称">
-            <span v-if="detailInfo.fProjectName">{{ detailInfo.fProjectName }}</span>
-            <span v-else>-</span>
+          <el-form-item label="燃气企业" >
+            <span>{{ enterpriseName }}</span>
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="燃气企业编码" >
-            <span v-if="detailInfo.fEntUuid">{{ detailInfo.fEntUuid }}</span>
+          <el-form-item label="项目名称">
+            <span v-if="detailInfo.fProjectName">{{ detailInfo.fProjectName }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="项目所在县级行政区ID" >
+          <el-form-item label="项目所在县级行政区" >
             <span v-if="detailInfo.fRegion">{{ detailInfo.fRegion }}</span>
             <span v-else>-</span>
           </el-form-item>
@@ -143,19 +143,55 @@
 
 <script>
   import { getProcess } from "@/api/oldpipesystem/process";
+  import { enterpriseLists ,queryAllEnterprise} from "@/api/regulation/info";
+  import { getDefaultCountyList } from "@/api/area/county";
   export default {
     name: "detail-info",
     data(){
         return{
+          enterprises: [],
+          countyInfo: [],
           detailInfo: {},
+          enterpriseName:"",
           detailOpen: false
         }
     },
+  created() { 
+    this.getCountyInfo();
+    this.getEnterpriseLists();
+  },
     methods:{
+      //获取县级
+      getCountyInfo(){
+        getDefaultCountyList().then(res =>{
+          if(res.code == 200 && res.data){
+          this.countyInfo =  res.data;
+        }
+      })
+      },
+      //所属单位
+      getEnterpriseLists(){ 
+        queryAllEnterprise().then(response => { 
+          this.enterprises = response; 
+        }); 
+      },
+      beyondCountyFormat(row){
+        let info = this.countyInfo.find(item => item.fId == row.fRegion);
+        return info?info.fName:"-";
+      },
+      beyondCompanyFormat(row){
+        let info = this.enterprises.find(item => item.enterpriseId == row.fEnterpriseId);
+        return info?info.enterpriseName:"-";
+      },
       getDetailInfo(id){
         getProcess(id).then(res =>{
           if(res.code == 200 && res.data){
             this.detailInfo = res.data;
+            this.detailInfo.fRegion = this.beyondCountyFormat(this.detailInfo);
+            let fEnterpriseId = this.detailInfo.fEnterpriseId;
+            if (fEnterpriseId != null) {
+              this.enterpriseName= this.beyondCompanyFormat(this.detailInfo);
+            }
             this.detailOpen = true;
           }
         })

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

@@ -33,6 +33,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-if="user.roleId==1||user.roleId==5"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -43,6 +44,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
+          v-if="user.roleId==1||user.roleId==5"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,6 +55,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-if="user.roleId==1||user.roleId==5"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -94,7 +97,8 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="最后修改时间" align="center" prop="fUpdateTime" />
+      <el-table-column label="上传状态" align="center" prop="uploadState" :formatter="uploadStateFormat" />
+      <el-table-column label="上传时间" align="center" prop="uploadTime" :formatter="uploadTimeFormat" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -108,17 +112,20 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-if="user.roleId==1||user.roleId==5"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-if="user.roleId==1||user.roleId==5"
           >删除</el-button>
           <el-button
             size="mini"
             type="text"
             @click="handleReport(scope.row)"
+            v-if="judgeUploadIsShow((scope.row))"
           >上传</el-button>
         </template>
       </el-table-column>
@@ -210,10 +217,12 @@
 </template>
 
 <script>
-import { listInc, getInc, delInc, addInc, updateInc, exportInc, reportAccidentInfo} from "@/api/thirdbuild/accident";
+import { listInc, getInc, delInc, addInc, updateInc, exportInc, reportAccidentInfo,entReportConGasProInfo} from "@/api/thirdbuild/accident";
 import { conGasProInfoList } from "@/api/thirdbuild/project";
 import FileUpload from '@/components/FileUpload';
+import{getInfo} from "@/api/login"
 let uploadfile = require("@/assets/uploadfile.png");
+import { enterpriseLists } from "@/api/regulation/info";
 import DetailInfo from "./components/DetailInfo";
 export default {
   name: "Inc",
@@ -223,6 +232,8 @@ export default {
   },
   data() {
     return {
+      user:{},
+      enterprises: [],
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -280,19 +291,104 @@ export default {
     };
   },
   created() {
+    this.getuserInfo(); 
+    this.getEnterpriseLists();
+  },
+  methods: {
+    //所属单位
+    getEnterpriseLists(){
+      const param = {}; 
+        enterpriseLists(param).then(response => { 
+          if (response.rows.length>1){ 
+            this.enterprises = response.rows;
+            this.enterpriseName = response.rows[0].enterpriseName; 
+        }else { 
+          this.enterprises = response.rows;
+          this.enterpriseName = response.rows[0].enterpriseName; 
+        }
+      }); 
+    },
+    getuserInfo(){
+      getInfo().then(response => {
+        this.user = response.user.roles[0]
         this.getList();
         this.getProjectInfo();
+      });
+    },
+    
+    //上传状态动态展示
+    uploadStateFormat(row, column) { 
+      //角色 1 超级管理员  5 企业
+      let roleId = this.user.roleId;
+      if (roleId == 5) {
+        if (row.entUploadState == '0') {
+          return "未上传"
+        } else{
+          return "已上传"
+        } 
+      } else { 
+        if (row.govUploadState == '0') {
+          return "未上传"
+        } else{
+          return "已上传"
+        } 
+      } 
+    },
+    //上传时间动态展示
+    uploadTimeFormat(row, column) {
+      //角色 1 超级管理员  5 企业
+      let roleId = this.user.roleId;
+      if (roleId == 5) {
+        return row.entUploadTime;
+      } else {
+        return row.govUploadTime;
+      }
+
     },
-  methods: {
     /** 查询涉气第三方施工意外事件列表 */
     getList() {
       this.loading = true;
+      // 企业查自己的数据
+      if (this.user.roleId == 5) {
+        this.queryParams.fCompanyInfoId = this.$store.state.user.enterpriseId 
+      }
       listInc(this.queryParams).then(response => {
         this.incList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    
+    //判断 上传是否需要显示，上传分为企业上传 和 政府端上传
+    judgeUploadIsShow(row) { 
+
+      //角色 1 超级管理员  5 企业
+      let roleId = this.user.roleId;
+
+      // 企业端 上传状态 0-未上传，1-已上传
+      let entUploadState = row.entUploadState;
+
+      // 政府端 上传状态 0-未上传，1-已上传
+      let govUploadState = row.govUploadState;
+
+      // 如果政府端都已经上传，那就不能显示了。
+      if(govUploadState === '1') {
+        return false;
+      }
+
+      // 如果企业端上传了，则企业端就不能显示了，政府端和 超级管理员能显示
+      if(entUploadState === '1' && govUploadState === '0') {
+        if (roleId === 5) {
+          return false;
+        } else {
+          return true;
+        }
+      }
+
+      // 别的情况，都显示
+      return true;
+
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -340,6 +436,10 @@ export default {
       const fConGasProIncId = row.fConGasProIncId || this.ids
       getInc(fConGasProIncId).then(response => {
         this.form = response.data;
+        if (this.form.fAttachment) {
+
+          this.fileList = [{name: '附件', url: uploadfile}];
+        } 
         this.open = true;
         this.title = "修改涉气第三方施工意外事件";
       });
@@ -355,6 +455,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.fCompanyInfoId=this.enterprises[0].enterpriseId;
             addInc(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
@@ -395,7 +496,12 @@ export default {
     },
     //获取第三方施工项目信息
     getProjectInfo(){
-      conGasProInfoList({}).then(res =>{
+      // 企业查自己的数据
+      let conGasProInfoQueryParams = {};
+      if (this.user.roleId == 5) {
+        conGasProInfoQueryParams.fCompanyInfoId= this.$store.state.user.enterpriseId 
+      } 
+      conGasProInfoList(conGasProInfoQueryParams).then(res =>{
         if(res.code == 200 && res.data){
           this.projectInfo = res.data;
         }
@@ -420,8 +526,25 @@ export default {
     handleDetail(row){
       this.$refs.detail.getDetailInfo(row.fConGasProIncId);
     },
-    /** 删除按钮操作 */
+    /** 上传按钮操作 */
     handleReport(row) { 
+
+      // 如果是 超级管理员 或这企业，并且 企业端上传状态为0
+      if ((this.user.roleId == 5 || this.user.roleId == 1) && row.entUploadState == '0') {
+        this.$confirm('是否确认上传项目编号为"' + row.projectCode + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return entReportConGasProInfo({fConGasProIncId : row.fConGasProIncId});
+        }).then(() => {
+          this.getList();
+        this.msgSuccess("上传成功");
+        }).catch(() => {});
+      } 
+      
+      // 如果是 超级管理员 或这政府，并且 政府端上传状态为0
+      if ((this.user.roleId == 3 || this.user.roleId == 1) && row.govUploadState == '0') {
         this.$confirm('是否确认上传项目编号为"' + row.projectCode + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -432,6 +555,7 @@ export default {
           this.getList();
         this.msgSuccess("上传成功");
         }).catch(() => {});
+      }
     },
   }
 };

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

@@ -257,37 +257,55 @@
 
 <script>
   import { getInfor } from "@/api/thirdbuild/project";
-  import { enterpriseLists } from "@/api/regulation/info";
+  import { enterpriseLists ,queryAllEnterprise} from "@/api/regulation/info";
+  import { getDefaultCountyList } from "@/api/area/county";
   export default {
     name: "detail-info",
     data(){
         return{
+          enterprises: [],
+          countyInfo: [],
           enterpriseName:"",
           detailInfo: {},
           detailOpen: false
         }
     },
   created() { 
+    this.getCountyInfo();
     this.getEnterpriseLists();
   },
     methods:{
+      //获取县级
+      getCountyInfo(){
+        getDefaultCountyList().then(res =>{
+          if(res.code == 200 && res.data){
+          this.countyInfo =  res.data;
+        }
+      })
+      },
+      beyondCountyFormat(row){
+        let info = this.countyInfo.find(item => item.fId == row.fDistrictId);
+        return info?info.fName:"-";
+      },
+      beyondCompanyFormat(row){
+        let info = this.enterprises.find(item => item.enterpriseId == row.fCompanyInfoId);
+        return info?info.enterpriseName:"-";
+      },
       //所属单位
       getEnterpriseLists(){ 
-        const param = {}; 
-          enterpriseLists(param).then(response => {
-            if (response.rows.length>1){
-            this.enterprises = response.rows;
-            this.enterpriseName = response.rows[0].enterpriseName;
-          }else {
-            this.enterprises = response.rows;
-            this.enterpriseName = response.rows[0].enterpriseName;
-          }
+        queryAllEnterprise().then(response => { 
+          this.enterprises = response; 
         }); 
       },
       getDetailInfo(id){
         getInfor(id).then(res =>{
           if(res.code == 200 && res.data){
             this.detailInfo = res.data;
+            this.detailInfo.fDistrictId = this.beyondCountyFormat(this.detailInfo);
+            let companyInfoId = this.detailInfo.fCompanyInfoId;
+            if (companyInfoId != null) {
+              this.enterpriseName= this.beyondCompanyFormat(this.detailInfo);
+            }
             this.detailOpen = true;
           }
         })

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

@@ -99,6 +99,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="操作" align="center" class-name="small-padding fixed-width" width="210">
         <template slot-scope="scope">
           <el-button
@@ -144,7 +146,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="180px">
         <el-row class="el-row-table">
           <el-col :span="12">
-            <el-form-item label="燃气企业" prop="fEnterpriseId"> 
+            <el-form-item label="燃气企业" prop="fCompanyInfoId"> 
               <el-input v-model="enterpriseName" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
@@ -496,6 +498,7 @@ export default {
   data() {
     return {
       enterpriseName:"",
+      enterprises: [],
       user:{},
       countyInfo: [],
       // 遮罩层
@@ -529,6 +532,7 @@ export default {
         fProjectNo: null,
         fProjectName: null,
         fPipePress: null,
+        fCompanyInfoId: null,
       },
       // 表单参数
       form: {},
@@ -577,7 +581,6 @@ export default {
   },
   created() {
     this.getuserInfo();
-    this.getList();
     this.getCountyInfo();
     this.getEnterpriseLists();
     this.getDicts("t_pipe_press").then(response => {
@@ -591,11 +594,9 @@ export default {
         enterpriseLists(param).then(response => {
           if (response.rows.length>1){ 
             this.enterprises = response.rows;
-          this.form.fEnterpriseId=response.rows[0].enterpriseId;
             this.enterpriseName = response.rows[0].enterpriseName; 
         }else { 
           this.enterprises = response.rows;
-          this.form.fEnterpriseId=response.rows[0].enterpriseId;
           this.enterpriseName = response.rows[0].enterpriseName; 
         }
       }); 
@@ -615,6 +616,11 @@ export default {
     /** 查询涉气第三方施工项目档案列表 */
     getList() {
       this.loading = true; 
+      // 企业查自己的数据
+      if (this.user.roleId == 5) {
+        this.queryParams.fCompanyInfoId = this.$store.state.user.enterpriseId 
+      }
+      console.log("this.queryParams = " + this.queryParams)
       listInfor(this.queryParams).then(response => {
         this.inforList = response.rows;
         this.total = response.total;
@@ -625,6 +631,35 @@ export default {
     fPipePressFormat(row, column) {
       return this.selectDictLabel(this.fPipePressOptions, row.fPipePress);
     },
+    //上传状态动态展示
+    uploadStateFormat(row, column) { 
+      //角色 1 超级管理员  5 企业
+      let roleId = this.user.roleId;
+      if (roleId == 5) {
+        if (row.entUploadState == '0') {
+          return "未上传"
+        } else{
+          return "已上传"
+        } 
+      } else { 
+        if (row.govUploadState == '0') {
+          return "未上传"
+        } else{
+          return "已上传"
+        } 
+      } 
+    },
+    //上传时间动态展示
+    uploadTimeFormat(row, column) {
+      //角色 1 超级管理员  5 企业
+      let roleId = this.user.roleId;
+      if (roleId == 5) {
+        return row.entUploadTime;
+      } else {
+        return row.govUploadTime;
+      }
+
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -698,8 +733,6 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加涉气第三方施工项目档案";
-      this.formData.operator_id = this.operatorLists[0].id
-
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -714,8 +747,6 @@ export default {
     //判断 上传是否需要显示，上传分为企业上传 和 政府端上传
     judgeUploadIsShow(row) { 
 
-      console.log("judgeUploadIsShow"+row)
-
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
 
@@ -730,9 +761,9 @@ export default {
         return false;
       }
 
-      // 如果企业端上传了，则企业端就不能显示了，政府端能显示
+      // 如果企业端上传了，则企业端就不能显示了，政府端和 超级管理员能显示
       if(entUploadState === '1' && govUploadState === '0') {
-        if (roleId === 1 | roleId === 5) {
+        if (roleId === 5) {
           return false;
         } else {
           return true;
@@ -745,12 +776,13 @@ export default {
     },
     getuserInfo(){
       getInfo().then(response => {
-        console.log(response);
         this.user = response.user.roles[0]
+        this.getList();
       });
     },
     /** 提交按钮 */
     submitForm() {
+      this.form.fCompanyInfoId=this.enterprises[0].enterpriseId;
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.fConGasProInforId != null) {
@@ -827,8 +859,8 @@ export default {
     /** 上传按钮操作 */
     handleReport(row) {
 
-      if (this.user.roleId == 1 || this.user.roleId == 5 ) {
-
+      // 如果是 超级管理员 或这企业，并且 企业端上传状态为0
+      if ((this.user.roleId == 5 || this.user.roleId == 1) && row.entUploadState == '0') {
         this.$confirm('是否确认上传涉气第三方施工项目档案名称为"' + row.fProjectName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -839,7 +871,10 @@ export default {
           this.getList();
           this.msgSuccess("上传成功");
         }).catch(() => {});
-      } else {
+      } 
+    
+      // 如果是 超级管理员 或这政府，并且 政府端上传状态为0
+      if ((this.user.roleId == 3 || this.user.roleId == 1) && row.govUploadState == '0') {
         this.$confirm('是否确认上传涉气第三方施工项目档案名称为"' + row.fProjectName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",

zh-baseversion-web/vue.config.js

@@ -35,8 +35,9 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
 
-        target: `http://localhost:8905/gassafety`,
+        // target: `http://localhost:8905/gassafety`,
         // target: `http://27.128.233.145:8905/gassafety`,
+        target: ` http://36.138.180.82:8905/gassafety`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''