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

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

@@ -58,7 +58,9 @@ public class TConGasProInforController extends BaseController
     {
         List<TConGasProInfor> list = tConGasProInforService.exportTConGasProInforList(tConGasProInfor);
         ExcelUtil<TConGasProInfor> util = new ExcelUtil<TConGasProInfor>(TConGasProInfor.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/TConGasProInfor.java

@@ -203,16 +203,18 @@ public class TConGasProInfor extends BaseEntity
     private Date entUploadTime;
 
 
-    /**
-     * 政府端上传时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date govUploadTime;
-
     /**
      * 企业端上传状态 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")
+    private Date govUploadTime;
+
     public void updateFields() {
         this.entUploadState = govUploadState;
         if (govUploadTime != null) {

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

@@ -5,6 +5,7 @@ import com.zehong.common.core.domain.entity.SysRole;
 import com.zehong.common.core.domain.model.LoginUser;
 import com.zehong.common.exception.CustomException;
 import com.zehong.common.utils.*;
+import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.system.domain.SysSetting;
 import com.zehong.system.domain.TConGasProInfor;
 import com.zehong.system.domain.TPipeOldPlanProcess;
@@ -99,9 +100,13 @@ public class TConGasProInforServiceImpl implements ITConGasProInforService
         List<TConGasProInfor> tConGasProInfors = tConGasProInforMapper.exportTConGasProInforList(tConGasProInfor);
 
         if(loginUser.getUser().getRoles().get(0).getRoleId()==3){
-            if(tConGasProInfors.size() > 0) {
-                return tConGasProInfors.stream().peek(TConGasProInfor::updateFields).collect(Collectors.toList());
-            }
+            ExcelUtil.hiddencolumns.add(36);
+            ExcelUtil.hiddencolumns.add(37);
+        }
+
+        if(loginUser.getUser().getRoles().get(0).getRoleId()==5){
+            ExcelUtil.hiddencolumns.add(38);
+            ExcelUtil.hiddencolumns.add(39);
         }
         return tConGasProInforMapper.exportTConGasProInforList(tConGasProInfor);
     }