修改

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -58,7 +59,11 @@ public class CoreEvaluateTaskController extends BaseController {
     @RequiresPermissions("core:evaluateTask:list")
     @GetMapping("/statistics")
     public AjaxResult statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
-        return success(coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO));
+        AjaxResult ajaxResult =AjaxResult.success();
+        ajaxResult.put(AjaxResult.DATA_TAG,coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO));
+        LocalDate localDate= LocalDate.now();
+        ajaxResult.put("tittle","押运公司评价情况表("+localDate.getYear()+"年"+localDate.getMonthValue()+"月)");
+        return ajaxResult;
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -93,8 +93,8 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
 
     @Override
     public List<MonitoringAccessVO> selectAll(MonitoringAccessDTO monitoringAccessDTO) {
-        monitoringAccessDTO.setStartDate(monitoringAccessDTO.getStartDate()+" 00:00:00");
-        monitoringAccessDTO.setEndDate(monitoringAccessDTO.getEndDate()+" 23:59:59");
+        monitoringAccessDTO.setStartDate(monitoringAccessDTO.getStartDate() + " 00:00:00");
+        monitoringAccessDTO.setEndDate(monitoringAccessDTO.getEndDate() + " 23:59:59");
         if (null == monitoringAccessDTO.getOrgId()) {
             monitoringAccessDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
@@ -120,7 +120,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
                     sysOrg1 = remoteOrgService.selectOrgById(remoteOrgService.selectOrgById(remoteOrgService.selectOrgById(s.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
                 }
             }
-            monitoringAccessVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
+            monitoringAccessVO.setCity(sysOrg1.getShortName().indexOf("地区行社") == -1 ? sysOrg1.getShortName().substring(0, 2) : sysOrg1.getShortName().split("地区行社")[0]);
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(s.getPath());
             monitoringAccessDTO.setOrgPath(s.getPath());
             MonitoringAccessVO monitoringAccessVO1 = monitorAccessReportMapper.selectAll(monitoringAccessDTO);
@@ -169,7 +169,17 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
             monitoringAccessDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(monitoringAccessDTO.getOrgId(), SecurityConstants.INNER);
-        String title = sysOrg.getShortName() + "监控调阅情况表" + "(" + monitoringAccessDTO.getStartDate().split(" ")[0] + "~" + monitoringAccessDTO.getEndDate().split(" ")[0] + ")";
+        String st = null;
+        String en = null;
+        try {
+            Date date = new SimpleDateFormat("yyyy-MM-dd").parse(monitoringAccessDTO.getStartDate().split(" ")[0]);
+            st = new SimpleDateFormat("yyyy年MM月dd日").format(date);
+            Date date1 = new SimpleDateFormat("yyyy-MM-dd").parse(monitoringAccessDTO.getEndDate().split(" ")[0]);
+            en = new SimpleDateFormat("yyyy年MM月dd日").format(date1);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String title = sysOrg.getShortName() + "监控调阅情况表" + "(" + st + "~" + en + ")";
         return title;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -97,10 +97,6 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public TableDataInfo selectPage(RetrievalTaskPageDto request) {
-        CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO=new CoreMonitoringTaskRegistrationDTO();
-        coreMonitoringTaskRegistrationDTO.setMoth("2023-11");
-        coreMonitoringTaskRegistrationDTO.setOrgId(1703700546288824647L);
-        selectListApp(coreMonitoringTaskRegistrationDTO);
         Page<CoreMonitoringRetrievalTaskVo> page;
         //分页
         if (request.getPageNum() != null && request.getPageSize() != null) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaCheckController.java

@@ -125,10 +125,10 @@ public class SysAreaCheckController extends BaseController {
     @GetMapping(value = "/getAreaCheckInfoByOrg/{orgId}")
     public AjaxResult getAreaCheckInfoByOrg(@PathVariable(value = "orgId", required = false) Long orgId) {
         AjaxResult ajax = AjaxResult.success();
-        SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
+   /*     SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
         if (null == sysOrg.getType()) {
             return error("该机构没有机构类型，请维护！");
-        }
+        }*/
         List<SysAreaCheck> sysAreaChecks = sysAreaCheckService.selectByOrgId(orgId);
         ajax.put(AjaxResult.DATA_TAG, sysAreaChecks);
         return ajax;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaController.java

@@ -66,10 +66,10 @@ public class SysAreaController extends BaseController {
     @RequiresPermissions("system:area:query")
     @GetMapping("/getAreaByOrg/{orgId}")
     public AjaxResult getAreaByOrg(@PathVariable("orgId") Long orgId) {
-        SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
+ /*       SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
         if (null==sysOrg.getType()){
          return error("该机构没有机构类型，请维护！");
-        }
+        }*/
         return success(sysAreaService.getAreaByOrg(orgId));
     }
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -2,6 +2,10 @@ package com.xunmei.system.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.excel.write.builder.ExcelWriterBuilder;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xunmei.common.core.constant.Constants;
@@ -29,6 +33,7 @@ import com.xunmei.system.service.ISysDeptService;
 import com.xunmei.system.service.ISysOrgService;
 import com.xunmei.system.service.ISysUserService;
 import com.xunmei.system.util.ConstructionDetailExport;
+import com.xunmei.system.util.CustomerTitleHandler;
 import com.xunmei.system.util.OrgPhysicalDefenseConstructionExport;
 import com.xunmei.system.util.SecurityUserExport;
 import io.swagger.annotations.ApiOperation;
@@ -38,6 +43,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.Writer;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -65,6 +72,7 @@ public class SysDeptController extends BaseController {
     public TableDataInfo<SysOrg> list(SysOrg dept) {
         return orgService.selectPage(dept);
     }
+
     @RequiresPermissions("system:dept:exportConstructionDetails")
     @PostMapping("/exportConstructionDetails")
     public void exportConstructionDetails(SysOrg dept, HttpServletResponse response) {
@@ -117,8 +125,7 @@ public class SysDeptController extends BaseController {
             response.setContentType("application/octet-stream;charset=UTF-8");
             response.setCharacterEncoding("utf-8");
             // 数据导出
-            EasyExcel.write(response.getOutputStream(), OrgPhysicalDefenseConstructionExport.class)
-                    .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).sheet("用户数据").doWrite(excel);
+            EasyExcel.write(response.getOutputStream(), OrgPhysicalDefenseConstructionExport.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).sheet("用户数据").doWrite(excel);
         } catch (Exception e) {
             // 重置response
             response.reset();
@@ -127,6 +134,7 @@ public class SysDeptController extends BaseController {
         }
 
     }
+
     /**
      * 查询机构列表（排除节点）
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/CustomerTitleHandler.java

@@ -0,0 +1,54 @@
+package com.xunmei.system.util;
+
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import com.alibaba.nacos.common.utils.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.springframework.util.PropertyPlaceholderHelper;
+
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/11/28
+ */
+public class CustomerTitleHandler implements CellWriteHandler {
+    private String title;
+    PropertyPlaceholderHelper placeholderHelper = new PropertyPlaceholderHelper("${", "}");
+    public CustomerTitleHandler(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer integer, Integer integer1, Boolean aBoolean) {
+        if (head==null) {
+            List<String> headNameList = head.getHeadNameList();
+            if (CollectionUtils.isNotEmpty(headNameList)) {
+                Properties properties = new Properties();
+                properties.setProperty("title", title);
+                headNameList.set(0, placeholderHelper.replacePlaceholders(headNameList.get(0), properties));
+            }
+        }
+
+    }
+
+    @Override
+    public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+
+    }
+
+    @Override
+    public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+
+    }
+
+    @Override
+    public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List<CellData> list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityWorkExport.java

@@ -0,0 +1,122 @@
+package com.xunmei.system.util;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * 安全保卫工作情况统计
+ * @author :LuoWei
+ * @date : 2023/11/29
+ */
+@Data
+@ColumnWidth(15) //列宽,最大值为255
+@HeadRowHeight(16) //表头行高
+@ContentRowHeight(16) //数据行高
+public class SecurityWorkExport {
+    @ExcelProperty(value = "序号", index = 0)
+    @TableField(exist = false)
+    private String xh;
+    @ExcelProperty(value = "地区", index = 1)
+    private String city;
+    @ExcelProperty(value = "单位", index = 2)
+    private String orgName;
+    @ExcelProperty(value = "营业网点总量", index = 3)
+    private Integer networkNumber;
+    @ExcelProperty(value = "营业网点达标数量（符合GA38-2015、2021标准）", index = 4)
+    private Integer reachNumber;
+    @ExcelProperty(value = "自有产权网点数", index = 5)
+private Integer ownPropertyNumber;
+    @ExcelProperty(value = "区域外网点数", index = 6)
+    private Integer areaOutsideNumber;
+    @ExcelProperty(value = "业务库总量", index = 7)
+    private Integer businessLibraryTotal;
+    @ExcelProperty(value = "一类库", index = 7)
+    private Integer oneLibrary;
+    @ExcelProperty(value = "二类库", index = 7)
+    private Integer twoLibrary;
+    @ExcelProperty(value = "三类库", index = 7)
+    private Integer threeLibrary;
+    @ExcelProperty(value = "四类库", index = 7)
+    private Integer fourLibrary;
+    @ExcelProperty(value = "保管箱库", index = 7)
+    private Integer collectLibrary;
+    @ExcelProperty(value = "在行式总量", index = 7)
+   private Integer  onLineTotal;
+    @ExcelProperty(value = "在行式达标数量（符合GA38-2021标准）", index = 7)
+    private Integer onLineReachNumber;
+    @ExcelProperty(value = "离行式总量", index = 7)
+    private Integer departureTotal;
+    @ExcelProperty(value = "离行式达标数量（符合GA38-2021标准）", index = 7)
+    private Integer departureReachNumber;
+    @ExcelProperty(value = "自助设备总数", index = 7)
+   private Integer  selfServiceDevicesTotal;
+    @ExcelProperty(value = "在行大堂式机具", index = 7)
+    private Integer  onLineLobbyImplement;
+    @ExcelProperty(value = "在行式穿墙式机具", index = 7)
+    private Integer   onLineThroughWalls;
+    @ExcelProperty(value = "离行式大堂式机具", index = 7)
+  private Integer  departureLobbyImplement;
+    @ExcelProperty(value = "离行式穿墙式机具", index = 7)
+ private Integer    departureThroughWalls;
+    @ExcelProperty(value = "中心建设时间（年）", index = 7)
+   private String centerConstructionTime;
+    @ExcelProperty(value = "监控平台最近一次升级改造时间（年", index = 7)
+    private String transformTime;
+    @ExcelProperty(value = "监控中心平台品牌", index = 7)
+    private String brand;
+    @ExcelProperty(value = "视频监控摄像头总路数", index = 7)
+    private Integer cameraTotal;
+    @ExcelProperty(value = "是否实现远程控制和实时授权的功能", index = 7)
+   private String remoteControl;
+    @ExcelProperty(value = "本地值守网点数量(由员工进行同楼异地值守)", index = 7)
+    private Integer localDutyNetworkNumber;
+    @ExcelProperty(value = "异地值守网点数量（由监控中心进行远程值守）", index = 7)
+    private Integer remoteDutyNetworkNumber;
+    @ExcelProperty(value = "监控中心安保卫持证人数", index = 7)
+    private Integer certificatePeopleNumber;
+    @ExcelProperty(value = "人员合计", index = 7)
+    private Integer certificateTotal;
+    @ExcelProperty(value = "其中，内部保安人数（含派遣）", index = 7)
+    private Integer internalCertificateNumber;
+    @ExcelProperty(value = "其中，外聘保安人数", index = 7)
+    private Integer  outsourceCertificateNumber;
+    @ExcelProperty(value = "配有保安网点数 ", index = 7)
+    private Integer haveSecurityNetworkNumber;
+    @ExcelProperty(value = "本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数）", index = 7)
+    private Integer quarterSelfInspectNumber;
+    @ExcelProperty(value = "本季度度总行(联社)组织开展安全教育次数", index = 7)
+    private Integer quarterSafetyEducationNumber;
+    @ExcelProperty(value = "共计参与安全教育员工人次", index = 7)
+    private Integer safetyEducationPeopleNumber;
+    @ExcelProperty(value = "本季度开展预案演练次数", index = 7)
+    private Integer quarterDrillNumber;
+    @ExcelProperty(value = "参与预案演练员工人次", index = 7)
+    private Integer quarterDrillPeopleNumber;
+    @ExcelProperty(value = "本季度辖内所有营业网点开展预案演练次数（每个网点演练次数的累计数）", index = 7)
+    private Integer quarterAllNetworkDrillNumber;
+    @ExcelProperty(value = "辖内所有营业网点参与预案演练员工人次", index = 7)
+    private Integer quarterAllNetworkDrillPeopleNumber;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -619,7 +619,7 @@
     </select>
     <select id="select" resultType="com.xunmei.system.util.UserExport">
         SELECT
-        # h.user_id AS is_manager,
+
         GROUP_CONCAT(sr.role_name) role_names,
         CONCAT(',',GROUP_CONCAT( sr.id ),',') as roleIds,
         u.id,
@@ -657,7 +657,7 @@
         u.CODE,
         u.source,
         u.original_org_id,
-        u.is_manage as is_manager
+        u.is_manage as isManage
         FROM
         sys_user u
         LEFT JOIN sys_org o ON u.original_org_id = o.id