From 5b5407d1356ecf55048118bdadfeee84ecee01c1 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 14 Dec 2022 17:56:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=B5=8B=E5=80=BC=E5=BE=97?=
 =?UTF-8?q?=E5=88=86=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/handler/CustomMergeStrategy.java    |  91 +++++++
 .../dataaggre/constant/EventConstant.java     |  10 +
 .../form/EventCategoryFormDTO.java            |   3 +
 .../form/EventCategoryListFormDTO.java        |  65 +++++
 .../result/EventCategoryListResultDTO.java    |  59 +++++
 .../result/EventScoreTotalResultDTO.java      |  33 +++
 .../controller/PingYinEventController.java    | 132 ++++++++++
 .../dao/evaluationindex/PingYinEventDao.java  |  72 ++++++
 .../evaluationindex/PingYinEventService.java  |  35 +++
 .../impl/PingYinEventServiceImpl.java         | 133 +++++++++-
 .../src/main/resources/excel/eventScore.xlsx  | Bin 0 -> 12491 bytes
 .../evaluationindex/PingYinEventDao.xml       | 236 +++++++++++++++++-
 .../screen/GridstaffWorkInfoPingyinDTO.java   |   6 +
 .../screen/ScreenPyEventDataEntity.java       |  26 +-
 .../impl/ScreenPyEventDataServiceImpl.java    |  19 ++
 .../GridstaffWorkInfoPingyinServiceImpl.java  |  12 +
 .../dto/form/patrol/PatrolQueryFormDTO.java   |   3 +
 .../dto/result/PatrolRoutineWorkResult.java   |   5 +-
 .../resources/mapper/PatrolRoutineWorkDao.xml |   9 +
 19 files changed, 921 insertions(+), 28 deletions(-)
 create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/CustomMergeStrategy.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/EventConstant.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/form/EventCategoryListFormDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/result/EventCategoryListResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/result/EventScoreTotalResultDTO.java
 create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/eventScore.xlsx

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/CustomMergeStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/CustomMergeStrategy.java
new file mode 100644
index 0000000000..bbe8cafbca
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/CustomMergeStrategy.java
@@ -0,0 +1,91 @@
+package com.epmet.commons.tools.utils.poi.excel.handler;/**
+ * @author ZhaoQiFeng
+ * @date 2022/12/14
+ * @apiNote
+ */
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 自定义合并策略 该类继承了AbstractMergeStrategy抽象合并策略，需要重写merge()方法
+ * @Author zhaoqifeng
+ * @Date 2022/12/14 15:10
+ */
+public class CustomMergeStrategy extends AbstractMergeStrategy {
+
+    /**
+     * 分组，每几行合并一次
+     */
+    private List<Integer> exportFieldGroupCountList;
+
+    /**
+     * 目标合并列index
+     */
+    private Integer targetColumnIndex;
+
+    // 需要开始合并单元格的首行index
+    private Integer rowIndex;
+
+    // exportDataList为待合并目标列的值
+    public CustomMergeStrategy(List<String> exportDataList, Integer targetColumnIndex) {
+        this.exportFieldGroupCountList = getGroupCountList(exportDataList);
+        this.targetColumnIndex = targetColumnIndex;
+    }
+
+
+    @Override
+    protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) {
+
+        if (null == rowIndex) {
+            rowIndex = cell.getRowIndex();
+        }
+        // 仅从首行以及目标列的单元格开始合并，忽略其他
+        if (cell.getRowIndex() == rowIndex && cell.getColumnIndex() == targetColumnIndex) {
+            mergeGroupColumn(sheet);
+        }
+    }
+
+    private void mergeGroupColumn(Sheet sheet) {
+        int rowCount = rowIndex;
+        for (Integer count : exportFieldGroupCountList) {
+            if(count == 1) {
+                rowCount += count;
+                continue ;
+            }
+            // 合并单元格
+            CellRangeAddress cellRangeAddress = new CellRangeAddress(rowCount, rowCount + count - 1, targetColumnIndex, targetColumnIndex);
+            sheet.addMergedRegionUnsafe(cellRangeAddress);
+            rowCount += count;
+        }
+    }
+
+    // 该方法将目标列根据值是否相同连续可合并，存储可合并的行数
+    private List<Integer> getGroupCountList(List<String> exportDataList){
+        if (CollectionUtils.isEmpty(exportDataList)) {
+            return new ArrayList<>();
+        }
+
+        List<Integer> groupCountList = new ArrayList<>();
+        int count = 1;
+
+        for (int i = 1; i < exportDataList.size(); i++) {
+            if (exportDataList.get(i).equals(exportDataList.get(i - 1))) {
+                count++;
+            } else {
+                groupCountList.add(count);
+                count = 1;
+            }
+        }
+        // 处理完最后一条后
+        groupCountList.add(count);
+        return groupCountList;
+    }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/EventConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/EventConstant.java
new file mode 100644
index 0000000000..ad8948fa23
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/EventConstant.java
@@ -0,0 +1,10 @@
+package com.epmet.dataaggre.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/25 上午10:47
+ */
+public interface EventConstant {
+    String PROJECT = "project";
+    String WORK = "work";
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/form/EventCategoryFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/form/EventCategoryFormDTO.java
index 5d848e185e..f9cd88c5e5 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/form/EventCategoryFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/form/EventCategoryFormDTO.java
@@ -44,4 +44,7 @@ public class EventCategoryFormDTO implements Serializable {
      */
     @NotBlank(message = "组织名称不能为空",groups = CategoryEventExportForm.class)
     private String orgName;
+
+    private String name;
+    private String mobile;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/form/EventCategoryListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/form/EventCategoryListFormDTO.java
new file mode 100644
index 0000000000..58bf30b26d
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/form/EventCategoryListFormDTO.java
@@ -0,0 +1,65 @@
+package com.epmet.dataaggre.dto.evaluationindex.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class EventCategoryListFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface EventCategoryForm{}
+    public interface CategoryEventExportForm {}
+    public interface CategoryEventListExportForm {}
+    /**
+     * 组织ID
+     */
+    private String customerId;
+
+    /**
+     * 组织ID
+     */
+    private String orgId;
+
+    /**
+     * 组织类型 组织：agency，网格：grid
+     */
+    private String orgType;
+
+    @NotBlank(message = "结束时间不能为空",groups = {EventCategoryForm.class,CategoryEventExportForm.class})
+    private String endTime;
+
+    /**
+     * 类型，project：事件， work：例行工作
+     */
+    @NotNull(message = "事件类型不能为空",groups = CategoryEventListExportForm.class)
+    private String eventType;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 组织名称
+     */
+    @NotBlank(message = "组织名称不能为空",groups = CategoryEventExportForm.class)
+    private String orgName;
+
+    @NotNull(message = "categoryCode不能为空",groups = {EventCategoryForm.class, CategoryEventListExportForm.class})
+    private String categoryCode;
+
+    @NotNull(message = "categoryName不能为空",groups = CategoryEventListExportForm.class)
+    private String categoryName;
+    private String parentCategoryName;
+
+    private String name;
+    private String mobile;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/result/EventCategoryListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/result/EventCategoryListResultDTO.java
new file mode 100644
index 0000000000..6836682946
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/result/EventCategoryListResultDTO.java
@@ -0,0 +1,59 @@
+package com.epmet.dataaggre.dto.evaluationindex.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class EventCategoryListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 事件ID
+     */
+    private String eventId;
+
+    /**
+     * 事件类型 项目：project，例行工作：work
+     */
+    private String eventType;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 类别
+     */
+    private String category;
+
+    /**
+     * 项目状态:待处理 pending，结案closed
+     */
+    private String status;
+
+    /**
+     * 项目状态:待处理 pending，结案closed
+     */
+    private String statusDesc;
+
+    /**
+     * 所属网格
+     */
+    private String gridName;
+    private String gridId;
+    /**
+     * 项目创建时间
+     */
+    private String createTime;
+
+    private String staffName;
+
+    private Integer score;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/result/EventScoreTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/result/EventScoreTotalResultDTO.java
new file mode 100644
index 0000000000..419efe119a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/result/EventScoreTotalResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.evaluationindex.result;/**
+ * @author ZhaoQiFeng
+ * @date 2022/12/14
+ * @apiNote
+ */
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/12/14 13:39
+ */
+@Data
+public class EventScoreTotalResultDTO implements Serializable {
+    private static final long serialVersionUID = 2570384890580378137L;
+    private String orgName;
+    private String date;
+    /**
+     * 总分
+     */
+    private String totalScore;
+    /**
+     * 网格员数量
+     */
+    private String memberCount;
+    /**
+     * 考核得分
+     */
+    private String aveScore;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/PingYinEventController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/PingYinEventController.java
index 50531e28b1..8ec1f0089b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/PingYinEventController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/PingYinEventController.java
@@ -1,20 +1,43 @@
 package com.epmet.dataaggre.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.fill.FillConfig;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.poi.excel.handler.CustomMergeStrategy;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.evaluationindex.EventCategoryResultDTO;
 import com.epmet.dataaggre.dto.evaluationindex.form.EventCategoryFormDTO;
+import com.epmet.dataaggre.dto.evaluationindex.form.EventCategoryListFormDTO;
+import com.epmet.dataaggre.dto.evaluationindex.result.EventCategoryListResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.result.EventScoreTotalResultDTO;
 import com.epmet.dataaggre.service.evaluationindex.PingYinEventService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -41,5 +64,114 @@ public class PingYinEventController {
         return new Result<List<EventCategoryResultDTO>>().ok(pingYinEventService.getEventCategorySore(tokenDto, formDTO));
     }
 
+    /**
+     * 事件分类列表
+     *
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result< PageData< EventCategoryListResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2022/12/13 9:55
+     */
+    @PostMapping("getEventCategoryList")
+    public Result<PageData<EventCategoryListResultDTO>> getEventCategoryList(@LoginUser TokenDto tokenDto, @RequestBody EventCategoryListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, EventCategoryListFormDTO.EventCategoryForm.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<PageData<EventCategoryListResultDTO>>().ok(pingYinEventService.getEventCategoryList(formDTO));
+    }
+
+    /**
+     * 事件赋值得分总计
+     *
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result< EventScoreTotalResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/12/14 13:46
+     */
+    @PostMapping("getEventScoreTotal")
+    public Result<EventScoreTotalResultDTO> getEventScoreTotal(@LoginUser TokenDto tokenDto, @RequestBody EventCategoryFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, EventCategoryListFormDTO.EventCategoryForm.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<EventScoreTotalResultDTO>().ok(pingYinEventService.getEventScoreTotal(formDTO));
+    }
+
+    /**
+     * 事件赋值得分导出
+     * @Param tokenDto
+     * @Param formDTO
+     * @Param response
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/12/14 16:08
+     */
+    @PostMapping("eventScoreExport")
+    public void eventScoreExport(@LoginUser TokenDto tokenDto,
+                  @RequestBody EventCategoryFormDTO formDTO, HttpServletResponse response) throws Exception{
+        ValidatorUtils.validateEntity(formDTO, EventCategoryListFormDTO.EventCategoryForm.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        String fileName = formDTO.getOrgName() + "事件赋值得分.xlsx";
+        ExcelWriter excelWriter = null;
+        //获取模板
+        ClassPathResource classPathResource = new ClassPathResource("excel/eventScore.xlsx");
+        InputStream inputStream = classPathResource.getInputStream();
+        try {
+
+            try {
+                fileName = URLEncoder.encode("事件赋值得分.xlsx", "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            response.setHeader("Content-disposition", "attachment; filename=" + fileName);
+            response.setContentType("application/msexcel;charset=UTF-8");
+            response.setHeader("Pragma", "No-cache");
+            response.setHeader("Cache-Control", "no-cache");
+            response.setDateHeader("Expires", 0);
+            ServletOutputStream outputStream = response.getOutputStream();
+            //总计
+            EventScoreTotalResultDTO scoreTotal = pingYinEventService.getEventScoreTotal(formDTO);
+            scoreTotal.setOrgName(formDTO.getOrgName());
+            String endTime =DateUtils.format(DateUtils.parse(formDTO.getEndTime(), DateUtils.DATE_PATTERN_YYYYMMDD), DateUtils.DATE_NAME_PATTERN);
+            if (StringUtils.isNotEmpty(formDTO.getStartTime())) {
+                String startTime =DateUtils.format(DateUtils.parse(formDTO.getStartTime(), DateUtils.DATE_PATTERN_YYYYMMDD), DateUtils.DATE_NAME_PATTERN);
+                scoreTotal.setDate(startTime.concat("—").concat(endTime));
+            } else {
+                scoreTotal.setDate("截止到" + endTime);
+            }
+            //分类统计
+            List<EventCategoryResultDTO> categoryList = pingYinEventService.getEventCategorySoreExport(tokenDto, formDTO);
+            //设置输出流和模板信息
+            excelWriter = EasyExcel.write(outputStream).withTemplate(inputStream).build();
+            WriteSheet writeSheet = EasyExcel.writerSheet(0)
+                    .registerWriteHandler(new CustomMergeStrategy(categoryList.stream().map(EventCategoryResultDTO::getEventType).collect(Collectors.toList()), 0))
+                    .registerWriteHandler(new CustomMergeStrategy(categoryList.stream().map(EventCategoryResultDTO::getParentCategoryName).collect(Collectors.toList()), 1))
+                    .build();
+            //开启自动换行,自动换行表示每次写入一条list数据是都会重新生成一行空行,此选项默认是关闭的,需要提前设置为true
+            FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
+            excelWriter.fill(categoryList, fillConfig, writeSheet);
+            excelWriter.fill(scoreTotal, writeSheet);
+        } catch (EpmetException e) {
+            response.reset();
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-type", "application/json; charset=UTF-8");
+            PrintWriter printWriter = response.getWriter();
+            Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg());
+            printWriter.write(JSON.toJSONString(result));
+            printWriter.close();
+        } catch (Exception e) {
+            log.error("export exception", e);
+        } finally {
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/PingYinEventDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/PingYinEventDao.java
index 86ddcb8590..66f9962f37 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/PingYinEventDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/PingYinEventDao.java
@@ -19,6 +19,8 @@ package com.epmet.dataaggre.dao.evaluationindex;
 
 import com.epmet.dataaggre.dto.evaluationindex.EventCategoryResultDTO;
 import com.epmet.dataaggre.dto.evaluationindex.form.EventCategoryFormDTO;
+import com.epmet.dataaggre.dto.evaluationindex.form.EventCategoryListFormDTO;
+import com.epmet.dataaggre.dto.evaluationindex.result.EventCategoryListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -67,4 +69,74 @@ public interface PingYinEventDao {
      * @Date 2022/12/9 11:00
      */
     List<EventCategoryResultDTO> selectWorkCategoryScoreList(EventCategoryFormDTO formDTO);
+
+    /**
+     * 项目分类列表
+     *
+     * @Param formDTO
+     * @Return {@link List< EventCategoryListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/12/13 10:12
+     */
+    List<EventCategoryListResultDTO> getProjectCategoryList(EventCategoryListFormDTO formDTO);
+
+    /**
+     * 例行工作
+     *
+     * @Param formDTO
+     * @Return {@link List< EventCategoryListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/12/13 10:12
+     */
+    List<EventCategoryListResultDTO> getWorkCategoryList(EventCategoryListFormDTO formDTO);
+
+    /**
+     * 上报事件总分
+     *
+     * @Param formDTO
+     * @Return {@link Long}
+     * @Author zhaoqifeng
+     * @Date 2022/12/14 13:56
+     */
+    Long getProjectTotalScore(EventCategoryFormDTO formDTO);
+
+    /**
+     * 例行工作总分
+     *
+     * @Param formDTO
+     * @Return {@link Long}
+     * @Author zhaoqifeng
+     * @Date 2022/12/14 13:56
+     */
+    Long getWorkTotalScore(EventCategoryFormDTO formDTO);
+
+    /**
+     * 网格员数
+     *
+     * @Param formDTO
+     * @Return {@link Long}
+     * @Author zhaoqifeng
+     * @Date 2022/12/14 13:56
+     */
+    Long getMemberCount(EventCategoryFormDTO formDTO);
+
+    /**
+     * 获取项目分类
+     *
+     * @Param customerId
+     * @Return {@link List< EventCategoryResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/12/9 13:40
+     */
+    List<EventCategoryResultDTO> selectProjectCategoryForExport(@Param("customerId")String customerId);
+
+    /**
+     * 获取例行工作分类
+     *
+     * @Param
+     * @Return {@link List< EventCategoryResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/12/9 13:41
+     */
+    List<EventCategoryResultDTO> selectWorkCategoryForExport();
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/PingYinEventService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/PingYinEventService.java
index 9e93890ad2..1e4bb50c07 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/PingYinEventService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/PingYinEventService.java
@@ -1,8 +1,12 @@
 package com.epmet.dataaggre.service.evaluationindex;
 
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.dto.evaluationindex.EventCategoryResultDTO;
 import com.epmet.dataaggre.dto.evaluationindex.form.EventCategoryFormDTO;
+import com.epmet.dataaggre.dto.evaluationindex.form.EventCategoryListFormDTO;
+import com.epmet.dataaggre.dto.evaluationindex.result.EventCategoryListResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.result.EventScoreTotalResultDTO;
 
 import java.util.List;
 
@@ -21,4 +25,35 @@ public interface PingYinEventService {
      * @Date 2022/12/9 9:55
      */
     List<EventCategoryResultDTO> getEventCategorySore (TokenDto tokenDto, EventCategoryFormDTO formDTO);
+
+    /**
+     * 事件分类列表
+     *
+     * @Param formDTO
+     * @Return {@link PageData< EventCategoryListResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/12/13 9:55
+     */
+    PageData<EventCategoryListResultDTO> getEventCategoryList(EventCategoryListFormDTO formDTO);
+
+    /**
+     * 事件赋值得分总计
+     *
+     * @Param formDTO
+     * @Return {@link EventScoreTotalResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/12/14 13:46
+     */
+    EventScoreTotalResultDTO getEventScoreTotal(EventCategoryFormDTO formDTO);
+
+    /**
+     * 事件赋值得分导出
+     *
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link List<EventCategoryResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/12/9 9:55
+     */
+    List<EventCategoryResultDTO> getEventCategorySoreExport (TokenDto tokenDto, EventCategoryFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/PingYinEventServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/PingYinEventServiceImpl.java
index d2b3180459..2ac0e78511 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/PingYinEventServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/PingYinEventServiceImpl.java
@@ -4,20 +4,30 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.constant.EventConstant;
 import com.epmet.dataaggre.dao.evaluationindex.PingYinEventDao;
 import com.epmet.dataaggre.dto.evaluationindex.EventCategoryResultDTO;
 import com.epmet.dataaggre.dto.evaluationindex.form.EventCategoryFormDTO;
+import com.epmet.dataaggre.dto.evaluationindex.form.EventCategoryListFormDTO;
+import com.epmet.dataaggre.dto.evaluationindex.result.EventCategoryListResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.result.EventScoreTotalResultDTO;
 import com.epmet.dataaggre.service.evaluationindex.PingYinEventService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,9 +57,6 @@ public class PingYinEventServiceImpl implements PingYinEventService {
     @Override
     public List<EventCategoryResultDTO> getEventCategorySore(TokenDto tokenDto, EventCategoryFormDTO formDTO) {
         List<EventCategoryResultDTO> result = new ArrayList<>();
-        if (StringUtils.isNotBlank(formDTO.getStartTime())){
-            formDTO.setStartTime(DateUtils.getBeforeNDay(formDTO.getStartTime(), NumConstant.ONE));
-        }
         if (StringUtils.isBlank(formDTO.getOrgId())){
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
             if (null == staffInfo){
@@ -95,4 +102,122 @@ public class PingYinEventServiceImpl implements PingYinEventService {
         result.addAll(workCategoryList);
         return result;
     }
+
+    /**
+     * 事件分类列表
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link PageData <  EventCategoryListResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2022/12/13 9:55
+     */
+    @Override
+    public PageData<EventCategoryListResultDTO> getEventCategoryList(EventCategoryListFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
+        List<EventCategoryListResultDTO> list;
+        if (EventConstant.PROJECT.equals(formDTO.getEventType())) {
+            //项目分类列表
+            list = pingYinEventDao.getProjectCategoryList(formDTO);
+        } else {
+            //例行工作分类列表
+            list = pingYinEventDao.getWorkCategoryList(formDTO);
+        }
+        PageInfo<EventCategoryListResultDTO> pageInfo = new PageInfo<>(list);
+        if(CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                if (null == gridInfo) {
+                    log.error("获取网格信息失败");
+                    return;
+                }
+                item.setGridName(gridInfo.getGridNamePath());
+                if (EventConstant.PROJECT.equals(item.getEventType())) {
+                    item.setStatusDesc("pending".equals(item.getStatus())?"处理中":"已结案");
+                }
+            });
+        }
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
+    /**
+     * 事件赋值得分总计
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link EventScoreTotalResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/12/14 13:46
+     */
+    @Override
+    public EventScoreTotalResultDTO getEventScoreTotal(EventCategoryFormDTO formDTO) {
+        formDTO.setCustomerId("6f203e30de1a65aab7e69c058826cd80");
+        EventScoreTotalResultDTO result = new EventScoreTotalResultDTO();
+        Long projectScore = pingYinEventDao.getProjectTotalScore(formDTO);
+        Long workScore = pingYinEventDao.getWorkTotalScore(formDTO);
+        Long memberCount = pingYinEventDao.getMemberCount(formDTO);
+        Long totalScore = projectScore + workScore;
+        result.setTotalScore(totalScore.toString());
+        result.setMemberCount(memberCount.toString());
+        result.setAveScore("0.00");
+        if (memberCount != 0L) {
+            BigDecimal total = new BigDecimal(totalScore);
+            BigDecimal count = new BigDecimal(memberCount);
+            BigDecimal ave = total.divide(count, NumConstant.TWO, RoundingMode.HALF_UP);
+            result.setAveScore(ave.toString());
+        }
+        return result;
+    }
+
+    /**
+     * 事件赋值得分导出
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link List<EventCategoryResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/12/9 9:55
+     */
+    @Override
+    public List<EventCategoryResultDTO> getEventCategorySoreExport(TokenDto tokenDto, EventCategoryFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getOrgId())){
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null == staffInfo){
+                throw new EpmetException("未查询到此工作人员的所属组织信息...");
+            }
+            formDTO.setOrgId(staffInfo.getAgencyId());
+            formDTO.setOrgType("agency");
+        }
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setCustomerId("6f203e30de1a65aab7e69c058826cd80");
+        //获取项目分类
+        List<EventCategoryResultDTO> projectCategoryList = pingYinEventDao.selectProjectCategoryForExport(formDTO.getCustomerId());
+        //获取项目赋值得分统计
+        List<EventCategoryResultDTO> projectScoreList = pingYinEventDao.selectProjectCategoryScoreList(formDTO);
+        if (CollectionUtils.isNotEmpty(projectScoreList)) {
+            projectCategoryList.forEach(item -> {
+                projectScoreList.stream().filter(e -> item.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> {
+                    item.setEventTotal(e.getEventTotal());
+                    item.setTotalScore(e.getTotalScore());
+                });
+            });
+        }
+        List<EventCategoryResultDTO> result = new ArrayList<>(projectCategoryList);
+        //获取例行工作分类
+        List<EventCategoryResultDTO> workCategoryList = pingYinEventDao.selectWorkCategoryForExport();
+        //获取例行工作赋值得分统计
+        List<EventCategoryResultDTO> workScoreList = pingYinEventDao.selectWorkCategoryScoreList(formDTO);
+        if (CollectionUtils.isNotEmpty(workScoreList)) {
+            workCategoryList.forEach(item -> {
+                workScoreList.stream().filter(e -> item.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> {
+                    item.setEventTotal(e.getEventTotal());
+                    item.setTotalScore(e.getTotalScore());
+                });
+            });
+        }
+        result.addAll(workCategoryList);
+        return result;
+    }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/eventScore.xlsx b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/eventScore.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..4966fd5e327f044cdae9434bbafaf77e84b5806c
GIT binary patch
literal 12491
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

literal 0
HcmV?d00001

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/PingYinEventDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/PingYinEventDao.xml
index db627975ae..54c52e5095 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/PingYinEventDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/PingYinEventDao.xml
@@ -76,8 +76,6 @@
             SUM( c.SCORE ) AS totalScore
         FROM
             screen_py_event_data a
-            INNER JOIN screen_project_data b ON a.EVENT_ID = b.PROJECT_ID
-            AND b.DEL_FLAG = '0'
             INNER JOIN customer_project_category_dict c ON a.CATEGORY_CODE = c.CATEGORY_CODE
             AND c.DEL_FLAG = '0'
             AND c.CUSTOMER_ID = #{customerId}
@@ -86,17 +84,24 @@
             a.DEL_FLAG = '0'
             AND a.EVENT_TYPE = 'project'
             <if test="startTime != null and startTime != ''">
-                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y-%m-%d' ) &gt;= #{startTime}
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &gt;= #{startTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y-%m-%d' ) &lt;= #{endTime}
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &lt;= #{endTime}
             </if>
             <if test="orgType == 'grid'">
-                AND b.ORG_ID = #{orgId}
+                AND a.ORG_ID = #{orgId}
             </if>
             <if test="orgType == 'agency'">
-                AND b.ALL_PARENT_IDS LIKE CONCAT('%', #{orgId}, '%')
+                AND a.PIDS LIKE CONCAT('%', #{orgId}, '%')
+            </if>
+            <if test="name != null and name != ''">
+                AND a.STAFF_NAME LIKE CONCAT('%', #{name}, '%')
             </if>
+            <if test="mobile != null and mobile != ''">
+                AND a.MOBILE LIKE CONCAT('%', #{mobile}, '%')
+            </if>
+        GROUP BY a.CATEGORY_CODE
             ) a
         WHERE CATEGORY_CODE IS NOT NULL
     </select>
@@ -113,27 +118,234 @@
             SUM( c.SCORE ) AS totalScore
         FROM
             screen_py_event_data a
-            INNER JOIN epmet_user.patrol_routine_work b ON a.EVENT_ID = b.ID
-            AND b.DEL_FLAG = '0'
             INNER JOIN customer_patrol_work_type_dict c ON a.CATEGORY_CODE = c.CATEGORY_CODE
             AND c.IS_DISABLE = 'enable'
         WHERE
             a.DEL_FLAG = '0'
             AND a.EVENT_TYPE = 'work'
             <if test="startTime != null and startTime != ''">
-                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y-%m-%d' ) &gt;= #{startTime}
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &gt;= #{startTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y-%m-%d' ) &lt;= #{endTime}
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &lt;= #{endTime}
             </if>
             <if test="orgType == 'grid'">
-                AND b.GRID_ID = #{orgId}
+                AND a.ORG_ID = #{orgId}
             </if>
             <if test="orgType == 'agency'">
-                AND b.PIDS LIKE CONCAT('%', #{orgId}, '%')
+                AND a.PIDS LIKE CONCAT('%', #{orgId}, '%')
+            </if>
+            <if test="name != null and name != ''">
+                AND a.STAFF_NAME LIKE CONCAT('%', #{name}, '%')
+            </if>
+            <if test="mobile != null and mobile != ''">
+                AND a.MOBILE LIKE CONCAT('%', #{mobile}, '%')
             </if>
+        GROUP BY a.CATEGORY_CODE
         ) a
         WHERE CATEGORY_CODE IS NOT NULL
     </select>
 
+    <select id="getProjectCategoryList" resultType="com.epmet.dataaggre.dto.evaluationindex.result.EventCategoryListResultDTO">
+        SELECT
+            a.EVENT_ID,
+            a.EVENT_TYPE,
+            b.PROJECT_TITLE AS "title",
+            CONCAT( d.CATEGORY_NAME, '-', c.CATEGORY_NAME ) AS "category",
+            b.PROJECT_STATUS_CODE AS "status",
+            b.PROJECT_CREATE_TIME AS "createTime",
+            b.ORG_ID AS "gridId",
+            b.LINK_NAME AS "staffName",
+            c.SCORE
+        FROM
+            screen_py_event_data a
+            INNER JOIN screen_project_data b ON a.EVENT_ID = b.PROJECT_ID
+            INNER JOIN customer_project_category_dict c ON a.CATEGORY_CODE = c.CATEGORY_CODE
+            AND c.CUSTOMER_ID = #{customerId}
+            INNER JOIN customer_project_category_dict d ON d.CATEGORY_CODE = c.PARENT_CATEGORY_CODE
+            AND d.CUSTOMER_ID = #{customerId}
+        WHERE
+            a.EVENT_TYPE = 'project'
+            AND (c.CATEGORY_CODE = #{categoryCode} OR d.CATEGORY_CODE = #{categoryCode})
+            <if test="orgType == 'grid'">
+                AND b.ORG_ID = #{orgId}
+            </if>
+            <if test="orgType == 'agency'">
+                AND b.ALL_PARENT_IDS LIKE CONCAT('%', #{orgId}, '%')
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &lt;= #{endTime}
+            </if>
+            <if test="name != null and name != ''">
+                AND b.LINK_NAME LIKE CONCAT('%', #{name}, '%')
+            </if>
+            <if test="mobile != null and mobile != ''">
+                AND b.LINK_MOBILE LIKE CONCAT('%', #{mobile}, '%')
+            </if>
+        ORDER BY PROJECT_CREATE_TIME DESC
+    </select>
+
+    <select id="getWorkCategoryList" resultType="com.epmet.dataaggre.dto.evaluationindex.result.EventCategoryListResultDTO">
+        SELECT
+            a.EVENT_ID,
+            a.EVENT_TYPE,
+            a.TITLE,
+            CONCAT( d.CATEGORY_NAME, '-', c.CATEGORY_NAME ) AS "category",
+            DATE_FORMAT(a.EVENT_CREATE_TIME,'%Y-%m-%d') AS "createTime",
+            a.ORG_ID AS 'gridId',
+            a.STAFF_NAME AS 'staffName',
+            c.SCORE
+        FROM
+            screen_py_event_data a
+            INNER JOIN customer_patrol_work_type_dict c ON a.CATEGORY_CODE = c.CATEGORY_CODE
+            INNER JOIN customer_patrol_work_type_dict d ON d.CATEGORY_CODE = c.PARENT_CATEGORY_CODE
+        WHERE
+            a.EVENT_TYPE = 'WORK'
+            AND (c.CATEGORY_CODE = '01' OR d.CATEGORY_CODE = '01')
+            <if test="orgType == 'grid'">
+                AND a.ORG_ID = #{orgId}
+            </if>
+            <if test="orgType == 'agency'">
+                AND a.PIDS LIKE CONCAT('%', #{orgId}, '%')
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &lt;= #{endTime}
+            </if>
+            <if test="name != null and name != ''">
+                AND a.STAFF_NAME LIKE CONCAT('%', #{name}, '%')
+            </if>
+            <if test="mobile != null and mobile != ''">
+                AND a.MOBILE LIKE CONCAT('%', #{mobile}, '%')
+            </if>
+        ORDER BY EVENT_CREATE_TIME DESC
+    </select>
+    <select id="getProjectTotalScore" resultType="java.lang.Long">
+        SELECT
+            IFNULL(SUM( c.SCORE ), 0) AS totalScore
+        FROM
+            screen_py_event_data a
+            INNER JOIN customer_project_category_dict c ON a.CATEGORY_CODE = c.CATEGORY_CODE
+            AND c.DEL_FLAG = '0'
+            AND c.CUSTOMER_ID = #{customerId}
+            AND c.IS_DISABLE = 'enable'
+        WHERE
+            a.DEL_FLAG = '0'
+            AND a.EVENT_TYPE = 'project'
+            <if test="startTime != null and startTime != ''">
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &lt;= #{endTime}
+            </if>
+            <if test="orgType == 'grid'">
+                AND a.ORG_ID = #{orgId}
+            </if>
+            <if test="orgType == 'agency'">
+                AND a.PIDS LIKE CONCAT('%', #{orgId}, '%')
+            </if>
+            <if test="name != null and name != ''">
+                AND a.STAFF_NAME LIKE CONCAT('%', #{name}, '%')
+            </if>
+            <if test="mobile != null and mobile != ''">
+                AND a.MOBILE LIKE CONCAT('%', #{mobile}, '%')
+            </if>
+    </select>
+    <select id="getWorkTotalScore" resultType="java.lang.Long">
+        SELECT
+            IFNULL(SUM( c.SCORE ), 0) AS totalScore
+        FROM
+            screen_py_event_data a
+            INNER JOIN customer_patrol_work_type_dict c ON a.CATEGORY_CODE = c.CATEGORY_CODE
+            AND c.IS_DISABLE = 'enable'
+        WHERE
+            a.DEL_FLAG = '0'
+            AND a.EVENT_TYPE = 'work'
+            <if test="startTime != null and startTime != ''">
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND DATE_FORMAT( a.EVENT_CREATE_TIME, '%Y%m%d' ) &lt;= #{endTime}
+            </if>
+            <if test="orgType == 'grid'">
+                AND a.ORG_ID = #{orgId}
+            </if>
+            <if test="orgType == 'agency'">
+                AND a.PIDS LIKE CONCAT('%', #{orgId}, '%')
+            </if>
+            <if test="name != null and name != ''">
+                AND a.STAFF_NAME LIKE CONCAT('%', #{name}, '%')
+            </if>
+            <if test="mobile != null and mobile != ''">
+                AND a.MOBILE LIKE CONCAT('%', #{mobile}, '%')
+            </if>
+    </select>
+    <select id="getMemberCount" resultType="java.lang.Long">
+        SELECT
+            IFNULL(COUNT(ID), 0)
+        FROM
+            screen_py_grid_staff
+        WHERE
+            DEL_FLAG = '0'
+            AND IS_LEAVE = 'N'
+            <if test="orgType == 'grid'">
+                AND GRID_ID = #{orgId}
+            </if>
+            <if test="orgType == 'agency'">
+                AND PIDS LIKE CONCAT('%', #{orgId}, '%')
+            </if>
+            <if test="name != null and name != ''">
+                AND STAFF_NAME LIKE CONCAT('%', #{name}, '%')
+            </if>
+            <if test="mobile != null and mobile != ''">
+                AND MOBILE LIKE CONCAT('%', #{mobile}, '%')
+            </if>
+    </select>
+    <select id="selectProjectCategoryForExport" resultType="com.epmet.dataaggre.dto.evaluationindex.EventCategoryResultDTO">
+        SELECT
+            '上报事件' AS eventType,
+            p1.CATEGORY_CODE AS parentCategoryCode,
+            p2.CATEGORY_CODE AS categoryCode,
+            p1.CATEGORY_NAME AS parentCategoryName,
+            p2.CATEGORY_NAME AS categoryName,
+            p2.SCORE AS score
+        FROM
+            customer_project_category_dict p1,
+            customer_project_category_dict p2
+        WHERE
+            p1.DEL_FLAG = '0'
+            AND p2.DEL_FLAG = '0'
+            AND p1.CUSTOMER_ID = #{customerId}
+            AND p2.CUSTOMER_ID = #{customerId}
+            AND p1.CATEGORY_CODE = p2.PARENT_CATEGORY_CODE
+            AND p1.CUSTOMER_TYPE = 'internal'
+            AND p2.CUSTOMER_TYPE = 'internal'
+            AND p1.IS_DISABLE = 'enable'
+            AND p2.IS_DISABLE = 'enable'
+        ORDER BY
+            p1.SORT,
+            p2.SORT
+    </select>
+    <select id="selectWorkCategoryForExport" resultType="com.epmet.dataaggre.dto.evaluationindex.EventCategoryResultDTO">
+        SELECT
+            '例行工作' AS eventType,
+            p1.CATEGORY_CODE AS parentCategoryCode,
+            p2.CATEGORY_CODE AS categoryCode,
+            p1.CATEGORY_NAME AS parentCategoryName,
+            p2.CATEGORY_NAME AS categoryName,
+            p2.SCORE AS score
+        FROM customer_patrol_work_type_dict p1,customer_patrol_work_type_dict p2
+        WHERE p1.DEL_FLAG = '0'
+          AND p2.DEL_FLAG = '0'
+          AND p1.CATEGORY_CODE = p2.PARENT_CATEGORY_CODE
+          AND p1.IS_DISABLE = 'enable'
+          AND p2.IS_DISABLE = 'enable'
+        ORDER BY p1.SORT, p2.SORT
+    </select>
+
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/GridstaffWorkInfoPingyinDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/GridstaffWorkInfoPingyinDTO.java
index 161a63e263..b277c2bee9 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/GridstaffWorkInfoPingyinDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/GridstaffWorkInfoPingyinDTO.java
@@ -84,4 +84,10 @@ public class GridstaffWorkInfoPingyinDTO {
 
 	private String happenTimeString;
 
+	private String title;
+	private String staffName;
+	private String mobile;
+	private String orgId;
+	private String pids;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPyEventDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPyEventDataEntity.java
index 8039234f00..2b31ed2fed 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPyEventDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenPyEventDataEntity.java
@@ -25,16 +25,16 @@ public class ScreenPyEventDataEntity extends BaseEpmetEntity {
     // * 客户Id
     // */
 	//private String customerId;
-	//
-    ///**
-    // * 上级组织Id
-    // */
-	//private String parentId;
-	//
-    ///**
-    // * 所有上级ID，用英文逗号分开
-    // */
-	//private String allParentIds;
+
+    /**
+     * 上级组织Id
+     */
+	private String orgId;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+	private String pids;
 
     /**
      * 事件Id
@@ -56,6 +56,12 @@ public class ScreenPyEventDataEntity extends BaseEpmetEntity {
      */
 	private String categoryCode;
 
+	private String title;
+
+	private String staffName;
+
+	private String mobile;
+
     ///**
     // * 父类事件分类编码
     // */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPyEventDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPyEventDataServiceImpl.java
index 01e9dbda03..b916f891a7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPyEventDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPyEventDataServiceImpl.java
@@ -4,14 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.evaluationindex.screen.ScreenProjectDataDao;
 import com.epmet.dao.evaluationindex.screen.ScreenPyEventDataDao;
 import com.epmet.dto.screen.form.SavePyEventDataFormDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectDataEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenPyEventDataEntity;
 import com.epmet.service.evaluationindex.screen.ScreenPyEventDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * 上报到市平台中间库的事件
  *
@@ -23,6 +27,8 @@ import org.springframework.stereotype.Service;
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class ScreenPyEventDataServiceImpl extends BaseServiceImpl<ScreenPyEventDataDao, ScreenPyEventDataEntity> implements ScreenPyEventDataService {
 
+    @Resource
+    private ScreenProjectDataDao screenProjectDataDao;
     /**
      * 保存同步到中间库的数据
      *
@@ -41,6 +47,14 @@ public class ScreenPyEventDataServiceImpl extends BaseServiceImpl<ScreenPyEventD
                 entity.setEventType("project");
                 entity.setEventCreateTime(item.getReportTime());
                 entity.setCategoryCode(item.getEventCategory());
+                ScreenProjectDataEntity project = screenProjectDataDao.selectById(entity.getEventId());
+                if (null != project) {
+                    entity.setOrgId(project.getOrgId());
+                    entity.setPids(project.getAllParentIds());
+                    entity.setTitle(project.getProjectTitle());
+                    entity.setStaffName(project.getLinkName());
+                    entity.setMobile(project.getLinkMobile());
+                }
                 LambdaQueryWrapper<ScreenPyEventDataEntity> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(ScreenPyEventDataEntity::getEventId, entity.getEventId());
                 wrapper.eq(ScreenPyEventDataEntity::getEventType, entity.getEventType());
@@ -60,6 +74,11 @@ public class ScreenPyEventDataServiceImpl extends BaseServiceImpl<ScreenPyEventD
                 entity.setEventType("work");
                 entity.setEventCreateTime(item.getHappenTime());
                 entity.setCategoryCode(item.getWorkType());
+                entity.setOrgId(item.getOrgId());
+                entity.setPids(item.getPids());
+                entity.setTitle(item.getTitle());
+                entity.setStaffName(item.getStaffName());
+                entity.setMobile(item.getMobile());
                 LambdaQueryWrapper<ScreenPyEventDataEntity> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(ScreenPyEventDataEntity::getEventId, entity.getEventId());
                 wrapper.eq(ScreenPyEventDataEntity::getEventType, entity.getEventType());
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java
index 3577f3311d..5c554f218d 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java
@@ -114,6 +114,8 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<Gridsta
     public void saveData(EventInfoFormDTO formDTO) {
         PatrolQueryFormDTO midPatrolFormDTO = new PatrolQueryFormDTO();
         midPatrolFormDTO.setCustomerId(formDTO.getCustomerId());
+        midPatrolFormDTO.setStartTime(DateUtils.format(formDTO.getStartTime(), DateUtils.DATE_PATTERN));
+        midPatrolFormDTO.setEndTime(DateUtils.format(formDTO.getEndTime(), DateUtils.DATE_PATTERN));
         midPatrolFormDTO.setPageNo(NumConstant.ONE);
         midPatrolFormDTO.setPageSize(NumConstant.ONE_THOUSAND);
         List<PatrolRoutineWorkResult> data;
@@ -144,6 +146,11 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<Gridsta
                     dto.setId(item.getId());
                     dto.setHappenTime(DateUtils.parseDate(item.getHappenTime().concat(" 00:00:00"), DateUtils.DATE_PATTERN));
                     dto.setWorkType(item.getWorkTypeSecondCode());
+                    dto.setTitle(item.getTitle());
+                    dto.setOrgId(item.getGridId());
+                    dto.setPids(item.getPids());
+                    dto.setStaffName(item.getStaffName());
+                    dto.setMobile(item.getMobile());
                     return dto;
                 }).collect(Collectors.toList());
                 //将同步的数据保存
@@ -184,6 +191,11 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<Gridsta
             dto.setId(o.getId());
             dto.setHappenTime(DateUtils.parseDate(o.getHappenTime().concat(" 00:00:00"), DateUtils.DATE_PATTERN));
             dto.setWorkType(o.getWorkTypeSecondCode());
+            dto.setTitle(o.getTitle());
+            dto.setOrgId(o.getGridId());
+            dto.setPids(o.getPids());
+            dto.setStaffName(o.getStaffName());
+            dto.setMobile(o.getMobile());
             newList.add(dto);
         });
         //insert
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/patrol/PatrolQueryFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/patrol/PatrolQueryFormDTO.java
index 4cd3988831..9df2c0c337 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/patrol/PatrolQueryFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/patrol/PatrolQueryFormDTO.java
@@ -26,4 +26,7 @@ public class PatrolQueryFormDTO extends PageFormDTO implements Serializable {
      */
     private String id;
 
+    private String startTime;
+    private String endTime;
+
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java
index ce558ef5c5..b2c78f0cc3 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java
@@ -24,11 +24,12 @@ public class PatrolRoutineWorkResult implements Serializable {
     private String gridId;
     private String gridCode;
     private String gridName;
-
+    private String pids;
     private String title;
 
     private String userId;
-
+    private String staffName;
+    private String mobile;
     /**
      * 一级工作类型 code
      */
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml
index 5d155dbe82..093ea9f131 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml
@@ -26,15 +26,24 @@
     <select id="selectList" resultType="com.epmet.dto.result.PatrolRoutineWorkResult">
         SELECT
             m.*,
+            cs.REAL_NAME AS staffName,
+	        cs.MOBILE,
             prwt.WORK_TYPE_CODE AS workTypeSecondCode,
             substring_index(prwt.ALL_P_CODE,':',1) AS workTypeFirstCode
         FROM epmet_user.patrol_routine_work m
+        INNER JOIN customer_staff cs ON m.USER_ID = cs.USER_ID
         LEFT JOIN patrol_routine_work_type prwt ON m.ID = prwt.ROUTINE_WORK_ID
         WHERE
         m.CUSTOMER_ID = #{customerId}
         <if test="id != null and id != ''">
             AND m.ID = #{id}
         </if>
+        <if test="startTime != null and startTime != ''">
+                AND DATE_FORMAT( HAPPEN_TIME, '%Y-%m-%d' ) &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND DATE_FORMAT( HAPPEN_TIME, '%Y-%m-%d' ) &lt;= #{endTime}
+            </if>
         AND m.DEL_FLAG = '0'
     </select>