diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectCategoryGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectCategoryGridDailyDTO.java
new file mode 100644
index 0000000000..4e031a17ba
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectCategoryGridDailyDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto.indexcollect;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目(事件)分类按网格_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+public class ScreenProjectCategoryGridDailyDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String dateId;
+
+ /**
+ * 网格id
+ */
+ private String gridId;
+
+ /**
+ * 网格所属的组织id
+ */
+ private String pid;
+
+ /**
+ * 网格所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 类别编码
+ */
+ private String epmetCategoryCode;
+
+ /**
+ * 该分类下所有项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 该分类下,正在处理中的项目总数
+ */
+ private Integer pendingTotal;
+
+ /**
+ * 该分类下已结案的项目总数
+ */
+ private Integer closedTotal;
+
+ /**
+ * 该分类下已结案无需解决的项目总数
+ */
+ private Integer unResolvedTotal;
+
+ /**
+ * 该分类下已结案已解决的项目总数
+ */
+ private Integer resolvedTotal;
+
+ /**
+ * 删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectCategoryOrgDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectCategoryOrgDailyDTO.java
new file mode 100644
index 0000000000..c046d257b0
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectCategoryOrgDailyDTO.java
@@ -0,0 +1,131 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto.indexcollect;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目(事件)分类按组织_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+public class ScreenProjectCategoryOrgDailyDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String dateId;
+
+ /**
+ * 组织id
+ */
+ private String orgId;
+
+ /**
+ * 社区级:community,乡(镇、街道)级:street,区县级: district,市级: city省级:province
+ */
+ private String orgType;
+
+ /**
+ * 当前orgId所属的上级id
+ */
+ private String pid;
+
+ /**
+ * orgId所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 类别编码
+ */
+ private String epmetCategoryCode;
+
+ /**
+ * 该分类下所有项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 该分类下,正在处理中的项目总数
+ */
+ private Integer pendingTotal;
+
+ /**
+ * 该分类下已结案的项目总数
+ */
+ private Integer closedTotal;
+
+ /**
+ * 该分类下已结案无需解决的项目总数
+ */
+ private Integer unResolvedTotal;
+
+ /**
+ * 该分类下已结案已解决的项目总数
+ */
+ private Integer resolvedTotal;
+
+ /**
+ * 删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectGridDailyDTO.java
new file mode 100644
index 0000000000..52c21d9de8
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectGridDailyDTO.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto.indexcollect;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 项目(事件)分析按网格_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+public class ScreenProjectGridDailyDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String dateId;
+
+ /**
+ * 网格id
+ */
+ private String gridId;
+
+ /**
+ * 网格所属的组织id
+ */
+ private String pid;
+
+ /**
+ * 网格所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 截止到当前日期,网格内项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 截止到当前日期,网格内已解决的项目总数
+ */
+ private Integer resolvedNum;
+
+ /**
+ * 解决率=RESOLVED_NUM/PROJECT_TOTAL,存储小数即可,保留小数点后4位
+ */
+ private BigDecimal resolvedRatio;
+
+ /**
+ * 对当前网格内项目,参与满意度评价的总次数
+ */
+ private Integer evaluateTotal;
+
+ /**
+ * 对当前网格内项目,满意+非常满意的总次数
+ */
+ private Integer goodTotal;
+
+ /**
+ * 对当前网格内项目,不满意总次数
+ */
+ private Integer badTotal;
+
+ /**
+ * 满意率=good_total/evaluate_total
+ */
+ private BigDecimal goodRatio;
+
+ /**
+ * 不满意率=bad_total/evaluate_total
+ */
+ private BigDecimal badRatio;
+
+ /**
+ * 删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectOrgDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectOrgDailyDTO.java
new file mode 100644
index 0000000000..690a63f263
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectOrgDailyDTO.java
@@ -0,0 +1,142 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto.indexcollect;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 项目(事件)分析按组织_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+public class ScreenProjectOrgDailyDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String dateId;
+
+ /**
+ * 组织id
+ */
+ private String orgId;
+
+ /**
+ * 社区级:community,乡(镇、街道)级:street,区县级: district,市级: city省级:province
+ */
+ private String orgType;
+
+ /**
+ * 当前orgId所属的上级id
+ */
+ private String pid;
+
+ /**
+ * orgId所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 截止到当前日期,网格内项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 截止到当前日期,网格内已解决的项目总数
+ */
+ private Integer resolvedNum;
+
+ /**
+ * 解决率=RESOLVED_NUM/PROJECT_TOTAL,存储小数即可,保留小数点后4位
+ */
+ private BigDecimal resolvedRatio;
+
+ /**
+ * 对当前组织内项目,参与满意度评价的总次数
+ */
+ private Integer evaluateTotal;
+
+ /**
+ * 对当前组织内项目,满意+非常满意的总次数
+ */
+ private Integer goodTotal;
+
+ /**
+ * 对当前组织内项目,不满意总次数
+ */
+ private Integer badTotal;
+
+ /**
+ * 满意率=good_total/evaluate_total
+ */
+ private BigDecimal goodRatio;
+
+ /**
+ * 不满意率=bad_total/evaluate_total
+ */
+ private BigDecimal badRatio;
+
+ /**
+ * 删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectQuantityGridMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectQuantityGridMonthlyDTO.java
new file mode 100644
index 0000000000..ab5100a9c6
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectQuantityGridMonthlyDTO.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto.indexcollect;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目(事件)数量分析按网格_按月统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+public class ScreenProjectQuantityGridMonthlyDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String monthId;
+
+ /**
+ * 网格id
+ */
+ private String gridId;
+
+ /**
+ * 网格所属的组织id
+ */
+ private String pid;
+
+ /**
+ * 网格所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 当前网格,本月新增的项目数量:转项目日期在当前月份内
+ */
+ private Integer projectIncr;
+
+ /**
+ * 截止到当前月份:累计项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 截止到当前月份:累计未结项目总数
+ */
+ private Integer unClosedTotal;
+
+ /**
+ * 截止到当前月份:累计已结项目
+ */
+ private Integer closedTotal;
+
+ /**
+ * 本月新增结案项目数
+ */
+ private Integer closedIncr;
+
+ /**
+ * 删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectQuantityOrgMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectQuantityOrgMonthlyDTO.java
new file mode 100644
index 0000000000..f816e9d9d3
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectQuantityOrgMonthlyDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto.indexcollect;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目(事件)数量分析按组织_按月统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+public class ScreenProjectQuantityOrgMonthlyDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String monthId;
+
+ /**
+ * 组织id
+ */
+ private String orgId;
+
+ /**
+ * 社区级:community,乡(镇、街道)级:street,区县级: district,市级: city省级:province
+ */
+ private String orgType;
+
+ /**
+ * 当前orgId所属的上级id
+ */
+ private String pid;
+
+ /**
+ * orgId所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 当前组织内,本月新增的项目数量:转项目日期在当前月份内
+ */
+ private Integer projectIncr;
+
+ /**
+ * 截止到当前月份:累计项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 截止到当前月份:累计未结项目总数
+ */
+ private Integer unClosedTotal;
+
+ /**
+ * 截止到当前月份:累计已结项目
+ */
+ private Integer closedTotal;
+
+ /**
+ * 本月新增结案项目数
+ */
+ private Integer closedIncr;
+
+ /**
+ * 删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectCategoryGridDailyListFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectCategoryGridDailyListFormDTO.java
new file mode 100644
index 0000000000..c292119449
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectCategoryGridDailyListFormDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.indexcollect.form;
+
+import com.epmet.dto.indexcollect.ScreenProjectCategoryGridDailyDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 上传 项目(事件)分类按网格_按天统计 传入参数
+ * @ClassName ColProjectCategoryGridDailyListFormDTO
+ * @Auth wangc
+ * @Date 2021-01-27 16:29
+ */
+@Data
+public class ColProjectCategoryGridDailyListFormDTO implements Serializable {
+ private static final long serialVersionUID = -5649120224533894681L;
+
+ /**
+ * 当为true时后台将先删除当前维度的数据,后新增
+ */
+ @NotNull(message = "是否首次不可为空")
+ private Boolean isFirst;
+
+ /**
+ * 日期Id, 数据更新至:yyyyMMdd
+ */
+ @NotBlank(message = "日期不可为空")
+ private String dateId;
+
+ @NotNull(message = "缺少数据列表")
+ @NotEmpty(message = "数据列表不能为空")
+ private List dataList;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectCategoryOrgDailyListFromDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectCategoryOrgDailyListFromDTO.java
new file mode 100644
index 0000000000..bd110ad563
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectCategoryOrgDailyListFromDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.indexcollect.form;
+
+import com.epmet.dto.indexcollect.ScreenProjectCategoryOrgDailyDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 上传 项目(事件)分类按组织_按天统计 传入参数
+ * @ClassName ColProjectCategoryOrgDailyListFromDTO
+ * @Auth wangc
+ * @Date 2021-01-27 16:29
+ */
+@Data
+public class ColProjectCategoryOrgDailyListFromDTO implements Serializable {
+ private static final long serialVersionUID = -5606202046322115413L;
+
+ /**
+ * 当为true时后台将先删除当前维度的数据,后新增
+ */
+ @NotNull(message = "是否首次不可为空")
+ private Boolean isFirst;
+
+ /**
+ * 日期Id, 数据更新至:yyyyMMdd
+ */
+ @NotBlank(message = "日期不可为空")
+ private String dateId;
+
+ @NotNull(message = "缺少数据列表")
+ @NotEmpty(message = "数据列表不能为空")
+ private List dataList;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectGridDailyListFromDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectGridDailyListFromDTO.java
new file mode 100644
index 0000000000..bf33228f3d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectGridDailyListFromDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.indexcollect.form;
+
+import com.epmet.dto.indexcollect.ScreenProjectGridDailyDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 上传 项目(事件)分析按网格_按天统计 传入参数
+ * @ClassName ColProjectGridDailyListFromDTO
+ * @Auth wangc
+ * @Date 2021-01-27 16:29
+ */
+@Data
+public class ColProjectGridDailyListFromDTO implements Serializable {
+ private static final long serialVersionUID = -7615867900486598440L;
+
+ /**
+ * 当为true时后台将先删除当前维度的数据,后新增
+ */
+ @NotNull(message = "是否首次不可为空")
+ private Boolean isFirst;
+
+ /**
+ * 日期Id, 数据更新至:yyyyMMdd
+ */
+ @NotBlank(message = "日期不可为空")
+ private String dateId;
+
+ @NotNull(message = "缺少数据列表")
+ @NotEmpty(message = "数据列表不能为空")
+ private List dataList;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectOrgDailyListFromDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectOrgDailyListFromDTO.java
new file mode 100644
index 0000000000..e8d671459d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectOrgDailyListFromDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.indexcollect.form;
+
+import com.epmet.dto.indexcollect.ScreenProjectOrgDailyDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 上传 项目(事件)分析按组织_按天统计 传入参数
+ * @ClassName ColProjectOrgDailyListFromDTO
+ * @Auth wangc
+ * @Date 2021-01-27 16:30
+ */
+@Data
+public class ColProjectOrgDailyListFromDTO implements Serializable {
+ private static final long serialVersionUID = -3813434634371460918L;
+
+ /**
+ * 当为true时后台将先删除当前维度的数据,后新增
+ */
+ @NotNull(message = "是否首次不可为空")
+ private Boolean isFirst;
+
+ /**
+ * 日期Id, 数据更新至:yyyyMMdd
+ */
+ @NotBlank(message = "日期不可为空")
+ private String dateId;
+
+ @NotNull(message = "缺少数据列表")
+ @NotEmpty(message = "数据列表不能为空")
+ private List dataList;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectQuantityGridMonthlyListFromDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectQuantityGridMonthlyListFromDTO.java
new file mode 100644
index 0000000000..2df851e5f1
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectQuantityGridMonthlyListFromDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.indexcollect.form;
+
+import com.epmet.dto.indexcollect.ScreenProjectQuantityGridMonthlyDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 上传 项目(事件)数量分析按网格_按月统计 传入参数
+ * @ClassName ColProjectQuantityGridMonthlyListFromDTO
+ * @Auth wangc
+ * @Date 2021-01-27 16:30
+ */
+@Data
+public class ColProjectQuantityGridMonthlyListFromDTO implements Serializable {
+ private static final long serialVersionUID = -3662662990777826261L;
+
+ /**
+ * 当为true时后台将先删除当前维度的数据,后新增
+ */
+ @NotNull(message = "是否首次不可为空")
+ private Boolean isFirst;
+
+ /**
+ * 日期Id, 数据更新至:yyyyMMdd
+ */
+ @NotBlank(message = "日期不可为空")
+ private String dateId;
+
+ @NotNull(message = "缺少数据列表")
+ @NotEmpty(message = "数据列表不能为空")
+ private List dataList;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectQuantityOrgMonthlyListFromDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectQuantityOrgMonthlyListFromDTO.java
new file mode 100644
index 0000000000..c5f822c72e
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/ColProjectQuantityOrgMonthlyListFromDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dto.indexcollect.form;
+
+import com.epmet.dto.indexcollect.ScreenProjectQuantityOrgMonthlyDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 上传 项目(事件)数量分析按组织_按月统计 传入参数
+ * @ClassName ColProjectQuantityOrgMonthlyListFromDTO
+ * @Auth wangc
+ * @Date 2021-01-27 16:30
+ */
+@Data
+public class ColProjectQuantityOrgMonthlyListFromDTO implements Serializable {
+ private static final long serialVersionUID = -8551691254980519285L;
+ /**
+ * 当为true时后台将先删除当前维度的数据,后新增
+ */
+ @NotNull(message = "是否首次不可为空")
+ private Boolean isFirst;
+
+ /**
+ * 日期Id, 数据更新至:yyyyMMdd
+ */
+ @NotBlank(message = "日期不可为空")
+ private String dateId;
+
+ @NotNull(message = "缺少数据列表")
+ @NotEmpty(message = "数据列表不能为空")
+ private List dataList;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java
new file mode 100644
index 0000000000..12f4f9690e
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java
@@ -0,0 +1,17 @@
+package com.epmet.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 事件/项目采集接口入口
+ * @ClassName ScreenProjectDataCollController
+ * @Auth wangc
+ * @Date 2021-01-27 17:10
+ */
+@Slf4j
+@RestController
+@RequestMapping("project")
+public class ScreenProjectDataCollController {
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.java
new file mode 100644
index 0000000000..70e85574f7
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dao.evaluationindex.indexcoll;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目(事件)分类按网格_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Mapper
+public interface ScreenProjectCategoryGridDailyDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.java
new file mode 100644
index 0000000000..1c07640f10
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dao.evaluationindex.indexcoll;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目(事件)分类按组织_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Mapper
+public interface ScreenProjectCategoryOrgDailyDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectGridDailyDao.java
new file mode 100644
index 0000000000..2125c3bd0b
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectGridDailyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dao.evaluationindex.indexcoll;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目(事件)分析按网格_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Mapper
+public interface ScreenProjectGridDailyDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.java
new file mode 100644
index 0000000000..fa5a4a3dc4
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dao.evaluationindex.indexcoll;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectOrgDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目(事件)分析按组织_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Mapper
+public interface ScreenProjectOrgDailyDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.java
new file mode 100644
index 0000000000..808ce3e53c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dao.evaluationindex.indexcoll;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目(事件)数量分析按网格_按月统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Mapper
+public interface ScreenProjectQuantityGridMonthlyDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.java
new file mode 100644
index 0000000000..63b4315d76
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dao.evaluationindex.indexcoll;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目(事件)数量分析按组织_按月统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Mapper
+public interface ScreenProjectQuantityOrgMonthlyDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyEntity.java
new file mode 100644
index 0000000000..ec9a069243
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyEntity.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.entity.evaluationindex.indexcoll;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 项目(事件)分类按网格_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_project_category_grid_daily")
+public class ScreenProjectCategoryGridDailyEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String dateId;
+
+ /**
+ * 网格id
+ */
+ private String gridId;
+
+ /**
+ * 网格所属的组织id
+ */
+ private String pid;
+
+ /**
+ * 网格所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 类别编码
+ */
+ private String epmetCategoryCode;
+
+ /**
+ * 该分类下所有项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 该分类下,正在处理中的项目总数
+ */
+ private Integer pendingTotal;
+
+ /**
+ * 该分类下已结案的项目总数
+ */
+ private Integer closedTotal;
+
+ /**
+ * 该分类下已结案无需解决的项目总数
+ */
+ private Integer unResolvedTotal;
+
+ /**
+ * 该分类下已结案已解决的项目总数
+ */
+ private Integer resolvedTotal;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyEntity.java
new file mode 100644
index 0000000000..e08ec7a399
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyEntity.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.entity.evaluationindex.indexcoll;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 项目(事件)分类按组织_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_project_category_org_daily")
+public class ScreenProjectCategoryOrgDailyEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String dateId;
+
+ /**
+ * 组织id
+ */
+ private String orgId;
+
+ /**
+ * 社区级:community,乡(镇、街道)级:street,区县级: district,市级: city省级:province
+ */
+ private String orgType;
+
+ /**
+ * 当前orgId所属的上级id
+ */
+ private String pid;
+
+ /**
+ * orgId所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 类别编码
+ */
+ private String epmetCategoryCode;
+
+ /**
+ * 该分类下所有项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 该分类下,正在处理中的项目总数
+ */
+ private Integer pendingTotal;
+
+ /**
+ * 该分类下已结案的项目总数
+ */
+ private Integer closedTotal;
+
+ /**
+ * 该分类下已结案无需解决的项目总数
+ */
+ private Integer unResolvedTotal;
+
+ /**
+ * 该分类下已结案已解决的项目总数
+ */
+ private Integer resolvedTotal;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectGridDailyEntity.java
new file mode 100644
index 0000000000..264f74517c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectGridDailyEntity.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.entity.evaluationindex.indexcoll;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 项目(事件)分析按网格_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_project_grid_daily")
+public class ScreenProjectGridDailyEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String dateId;
+
+ /**
+ * 网格id
+ */
+ private String gridId;
+
+ /**
+ * 网格所属的组织id
+ */
+ private String pid;
+
+ /**
+ * 网格所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 截止到当前日期,网格内项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 截止到当前日期,网格内已解决的项目总数
+ */
+ private Integer resolvedNum;
+
+ /**
+ * 解决率=RESOLVED_NUM/PROJECT_TOTAL,存储小数即可,保留小数点后4位
+ */
+ private BigDecimal resolvedRatio;
+
+ /**
+ * 对当前网格内项目,参与满意度评价的总次数
+ */
+ private Integer evaluateTotal;
+
+ /**
+ * 对当前网格内项目,满意+非常满意的总次数
+ */
+ private Integer goodTotal;
+
+ /**
+ * 对当前网格内项目,不满意总次数
+ */
+ private Integer badTotal;
+
+ /**
+ * 满意率=good_total/evaluate_total
+ */
+ private BigDecimal goodRatio;
+
+ /**
+ * 不满意率=bad_total/evaluate_total
+ */
+ private BigDecimal badRatio;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectOrgDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectOrgDailyEntity.java
new file mode 100644
index 0000000000..4c86636ccc
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectOrgDailyEntity.java
@@ -0,0 +1,112 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.entity.evaluationindex.indexcoll;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 项目(事件)分析按组织_按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_project_org_daily")
+public class ScreenProjectOrgDailyEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String dateId;
+
+ /**
+ * 组织id
+ */
+ private String orgId;
+
+ /**
+ * 社区级:community,乡(镇、街道)级:street,区县级: district,市级: city省级:province
+ */
+ private String orgType;
+
+ /**
+ * 当前orgId所属的上级id
+ */
+ private String pid;
+
+ /**
+ * orgId所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 截止到当前日期,网格内项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 截止到当前日期,网格内已解决的项目总数
+ */
+ private Integer resolvedNum;
+
+ /**
+ * 解决率=RESOLVED_NUM/PROJECT_TOTAL,存储小数即可,保留小数点后4位
+ */
+ private BigDecimal resolvedRatio;
+
+ /**
+ * 对当前组织内项目,参与满意度评价的总次数
+ */
+ private Integer evaluateTotal;
+
+ /**
+ * 对当前组织内项目,满意+非常满意的总次数
+ */
+ private Integer goodTotal;
+
+ /**
+ * 对当前组织内项目,不满意总次数
+ */
+ private Integer badTotal;
+
+ /**
+ * 满意率=good_total/evaluate_total
+ */
+ private BigDecimal goodRatio;
+
+ /**
+ * 不满意率=bad_total/evaluate_total
+ */
+ private BigDecimal badRatio;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyEntity.java
new file mode 100644
index 0000000000..9b3badaf19
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyEntity.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.entity.evaluationindex.indexcoll;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 项目(事件)数量分析按网格_按月统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_project_quantity_grid_monthly")
+public class ScreenProjectQuantityGridMonthlyEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String monthId;
+
+ /**
+ * 网格id
+ */
+ private String gridId;
+
+ /**
+ * 网格所属的组织id
+ */
+ private String pid;
+
+ /**
+ * 网格所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 当前网格,本月新增的项目数量:转项目日期在当前月份内
+ */
+ private Integer projectIncr;
+
+ /**
+ * 截止到当前月份:累计项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 截止到当前月份:累计未结项目总数
+ */
+ private Integer unClosedTotal;
+
+ /**
+ * 截止到当前月份:累计已结项目
+ */
+ private Integer closedTotal;
+
+ /**
+ * 本月新增结案项目数
+ */
+ private Integer closedIncr;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyEntity.java
new file mode 100644
index 0000000000..dce4964d5f
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyEntity.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.entity.evaluationindex.indexcoll;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 项目(事件)数量分析按组织_按月统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-01-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_project_quantity_org_monthly")
+public class ScreenProjectQuantityOrgMonthlyEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 日期yyyyMMdd
+ */
+ private String monthId;
+
+ /**
+ * 组织id
+ */
+ private String orgId;
+
+ /**
+ * 社区级:community,乡(镇、街道)级:street,区县级: district,市级: city省级:province
+ */
+ private String orgType;
+
+ /**
+ * 当前orgId所属的上级id
+ */
+ private String pid;
+
+ /**
+ * orgId所有的父级id,以英文:或者英文,隔开
+ */
+ private String pids;
+
+ /**
+ * 当前组织内,本月新增的项目数量:转项目日期在当前月份内
+ */
+ private Integer projectIncr;
+
+ /**
+ * 截止到当前月份:累计项目总数
+ */
+ private Integer projectTotal;
+
+ /**
+ * 截止到当前月份:累计未结项目总数
+ */
+ private Integer unClosedTotal;
+
+ /**
+ * 截止到当前月份:累计已结项目
+ */
+ private Integer closedTotal;
+
+ /**
+ * 本月新增结案项目数
+ */
+ private Integer closedIncr;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectDataCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectDataCollService.java
new file mode 100644
index 0000000000..07465008a1
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectDataCollService.java
@@ -0,0 +1,9 @@
+package com.epmet.service.evaluationindex.indexcoll;
+
+/**
+ * @Description 事件/项目大屏数据采集service
+ * @author wangc
+ * @date 2021.01.27 17:19
+*/
+public interface ScreenProjectDataCollService {
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectDataCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectDataCollServiceImpl.java
new file mode 100644
index 0000000000..41c2cfde24
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectDataCollServiceImpl.java
@@ -0,0 +1,41 @@
+package com.epmet.service.evaluationindex.indexcoll.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.evaluationindex.indexcoll.*;
+import com.epmet.service.evaluationindex.indexcoll.ScreenProjectDataCollService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description
+ * @ClassName ScreenProjectDataCollServiceImpl
+ * @Auth wangc
+ * @Date 2021-01-27 17:20
+ */
+@Slf4j
+@Service
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+public class ScreenProjectDataCollServiceImpl implements ScreenProjectDataCollService {
+
+ @Autowired
+ private ScreenProjectCategoryGridDailyDao categoryGridDailyDao;
+
+ @Autowired
+ private ScreenProjectCategoryOrgDailyDao categoryOrgDailyDao;
+
+ @Autowired
+ private ScreenProjectGridDailyDao gridDailyDao;
+
+ @Autowired
+ private ScreenProjectOrgDailyDao orgDailyDao;
+
+ @Autowired
+ private ScreenProjectQuantityGridMonthlyDao quantityGridMonthlyDao;
+
+ @Autowired
+ private ScreenProjectQuantityOrgMonthlyDao quantityOrgMonthlyDao;
+
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.xml
new file mode 100644
index 0000000000..d7541618e9
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.xml
new file mode 100644
index 0000000000..74aab67dd6
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectGridDailyDao.xml
new file mode 100644
index 0000000000..497787c124
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectGridDailyDao.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.xml
new file mode 100644
index 0000000000..e7ec55db6b
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.xml
new file mode 100644
index 0000000000..424f17d977
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.xml
new file mode 100644
index 0000000000..ac8995ea27
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file