济南锦水-企业信息上传-企业信息上报增加导出功能及增加权限控制（后端）

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/controller/EnterpriseReportController.java

@@ -90,7 +90,7 @@ public class EnterpriseReportController {
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<EnterpriseReportDTO> list = enterpriseReportService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, EnterpriseReportExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "上报企业信息导出表", list, EnterpriseReportExcel.class);
     }
 
     /**

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/excel/EnterpriseReportExcel.java

@@ -32,35 +32,14 @@ import java.util.Date;
 @Data
 public class EnterpriseReportExcel {
 
-    @Excel(name = "ID")
-    private String id;
+    /*@Excel(name = "ID")
+    private String id;*/
 
-    @Excel(name = "企业所属网格")
-    private Long grid;
-
-    @Excel(name = "企业所属网格ID")
-    private String gridId;
-
-    @Excel(name = "发布人所属网格")
-    private Long dept;
+    /*@Excel(name = "企业所属网格ID")
+    private String gridId;*/
 
-    @Excel(name = "发布人所属网格ID")
-    private String deptId;
-
-    @Excel(name = "发布人ID")
-    private String userId;
-
-    @Excel(name = "发布人昵称")
-    private String nickname;
-
-    @Excel(name = "发布人手机号")
-    private String mobile;
-
-    @Excel(name = "发布人头像")
-    private String faceImg;
-
-    @Excel(name = "发布人真实姓名")
-    private String realName;
+    @Excel(name = "企业所属网格")
+    private String grid;
 
     @Excel(name = "所属年度")
     private String year;
@@ -86,6 +65,27 @@ public class EnterpriseReportExcel {
     @Excel(name = "用工人数")
     private Integer enterprisePeopleNum;
 
+    /*@Excel(name = "发布人所属网格")
+    private Long dept;
+
+    @Excel(name = "发布人所属网格ID")
+    private String deptId;
+
+    @Excel(name = "发布人ID")
+    private String userId;
+
+    @Excel(name = "发布人昵称")
+    private String nickname;
+
+    @Excel(name = "发布人手机号")
+    private String mobile;
+
+    @Excel(name = "发布人头像")
+    private String faceImg;
+
+    @Excel(name = "发布人真实姓名")
+    private String realName;
+
     @Excel(name = "问题")
     private String question;
 
@@ -117,7 +117,7 @@ public class EnterpriseReportExcel {
     private String allDeptIds;
 
     @Excel(name = "企业所有部门名称")
-    private String allDeptNames;
+    private String allDeptNames;*/
 
 
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/impl/EnterpriseReportServiceImpl.java

@@ -24,6 +24,8 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.EnterpriseReportDTO;
@@ -39,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +60,11 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
 
     @Override
     public PageData<EnterpriseReportDTO> page(Map<String, Object> params) {
+        UserDetail userDetail = SecurityUser.getUser();
+        if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+            return new PageData<>(null, 0);
+        }
+        params.put("deptIdList", userDetail.getDeptIdList());
         IPage<EnterpriseReportEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
@@ -66,6 +74,11 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
 
     @Override
     public List<EnterpriseReportDTO> list(Map<String, Object> params) {
+        UserDetail userDetail = SecurityUser.getUser();
+        if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+            return new ArrayList<EnterpriseReportDTO>();
+        }
+        params.put("deptIdList", userDetail.getDeptIdList());
         List<EnterpriseReportEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, EnterpriseReportDTO.class);
@@ -81,6 +94,7 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
         String legalPerson = (String)params.get("legalPerson");
         String concat = (String)params.get("concat");
         String enterpriseStatus = (String)params.get("enterpriseStatus");
+        List<Long> deptIdList = (List<Long>) params.get("deptIdList");
 
         QueryWrapper<EnterpriseReportEntity> wrapper = new QueryWrapper<>();
         wrapper.apply(StringUtils.isNotBlank(gridId),"FIND_IN_SET ("+gridId+",ALL_DEPT_IDS)");
@@ -92,7 +106,7 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
         wrapper.like(StringUtils.isNotBlank(legalPerson), "LEGAL_PERSON", legalPerson);
         wrapper.like(StringUtils.isNotBlank(concat), "CONCAT", concat);
         wrapper.eq(StringUtils.isNotBlank(enterpriseStatus), "ENTERPRISE_STATUS", enterpriseStatus);
-
+        wrapper.in("GRID_ID",deptIdList);
         return wrapper;
     }