1 老旧管网改造-优化，具体项有

    逻辑部分不考虑 admin角色
    调整后去掉数据列表前多选框
    数据 倒序
    详情界面 分不同角色显示调整
    导出数据分不同角色显示

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

@@ -62,7 +62,7 @@ public class TPipeOldPlanProcessController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(TPipeOldPlanProcess tPipeOldPlanProcess)
     {
-        List<TPipeOldPlanProcess> list = tPipeOldPlanProcessService.selectTPipeOldPlanProcessList(tPipeOldPlanProcess);
+        List<TPipeOldPlanProcess> list = tPipeOldPlanProcessService.exportTPipeOldPlanProcessList(tPipeOldPlanProcess);
         ExcelUtil<TPipeOldPlanProcess> util = new ExcelUtil<TPipeOldPlanProcess>(TPipeOldPlanProcess.class);
         return util.exportExcel(list, "老旧管网-改造计划和进度数据");
     }

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

 package com.zehong.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zehong.common.utils.DateUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
@@ -24,13 +26,25 @@ public class TPipeOldPlanProcess extends BaseEntity
     private String fUuid;
 
     /** 燃气企业编码，可为空 */
-    @Excel(name = "燃气企业编码")
     private String fEntUuid;
 
-    /** 项目所在县级行政区ID */
-    @Excel(name = "项目所在县级行政区ID")
+    private Long fEnterpriseId;
+
+    /**
+     * 燃气企业名称 导出用
+     */
+    @Excel(name = "燃气企业")
+    private String enterpriseName;
+
+    /** 项目所在县级行政区 */
     private Long fRegion;
 
+    /**
+     * 项目所在县级行政区 导出用
+     */
+    @Excel(name = "项目所在县级行政区")
+    private String regionName;
+
     /** 项目名称 */
     @Excel(name = "项目名称")
     private String fProjectName;
@@ -98,22 +112,40 @@ 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 = "上传时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String fUploadTime;
 
-    private Long fEnterpriseId;
-
     /**
      * 政府端上传数据
      */
+    /** 是否已上传，1-是，0-否 */
     private String govUploadState;
 
+    /** 政府端上传时间，yyyy-MM-dd hh:mm:ss */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date govUploadTime;
 
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
     public String getGovUploadState() {
         return govUploadState;
     }
@@ -328,6 +360,14 @@ public class TPipeOldPlanProcess extends BaseEntity
         return fUploadTime;
     }
 
+    public void updateFields() {
+        this.fUploadType = govUploadState;
+        if (govUploadTime != null) {
+            this.fUploadTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,govUploadTime);
+        } else {
+            this.fUploadTime = null;
+        }
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -29,6 +29,15 @@ public interface TPipeOldPlanProcessMapper
      */
     public List<TPipeOldPlanProcess> selectTPipeOldPlanProcessList(TPipeOldPlanProcess tPipeOldPlanProcess);
 
+    /**
+     * 查询老旧管网-改造计划和进度列表-导出用
+     *
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 老旧管网-改造计划和进度集合
+     */
+    public List<TPipeOldPlanProcess> exportPipeOldPlanProcessList(TPipeOldPlanProcess tPipeOldPlanProcess);
+
+
     /**
      * 新增老旧管网-改造计划和进度
      * 

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

@@ -27,6 +27,13 @@ public interface ITPipeOldPlanProcessService
      */
     public List<TPipeOldPlanProcess> selectTPipeOldPlanProcessList(TPipeOldPlanProcess tPipeOldPlanProcess);
 
+    /**
+     * 查询 导出使用
+     * @param tPipeOldPlanProcess t
+     * @return r
+     */
+    public List<TPipeOldPlanProcess> exportTPipeOldPlanProcessList(TPipeOldPlanProcess tPipeOldPlanProcess);
+
     /**
      * 新增老旧管网-改造计划和进度
      * 

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

 package com.zehong.system.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.zehong.common.core.domain.model.LoginUser;
 import com.zehong.common.exception.CustomException;
 import com.zehong.common.utils.GovernmentDataCopyUtil;
 import com.zehong.common.utils.GovernmentDataUtil;
+import com.zehong.common.utils.SecurityUtils;
+import com.zehong.common.utils.ServletUtils;
 import com.zehong.common.utils.uuid.IdUtils;
 import com.zehong.system.domain.TPipeOldPlanProcess;
 import com.zehong.system.domain.vo.TPipeOldPlanProcessVo;
@@ -19,6 +22,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 老旧管网-改造计划和进度Service业务层处理
@@ -61,6 +65,32 @@ public class TPipeOldPlanProcessServiceImpl implements ITPipeOldPlanProcessServi
         return tPipeOldPlanProcessMapper.selectTPipeOldPlanProcessList(tPipeOldPlanProcess);
     }
 
+    /**
+     * 查询老旧管网-改造计划和进度列表 - 导出时使用
+     *
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 老旧管网-改造计划和进度
+     */
+    @Override
+    public List<TPipeOldPlanProcess> exportTPipeOldPlanProcessList(TPipeOldPlanProcess tPipeOldPlanProcess) {
+
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        // 如果是 政府端 则 把 govUploadState 赋值给 fUploadType, 把 govUploadTime 赋值给 fUploadTime
+        if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
+            tPipeOldPlanProcess.setfUploadType("1");
+        }
+        List<TPipeOldPlanProcess> tPipeOldPlanProcesses = tPipeOldPlanProcessMapper.exportPipeOldPlanProcessList(tPipeOldPlanProcess);
+
+        if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
+            if(tPipeOldPlanProcesses.size() > 0) {
+                return tPipeOldPlanProcesses.stream().peek(TPipeOldPlanProcess::updateFields).collect(Collectors.toList());
+            }
+        }
+
+        return tPipeOldPlanProcesses;
+    }
+
     /**
      * 新增老旧管网-改造计划和进度
      * 

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

@@ -36,6 +36,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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>
 
+
+    <resultMap type="TPipeOldPlanProcess" id="TPipeOldPlanProcessResultForExport">
+        <result property="fOldPlanProcessId"    column="f_old_plan_process_id"    />
+        <result property="fUuid"    column="f_uuid"    />
+        <result property="fEntUuid"    column="f_ent_uuid"    />
+        <result property="fEnterpriseId"    column="f_enterprise_id"    />
+        <result property="enterpriseName"    column="enterpriseName"    />
+        <result property="fRegion"    column="f_region"    />
+        <result property="regionName"    column="regionName"    />
+        <result property="fProjectName"    column="f_project_name"    />
+        <result property="fRelationObjectType"    column="f_relation_object_type"    />
+        <result property="fYear"    column="f_year"    />
+        <result property="fStartTime"    column="f_start_time"    />
+        <result property="fEndTime"    column="f_end_time"    />
+        <result property="fTotalInvestment"    column="f_total_investment"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fSubjectImplementation"    column="f_subject_implementation"    />
+        <result property="fConcatPerson"    column="f_concat_person"    />
+        <result property="fConcatTel"    column="f_concat_tel"    />
+        <result property="fConstructionContent"    column="f_construction_content"    />
+        <result property="fActualFinishTime"    column="f_actual_finish_time"    />
+        <result property="fReconstructionProgress"    column="f_reconstruction_progress"    />
+        <result property="fFundsDisbursementProgress"    column="f_funds_disbursement_progress"    />
+        <result property="fUploadType"    column="f_upload_type"    />
+        <result property="fUploadTime"    column="f_upload_time"    />
+
+        <result property="govUploadState"    column="f_gov_upload_state"    />
+        <result property="govUploadTime"    column="f_gov_upload_time"    />
+    </resultMap>
+
+    <sql id="exportTPipeOldPlanProcessVo">
+        select process.f_old_plan_process_id,
+               process.f_uuid,
+               process.f_enterprise_id,
+               enterprise.enterprise_name as enterpriseName,
+               process.f_ent_uuid,
+               process.f_region,
+               region.f_name as regionName,
+               process.f_project_name,
+               process.f_relation_object_type,
+               process.f_year,
+               process.f_start_time,
+               process.f_end_time,
+               process.f_total_investment,
+               process.f_create_time,
+               process.f_update_time,
+               process.f_subject_implementation,
+               process.f_concat_person,
+               process.f_concat_tel,
+               process.f_construction_content,
+               process.f_actual_finish_time,
+               process.f_reconstruction_progress,
+               process.f_funds_disbursement_progress,
+               process.f_upload_type,
+               process.f_upload_time,
+               process.f_gov_upload_state,
+               process.f_gov_upload_time
+        from t_pipe_old_plan_process process left join t_enterprise_info enterprise on process.f_enterprise_id = enterprise.enterprise_id
+                                             left join t_county_level_region region on process.f_region = region.f_id
+    </sql>
+
     <select id="selectTPipeOldPlanProcessList" parameterType="TPipeOldPlanProcess" resultMap="TPipeOldPlanProcessResult">
         <include refid="selectTPipeOldPlanProcessVo"/>
         <where>  
@@ -46,7 +108,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="govUploadState != null  and govUploadState != ''"> and f_gov_upload_state = #{govUploadState}</if>
+        </where>
+        order by f_create_time desc
+    </select>
+
+    <select id="exportPipeOldPlanProcessList" parameterType="TPipeOldPlanProcess" resultMap="TPipeOldPlanProcessResultForExport">
+        <include refid="exportTPipeOldPlanProcessVo"/>
+        <where>
+            <if test="fProjectName != null  and fProjectName != ''"> and f_project_name like concat('%', #{fProjectName}, '%')</if>
+            <if test="fRelationObjectType != null  and fRelationObjectType != ''"> and f_relation_object_type = #{fRelationObjectType}</if>
+            <if test="fConcatPerson != null  and fConcatPerson != ''"> and f_concat_person like concat('%', #{fConcatPerson}, '%')</if>
+            <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>
+            <if test="govUploadState != null  and govUploadState != ''"> and f_gov_upload_state = #{govUploadState}</if>
         </where>
+        order by f_create_time desc
     </select>
 
     <select id="selectTPipeOldPlanProcessById" parameterType="Long" resultMap="TPipeOldPlanProcessResult">

zh-baseversion-web/src/store/modules/user.js

@@ -12,6 +12,7 @@ const user = {
     posts: [],
     enterpriseId: '',
     userId: '',
+    roleId: '',
     enterpriseName:'',
   },
 
@@ -46,8 +47,9 @@ const user = {
     SET_USERID:(state,userId) =>{
       state.userId = userId
     },
-
-
+    SET_ROLEID:(state,roleId) =>{
+      state.roleId = roleId
+    },
   },
 
   actions: {
@@ -87,6 +89,7 @@ const user = {
           commit('SET_POSTS',res.posts)
           commit('SET_ENTERPRISEID',user.deptId)
           commit('SET_USERID',user.userId);
+          commit('SET_ROLEID',user.roles[0].roleId);
           commit('SET_ENTERPRISENAME',user.enterpriseName);
           // 大屏公司获取
           // 第一个参数是其他模块的 actions 路径,

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

@@ -122,17 +122,20 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="是否已上传" >
-            <span v-if="detailInfo.fUploadType == '0'">否</span>
-            <span v-else-if="detailInfo.fUploadType == '1'">是</span>
-            <span v-else>-</span>
+          <el-form-item label="上传状态" >
+            <span>{{fUploadType}}</span> 
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
             <el-form-item label="上传时间" >
-              <span v-if="detailInfo.fUploadTime">{{ detailInfo.fUploadTime }}</span>
-              <span v-else>-</span>
+              <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.fUploadTime }}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -153,7 +156,9 @@
           countyInfo: [],
           detailInfo: {},
           enterpriseName:"",
-          detailOpen: false
+          detailOpen: false,
+          fUploadType: "",
+          fUploadTime: null
         }
     },
   created() {  
@@ -161,6 +166,34 @@
     this.getEnterpriseLists();
   },
     methods:{
+      //根据不同角色显示不同字段
+      showUploadType() {
+        let roleId = this.$store.state.user.roleId;
+        console.log("roleId == 3" + (roleId == 3))
+        if (roleId == 3) {
+          this.fUploadType =  this.detailInfo.govUploadState
+        }
+        if (roleId == 5) {
+          this.fUploadType =  this.detailInfo.fUploadType
+        }
+
+        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.govUploadTime
+        }
+        if (roleId == 5) {
+          this.fUploadTime =  this.detailInfo.fUploadTime
+        }
+      },
       //获取县级
       getCountyInfo(){
         getDefaultCountyList().then(res =>{
@@ -192,6 +225,9 @@
             if (fEnterpriseId != null) {
               this.enterpriseName= this.beyondCompanyFormat(this.detailInfo);
             }
+            
+            this.showUploadType();
+            this.showUploadTime();
             this.detailOpen = true;
           }
         })

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

@@ -20,28 +20,10 @@
           />
         </el-select>
       </el-form-item>
-      <!--<el-form-item label="联系人" prop="fConcatPerson">
-        <el-input
-          v-model="queryParams.fConcatPerson"
-          placeholder="请输入联系人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="fConcatTel">
-        <el-input
-          v-model="queryParams.fConcatTel"
-          placeholder="请输入联系电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item label="是否已上传" prop="fUploadType">
-        <el-select v-model="queryParams.fUploadType" placeholder="请选择是否已上传" clearable size="small">
-          <el-option label="否" value="0" />
-          <el-option label="是" value="1" />
+      <el-form-item label="上传状态" prop="fUploadType">
+        <el-select v-model="queryParams.fUploadType" placeholder="请选择上传状态" clearable size="small">
+          <el-option label="未上传" value="0" />
+          <el-option label="已上传" value="1" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -58,7 +40,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-if="user.roleId==1||user.roleId==5"
+          v-if="user.roleId==5"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -69,7 +51,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-if="user.roleId==1||user.roleId==5"
+          v-if="user.roleId==5"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -80,7 +62,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-if="user.roleId==1||user.roleId==5"
+          v-if="user.roleId==5"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -97,7 +79,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="项目名称" align="center" prop="fProjectName" />
       <el-table-column label="县级行政区" align="center" prop="fRegion" :formatter="beyondCountyFormat"></el-table-column>
       <el-table-column label="关联对象类型" align="center" prop="fRelationObjectType" :formatter="fRelationObjectTypeFormat" />
@@ -148,14 +129,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="user.roleId==1||user.roleId==5"
+            v-if="user.roleId==5&&scope.row.fUploadType==0"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="(user.roleId==1||user.roleId==5)&&scope.row.fUploadType==0"
+            v-if="user.roleId==5&&scope.row.fUploadType==0"
           >删除</el-button>
           <el-button
             size="mini"
@@ -458,6 +439,10 @@ export default {
       if (this.user.roleId == 5) {
         this.queryParams.fEnterpriseId = this.$store.state.user.enterpriseId 
       }
+      // 政府如果按照状态查的话，是查的 govUploadState
+      if (this.user.roleId == 3) {
+        this.queryParams.govUploadState = this.queryParams.fUploadType;
+      }
       listProcess(this.queryParams).then(response => {
         this.processList = response.rows;
         this.total = response.total;
@@ -596,6 +581,12 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改老旧管网改造计划";
+        
+        // 说明是 企业在新增，直接赋值显示就行了。
+        if (this.enterprises.length == 1) {
+          this.form.beyondEnterpriseId = this.enterprises[0].enterpriseId 
+          this.isDisabledEnterprise = true;
+        }
       });
     },
     /** 提交按钮 */

zh-baseversion-web/vue.config.js

@@ -35,9 +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`,
+        // target: ` http://36.138.180.82:8905/gassafety`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''