报表

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -4,7 +4,6 @@ package com.xunmei.core.evaluate.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -27,16 +26,12 @@ import com.xunmei.core.evaluate.dto.EvaluateTaskContentDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
 import com.xunmei.core.evaluate.mapper.*;
-import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
 import com.xunmei.core.evaluate.service.ICoreEvaluateTaskService;
 import com.xunmei.core.evaluate.vo.*;
-import com.xunmei.core.reportForms.monitor.vo.MonitoringAccessVO;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
-import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
-import com.xunmei.system.api.domain.SysUser;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -259,29 +254,6 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
      */
     @Override
     public CoreEvaluateTaskVO selectCoreEvaluateTaskById(Long id) {
-        String s = remoteRoleService.selectRoleNameByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);
-/*        boolean admin = false;
-        if (StringUtils.isNotEmpty(s)) {
-            int i = s.indexOf(",");
-            if (i >= 0) {
-                String[] split = s.split(",");
-                for (int l = 0; l < split.length; l++) {
-                    if (split[l].equals("省联社安全保卫管理人员") || split[l].equals("超级管理员")
-                            || split[l].equals("行社安全保卫管理人员") || split[l].equals("网点负责人") || split[l].equals("网点安全员")) {
-                        admin = true;
-                        break;
-                    }
-                }
-            } else if (s.equals("省联社安全保卫管理人员") || s.equals("超级管理员") || s.equals("行社安全保卫管理人员")
-                    || s.equals("网点负责人") || s.equals("网点安全员")) {
-                admin = true;
-            }
-        } else if (SecurityUtils.getUserId() == 1) {
-            admin = true;
-        }
-        if (!admin) {
-            throw new RuntimeException("该角色没有查看权限");
-        }*/
         CoreEvaluateTaskVO coreEvaluateTaskVO = new CoreEvaluateTaskVO();
         CoreEvaluateTask coreEvaluateTask = coreEvaluateTaskMapper.selectById(id);
         BeanUtils.copyProperties(coreEvaluateTask, coreEvaluateTaskVO);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/service/impl/SafetyInspectServiceImpl.java

@@ -201,7 +201,7 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
         String fileName = URLEncoder.encode("【" + orgName + "】-网点负责人自查报表" + DateHelper.getDateString(new Date()), "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         // 调用EasyExcel的导出方法
-        EasyExcel.write(response.getOutputStream(), SafetyInspectVO.class).sheet("Sheet1").doWrite(safetyInspectVOS);
+        EasyExcel.write(response.getOutputStream(), SelfInspectVO.class).sheet("Sheet1").doWrite(safetyInspectVOS);
     }
 
     @Override