diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java
index bb8d12f49c..6d7e1124dd 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java
@@ -1,6 +1,8 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.form.DictListFormDTO;
+import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CorsConfigResultDTO;
@@ -8,6 +10,7 @@ import com.epmet.feign.fallback.EpmetAdminOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -84,4 +87,7 @@ public interface EpmetAdminOpenFeignClient {
      */
     @PostMapping("/sys/dict/data/dictmap/{dictType}")
     Result<Map<String, String>> dictMap(@PathVariable("dictType") String dictType);
+
+    @PostMapping("/sys/dict/data/dictlist")
+    Result<List<DictListResultDTO>> dictList(@RequestBody DictListFormDTO formDTO);
 }
diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java
index 139514d1f5..6c16e8f3ae 100644
--- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java
+++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java
@@ -1,6 +1,8 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.form.DictListFormDTO;
+import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -46,4 +48,9 @@ public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignCli
     public Result<Map<String, String>> dictMap(String dictType) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictMap", dictType);
     }
+
+    @Override
+    public Result<List<DictListResultDTO>> dictList(DictListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictList", formDTO);
+    }
 }
diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql
new file mode 100644
index 0000000000..792aec0c87
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.7__add_dict_data_V3.sql
@@ -0,0 +1,9 @@
+-- 1、增加字典类型
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000011, 'age_group', '年龄范围', '', 11, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+
+-- 2、增加字典数据
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000230, 1000000000000000011, '50岁以下', '0', '', 0, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000231, 1000000000000000011, '50-59岁', '1', '', 1, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000232, 1000000000000000011, '60-69岁', '2', '', 2, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000233, 1000000000000000011, '70-79岁', '3', '', 3, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000234, 1000000000000000011, '80岁以上', '4', '', 4, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
diff --git a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java
index 03a3139df2..bfc425b8e1 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java
@@ -23,6 +23,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 
 /**
  * @Description 通用登录接口
@@ -145,4 +148,86 @@ public class LoginController {
 		}
 		return new Result().ok("");
 	}
+	//================start test code==========
+	/**
+	 * 校验签名
+	 */
+	public static boolean checkSignature(String signature, String timestamp, String nonce) {
+		System.out.println("signature:" + signature + "timestamp:" + timestamp + "nonc:" + nonce);
+		String WECHAT_TOKEN = "1jkoyyih83nj8";
+		String[] arr = new String[]{WECHAT_TOKEN, timestamp, nonce};
+		// 将token、timestamp、nonce三个参数进行字典序排序
+		Arrays.sort(arr);
+		StringBuilder content = new StringBuilder();
+		for (int i = 0; i < arr.length; i++) {
+			content.append(arr[i]);
+		}
+		MessageDigest md = null;
+		String tmpStr = null;
+
+		try {
+			md = MessageDigest.getInstance("SHA-1");
+			// 将三个参数字符串拼接成一个字符串进行sha1加密
+			byte[] digest = md.digest(content.toString().getBytes());
+			tmpStr = byteToStr(digest);
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		}
+
+		content = null;
+		// 将sha1加密后的字符串可与signature对比，标识该请求来源于微信
+		System.out.println(tmpStr.equals(signature.toUpperCase()));
+		return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false;
+	}
+
+	/**
+	 * 将字节数组转换为十六进制字符串
+	 *
+	 * @param byteArray
+	 * @return
+	 */
+	private static String byteToStr(byte[] byteArray) {
+		String strDigest = "";
+		for (int i = 0; i < byteArray.length; i++) {
+			strDigest += byteToHexStr(byteArray[i]);
+		}
+		return strDigest;
+	}
+
+	/**
+	 * 将字节转换为十六进制字符串
+	 *
+	 * @param mByte
+	 * @return
+	 */
+	private static String byteToHexStr(byte mByte) {
+		char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+		char[] tempArr = new char[2];
+		tempArr[0] = Digit[(mByte >>> 4) & 0X0F];
+		tempArr[1] = Digit[mByte & 0X0F];
+
+		String s = new String(tempArr);
+		return s;
+	}
+
+
+	/**
+	 * 打开开发者模式签名认证
+	 * @param signature
+	 * @param timestamp
+	 * @param nonce
+	 * @param echostr
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/service", method = RequestMethod.GET)
+	public Object defaultView(String signature, String timestamp, String nonce, String echostr) {
+		if (echostr == null || echostr.isEmpty()) {
+			return nonce;
+		}
+		if (this.checkSignature(signature, timestamp, nonce)) {
+			return echostr;
+		}
+		return nonce;
+	}
 }
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java
index 0bc1a8f7a0..9d455af694 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java
@@ -4,7 +4,6 @@ import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.GovTokenDto;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.DateUtils;
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
index 27f7e71fe5..569ef87c85 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
@@ -295,7 +295,7 @@ public class LoginServiceImpl implements LoginService {
 		if (!flag) {
 			logger.warn(String.format("用户%s登录，验证码输入错误", formDTO.getPhone()));
 			//2020-05-21去除验证码校验
-			return new Result<UserTokenResultDTO>().error(EpmetErrorCode.ERR10019.getCode());
+			//return new Result<UserTokenResultDTO>().error(EpmetErrorCode.ERR10019.getCode());
 		}
 		//2、账号是否存在
 		//获取用户信息
diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml
index 42ec69d1ac..bf965caff7 100644
--- a/epmet-auth/src/main/resources/bootstrap.yml
+++ b/epmet-auth/src/main/resources/bootstrap.yml
@@ -32,6 +32,8 @@ spring:
         namespace: @nacos.discovery.namespace@
         #不把自己注册到注册中心的地址
         register-enabled: @nacos.register-enabled@
+        serviceListChangedListening:
+          enable: @nacos.service-list-changed-listening.enable@
       config:
         enabled: @nacos.config-enabled@
         server-addr: @nacos.server-addr@
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java
index 1a26a3318f..12720182f5 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java
@@ -1,5 +1,6 @@
 package com.epmet.commons.tools.aspect;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.ThreadLocalConstant;
 import com.epmet.commons.tools.exception.*;
@@ -14,6 +15,9 @@ import javax.servlet.http.HttpServletRequest;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 日志切面
@@ -54,6 +58,8 @@ public abstract class BaseRequestLogAspect {
         //    transactionSerial = UUID.randomUUID().toString();
         //}
 
+        Map<String, String> requestHeaders = getRequestHeaders(request);
+
         // 将当前线程名称设置为事务流水号
         if (!StringUtils.isEmpty(transactionSerial)) {
             Thread.currentThread().setName(transactionSerial);
@@ -64,7 +70,8 @@ public abstract class BaseRequestLogAspect {
         try {
             Object[] args = point.getArgs();
             ThreadLocalConstant.requestParam.set(Arrays.toString(point.getArgs()));
-            log.info(">>>>>>>>请求信息>>>>>>>>:事务流水号:{},url:{} ,method:{},请求参数:{}", transactionSerial, requestURI, method, objectsToString(args));
+            log.info(">>>>>>>>请求信息>>>>>>>>:事务流水号:{},url:{} ,method:{},请求参数:{},请求头:{}",
+                    transactionSerial, requestURI, method, objectsToString(args), requestHeaders);
             result = point.proceed();
             resultInfoLog(transactionSerial, getExecPeriod(startTime), result);
         } catch (EpmetException e) {
@@ -99,6 +106,23 @@ public abstract class BaseRequestLogAspect {
         return result;
     }
 
+    /**
+     * @Description 获取请求头信息
+     * @return
+     * @author wxz
+     * @date 2021.03.31 13:59
+    */
+    private Map<String, String> getRequestHeaders(HttpServletRequest request) {
+        Enumeration<String> headerNames = request.getHeaderNames();
+        HashMap<String, String> headerMap = new HashMap<>();
+        while (headerNames.hasMoreElements()) {
+            String headerName = headerNames.nextElement();
+            String headerValue = request.getHeader(headerName);
+            headerMap.put(headerName, headerValue);
+        }
+        return headerMap;
+    }
+
     /**
      * info日志
      * @param transactionSerial
@@ -258,7 +282,13 @@ public abstract class BaseRequestLogAspect {
             StringBuilder builder = new StringBuilder("[");
             for (Object object : args) {
                 if (object != null) {
-                    builder.append(object.toString());
+                    try {
+                        // 尝试作为json解析
+                        String objectString = JSON.toJSONString(object);
+                        builder.append(objectString);
+                    } catch (Exception e) {
+                        builder.append(object.toString());
+                    }
                     builder.append(",");
                 }
             }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java
new file mode 100644
index 0000000000..5f815c7f5c
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionDataResultDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.commons.tools.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/8 14:50
+ */
+@Data
+public class OptionDataResultDTO implements Serializable {
+    private static final long serialVersionUID = 416877704759019210L;
+    private String label;
+    private String value;
+    private String code;
+    private String radio;
+}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
index 478e7d4376..e1fa6b1456 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
@@ -18,7 +18,8 @@ public enum DictTypeEnum {
     GENDER("gender", "性别", 8),
     USER_DEMAND_STATUS("user_demand_status",	"居民需求状态",8),
     USER_DEMAND_REPORT_TYPE("user_demand_report_type","居民需求上报类型",9),
-    USER_DEMAND_SERVICE_TYPE("user_demand_service_type","居民需求服务方类型",10)
+    USER_DEMAND_SERVICE_TYPE("user_demand_service_type","居民需求服务方类型",10),
+    AGE_GROUP("age_group", "年龄范围", 11),
     ;
 
     private final String code;
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java
new file mode 100644
index 0000000000..7fb9822290
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java
@@ -0,0 +1,35 @@
+package com.epmet.commons.tools.feign;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+
+
+public class EpmetBaseRequestInterceptor implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate template) {
+        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+        if (requestAttributes == null) {
+            return;
+        }
+
+        HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
+        Enumeration<String> headerNames = request.getHeaderNames();
+        if (headerNames != null) {
+            while (headerNames.hasMoreElements()) {
+                String name = headerNames.nextElement();
+                Enumeration<String> values = request.getHeaders(name);
+                while (values.hasMoreElements()) {
+                    String value = values.nextElement();
+                    template.header(name, value);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java
index c68dbc2913..ec7806a620 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java
@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -10,49 +10,32 @@ package com.epmet.commons.tools.feign;
 
 import feign.Logger;
 import feign.RequestInterceptor;
-import feign.RequestTemplate;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Enumeration;
 
 
 /**
  * Feign调用，携带header
+ *      各服务可以自定义自己的RequestInterceptor，如果自定义了，此处不会再生效，会优先使用自定义的拦截器实例
  *
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
 @Configuration
-public class FeignConfig implements RequestInterceptor {
-    @Override
-    public void apply(RequestTemplate template) {
-        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-        if (requestAttributes == null) {
-            return;
-        }
-
-        HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
-        Enumeration<String> headerNames = request.getHeaderNames();
-        if (headerNames != null) {
-            while (headerNames.hasMoreElements()) {
-                String name = headerNames.nextElement();
-                Enumeration<String> values = request.getHeaders(name);
-                while (values.hasMoreElements()) {
-                    String value = values.nextElement();
-                    template.header(name, value);
-                }
-            }
-        }
+public class FeignConfig {
 
+    @Bean
+    @ConditionalOnMissingBean
+    RequestInterceptor requestInterceptor() {
+        return new EpmetBaseRequestInterceptor();
     }
 
     @Bean
+    @ConditionalOnMissingBean
     Logger.Level feignLoggerLevel() {
         return Logger.Level.BASIC;//控制台会输出debug日志
     }
+
+
 }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index fce9a8cf85..1003009805 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -349,6 +349,13 @@ public class RedisKeys {
 		return rootPrefix.concat("stats:calflag");
 	}
 
+	/**
+	 * 插入大屏指标数据分布式锁 key
+	 */
+	public static String getScreenIndexDataLockKey() {
+		return rootPrefix.concat("stats:indexcal:lock");
+	}
+
 	/**
 	 * footbar缓存key
 	 * @param customerId
@@ -359,12 +366,6 @@ public class RedisKeys {
 		return rootPrefix.concat("footbar").concat(":").concat(customerId).concat(":").concat(appType);
 	}
 
-	/**
-	 * 插入大屏指标数据分布式锁 key
-	 */
-	public static String getScreenIndexDataLockKey() {
-		return rootPrefix.concat("stats:indexcal:lock");
-	}
 
 	/**
 	 * @return
@@ -568,6 +569,15 @@ public class RedisKeys {
     	return rootPrefix.concat("message:mq:blocked:").concat(blockedMsgLabel);
 	}
 
+	/**
+	 * desc:获取执行完毕的 业务 参数结果key
+	 * @param bizMethod
+	 * @return
+	 */
+	public static String getBackDoorbizExcuteResult(String bizMethod) {
+		return rootPrefix.concat("backdoor:").concat(bizMethod);
+	}
+
 	/**
 	 * @description 登录票据。目前只有IC基层治理平台用到
 	 *
@@ -623,12 +633,4 @@ public class RedisKeys {
 		return rootPrefix.concat("resi:").concat("export").concat(":template:changed").concat(customerId);
 	}
 
-	/**
-	 * desc:获取执行完毕的 业务 参数结果key
-	 * @param bizMethod
-	 * @return
-	 */
-	public static String getBackDoorbizExcuteResult(String bizMethod) {
-		return rootPrefix.concat("backdoor:").concat(bizMethod);
-	}
 }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
index cfca4dec6f..db6abec6aa 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
@@ -11,6 +11,7 @@ package com.epmet.commons.tools.utils;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.TimeListResultDTO;
+import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
@@ -890,4 +891,58 @@ public class DateUtils {
         format = DateUtils.format(DateUtils.getMonthEnd(dateIdDate), DateUtils.DATE_PATTERN_YYYYMMDD);
         System.out.println(format);
     }
+
+    /**
+     * @Author sun
+     * @Description 获取dateId对应的num天的dateId活monthId
+     * dateId  yyyymmdd
+     * type[date;month]
+     * num[1;-1]
+     *  20211201 date 1 -> 20211202
+     *  20211201 month -1 -> 202111
+     **/
+    public static String dateOrmonthId(String dateId, String type, int num){
+        Calendar cal=Calendar.getInstance();
+        if (StringUtils.isNotBlank(dateId)){
+            cal.setTime(DateUtils.parseDate(dateId,DateUtils.DATE_PATTERN_YYYYMMDD));
+        }
+        if("date".equals(type)){
+            cal.add(Calendar.DATE, num);
+        }else if("month".equals(type)){
+            cal.add(Calendar.MONTH, num);
+        }
+        Date time=cal.getTime();
+        if("month".equals(type)){
+            return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMM).format(time);
+        }
+        return new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(time);
+    }
+
+    /**
+     * @Author sun
+     * @Description 获取dateId对应上一个月过去12个月的monthId
+     * dateId  yyyymmdd
+     *  20211201 -> 202012-202111的值
+     **/
+    public static LinkedHashMap<String,String> getXproSub(String dateId){
+        java.time.format.DateTimeFormatter fmt = java.time.format.DateTimeFormatter.ofPattern("yyyyMM");
+        LinkedHashMap<String,String> xAxis = new LinkedHashMap<>();
+        Calendar cal=Calendar.getInstance();
+        cal.setTime(DateUtils.parseDate(dateId, DateUtils.DATE_PATTERN_YYYYMMDD));
+        TimeZone tz = cal.getTimeZone();
+        ZoneId zid = tz == null ? ZoneId.systemDefault() : tz.toZoneId();
+        java.time.LocalDate today = java.time.LocalDateTime.ofInstant(cal.toInstant(), zid).toLocalDate();
+        //java.time.LocalDate today = java.time.LocalDate.now();
+
+        for(int i = NumConstant.TWELVE;i > NumConstant.ZERO; i--){
+            java.time.LocalDate localDate = today.minusMonths(i);
+            String s = localDate.getMonth().getValue() + "月";
+            xAxis.put(localDate.format(fmt),s);
+        }
+        LinkedHashMap<String, String> result = Maps.newLinkedHashMap();
+        xAxis.entrySet().stream().sorted(Map.Entry.comparingByKey())
+                .forEachOrdered((e -> result.put(e.getKey(),e.getValue())));
+        return result;
+    }
+
 }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java
index 331febcfe9..68c0b8012e 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java
@@ -31,7 +31,6 @@ public class Pinyin4jUtil {
         duoyinMap.put('均',new String[]{"jun"});
         duoyinMap.put('会', new String[]{"hui"});
         duoyinMap.put('属', new String[]{"shu"});
-        duoyinMap.put('调', new String[]{"diao"});
     }
 
     /**
@@ -43,6 +42,7 @@ public class Pinyin4jUtil {
      */
     public static String getFirstSpellPinYin(String src, boolean isFullSpell) {
         String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, 1));
+        System.out.println("targetStr="+targetStr);
         String[] split = targetStr.split(",");
         if (split.length > 1) {
             targetStr = split[0];
@@ -59,6 +59,7 @@ public class Pinyin4jUtil {
      */
     public static String getSpellPinYin(String src, boolean isFullSpell,Integer preFont) {
         String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, preFont));
+        System.out.println("targetStr="+targetStr);
         String[] split = targetStr.split(",");
         if (split.length > 1) {
             targetStr = split[0];
@@ -195,8 +196,9 @@ public class Pinyin4jUtil {
     }
 
     public static void main(String[] args) {
-        System.out.println(getFirstSpellPinYin("区直部门",false));
-        System.out.println(getSpellPinYin("党员提出话题数",false,4));
-        System.out.println(getSpellPinYin("社区超期项目数",false,4));
+        //System.out.println(getSpellPinYin("社区超期项目数",true,0));
+        System.out.println(getFirstSpellPinYin("区直部门",true));
+        //System.out.println(getSpellPinYin("党员提出话题数",false,4));
+        //System.out.println(getSpellPinYin("社区超期项目数",false,4));
     }
 }
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 2ef1bea3dd..1169c9ca84 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -323,11 +323,11 @@
                 <!--  <gateway.routes.gov-issue-server.uri>http://localhost:8101</gateway.routes.gov-issue-server.uri>-->
                 <gateway.routes.gov-issue-server.uri>lb://gov-issue-server</gateway.routes.gov-issue-server.uri>
                 <!--  23、政府工作端项目管理             -->
-<!--                   <gateway.routes.gov-project-server.uri>http://localhost:8102</gateway.routes.gov-project-server.uri>-->
+                <!--   <gateway.routes.gov-project-server.uri>http://localhost:8102</gateway.routes.gov-project-server.uri>-->
                 <gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>
                 <!--  24、公共服务              -->
-                <!--<gateway.routes.common-service-server.uri>lb://common-service-server</gateway.routes.common-service-server.uri>-->
-                <gateway.routes.common-service-server.uri>http://localhost:8103</gateway.routes.common-service-server.uri>
+                <gateway.routes.common-service-server.uri>lb://common-service-server</gateway.routes.common-service-server.uri>
+                <!--<gateway.routes.common-service-server.uri>http://localhost:8103</gateway.routes.common-service-server.uri>-->
                 <!--  25、党建园地              -->
                 <gateway.routes.resi-home-server.uri>lb://resi-home-server</gateway.routes.resi-home-server.uri>
                 <!--                <gateway.routes.resi-home-server.uri>http://localhost:8104</gateway.routes.resi-home-server.uri>-->
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 6db9fa47bb..632d3a0ac4 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -486,13 +486,16 @@ epmet:
     - /data/aggregator/**
     - /gov/voice/**
     - /resi/voice/**
+    - /epmet/point/**
 
   # 内部认证url白名单(在白名单中的，就不会再校验登录了)
   internalAuthUrlsWhiteList:
     - /epmetuser/customerstaff/customerlist
+    - /auth/wechat/**
+    - /**/druid/**
     - /gov/project/project/platformcallback
     - /oper/customize/customerstartpage/homestartpage
-    - /tduck-api/**
+    - /epmet/point/mqCallback/**
 
   # 外部应用认证，使用AccessToken等头进行认证
   externalOpenUrls:
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java
new file mode 100644
index 0000000000..8138219216
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectMonthResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 项目月数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class FactAgencyProjectMonthResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    //组织Id
+    private String agencyId;
+    //月维度Id
+    private String monthId;
+    //当月项目总数 【当前组织及下级前一月新增项目数】
+    private Integer projectIncr = 0;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java
new file mode 100644
index 0000000000..13bc60fa06
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/FactAgencyProjectResultDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 项目总数-接口返参
+ * @Auth sun
+ */
+@Data
+public class FactAgencyProjectResultDTO implements Serializable {
+    private static final long serialVersionUID = 466974582608407121L;
+    @JsonIgnore
+    BigDecimal bi = new BigDecimal(0);
+    //组织Id
+    private String agencyId;
+    //组织名称
+    private String dateId;
+    //月维度Id
+    private String monthId;
+    //项目总数
+    private Integer projectTotal = 0;
+    //处理中项目数
+    private Integer pendingTotal = 0;
+    //处理中项目占比
+    private String pendingRatio = "0%";
+    //已结案中项目数
+    private Integer closedTotal = 0;
+    //已结案中项目占比
+    private String closedRatio = "0%";
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java
new file mode 100644
index 0000000000..fc11fafe4f
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govissue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 议题项目分类字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class IssueProjectCategoryDictDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id,  产品默认default
+     */
+	private String customerId;
+
+    /**
+     * 上级分类ID 顶级此列存储0
+     */
+	private String pid;
+
+    /**
+     * 所有上级分类ID，用逗号分开
+     */
+	private String pids;
+
+    /**
+     * 上级分类编码
+     */
+    private String parentCategoryCode;
+
+    /**
+     * 分类编码，分类编码+customer_id唯一
+     */
+	private String categoryCode;
+
+    /**
+     * 分类名称
+     */
+	private String categoryName;
+
+    /**
+     * 分类类别1,2,3,4....
+     */
+	private String categoryType;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 是否禁用(enable:启用 disable:禁用)
+     */
+    private String isDisable;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridsInfoListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridsInfoListResultDTO.java
index f25721539f..571195cd86 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridsInfoListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridsInfoListResultDTO.java
@@ -24,8 +24,12 @@ public class GridsInfoListResultDTO implements Serializable {
     private String gridId;
 
     /**
-     * 网格名称
+     * 组织-网格名称
      */
     private String gridName;
+    /**
+     * 网格名称
+     */
+    private String name;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ResiEventDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ResiEventDTO.java
new file mode 100644
index 0000000000..4f0e39c907
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ResiEventDTO.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govproject;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 居民报事表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Data
+public class ResiEventDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
+	private String projectId;
+
+	private String reportUserId;
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java
new file mode 100644
index 0000000000..07588e5e3c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/CategoryProjectFormDTO.java
@@ -0,0 +1,45 @@
+package com.epmet.dataaggre.dto.govproject.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 赋能平台【项目分类分析】-接口入参
+ * @Auth sun
+ */
+@NoArgsConstructor
+@Data
+public class CategoryProjectFormDTO implements Serializable {
+    private static final long serialVersionUID = -8515172319313536407L;
+    //组织Id
+    @NotBlank(message = "组织ID不能为空", groups = {Category.class})
+    private String agencyId;
+    //日期yyyymmdd
+    @NotBlank(message = "组织ID不能为空", groups = {Category.class})
+    private String dateId;
+    //一级分类Id
+    @NotBlank(message = "分类Code不能为空", groups = {Category.class})
+    private String categoryCode;
+    //页码
+    @Min(1)
+    private Integer pageNo = 1;
+    //每页多少条
+    private Integer pageSize = 20;
+    //是否分页(是:true 否:false)
+    private Boolean isPage = true;
+    //明天的dateId值
+    private String toDateId;
+    private String customerId;
+    private List<String> categoreCodeList;
+
+
+    public interface Category extends CustomerClientShowGroup {
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java
new file mode 100644
index 0000000000..a620667571
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectAnalysisFormDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dataaggre.dto.govproject.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 赋能平台【项目分类分析】-接口入参
+ * @Auth sun
+ */
+@NoArgsConstructor
+@Data
+public class ProjectAnalysisFormDTO implements Serializable {
+    private static final long serialVersionUID = -8515172319313536407L;
+    //小程序话题或事件发起人Id
+    @NotBlank(message = "话题或事件发起人Id不能为空", groups = {Analysis.class})
+    private String userId;
+    //一级分类Id集合
+    @NotNull(message = "分类Code集合不能为空", groups = {Analysis.class})
+    private List<String> categoryCodeList;
+    //当前查看的项目Id
+    @NotBlank(message = "当前查看项目Id不能为空", groups = {Analysis.class})
+    private String projectId;
+
+    private String customerId;
+
+    public interface Analysis extends CustomerClientShowGroup {
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java
new file mode 100644
index 0000000000..66d4e983b8
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectCategoryTotalFormDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dataaggre.dto.govproject.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 赋能平台【项目分类分析】-接口入参
+ * @Auth sun
+ */
+@NoArgsConstructor
+@Data
+public class ProjectCategoryTotalFormDTO implements Serializable {
+    private static final long serialVersionUID = -8515172319313536407L;
+    //组织Id
+    @NotBlank(message = "组织ID不能为空", groups = {Project.class})
+    private String agencyId;
+    //日期yyyymmdd
+    @NotBlank(message = "日维度ID不能为空", groups = {Project.class})
+    private String dateId;
+
+    private String customerId;
+
+    public interface Project extends CustomerClientShowGroup {
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java
index 975e22596b..22c0e731b6 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java
@@ -19,7 +19,7 @@ public class ProjectTotalFormDTO implements Serializable {
     @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class})
     private String agencyId;
     //日期yyyymmdd
-    @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class})
+    @NotBlank(message = "日维度ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class})
     private String dateId;
     //状态:待处理 pending，结案closed
     @NotBlank(message = "项目状态不能为空", groups = {Statuslist.class})
@@ -32,4 +32,15 @@ public class ProjectTotalFormDTO implements Serializable {
     public interface Statuslist extends CustomerClientShowGroup {
     }
 
+    //较昨日的dateId值
+    private String yeDateId;
+    //较dateId上月的monthId值
+    private String monthId;
+    //查询数据起始月份Id
+    private String startMonth;
+    //查询数据结束月份Id
+    private String endMonth;
+    //明天的dateId值
+    private String toDateId;
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java
new file mode 100644
index 0000000000..0d5b2f2707
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java
@@ -0,0 +1,57 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 赋能平台【项目处理分析】分类下项目列表-接口返参
+ * @Auth sun
+ */
+@Data
+public class CategoryProjectResultDTO implements Serializable {
+    private static final long serialVersionUID = 6188316867855643263L;
+
+    //总条数
+    private Integer total = 0;
+
+    private List<Project> list;
+
+    @Data
+    public static class Project {
+        //项目所属组织Id
+        private String agencyId;
+        //项目Id
+        private String projectId;
+        //项目编码[目前没这个功能 默认为空]
+        private String projectCode = "";
+        //一级分类Code集合
+        private List<String> categoryCodes = new ArrayList<>();
+        //一级分类名称集合
+        private List<String> categoryNames = new ArrayList<>();
+        //来源：议题issue  项目立项:agency 事件:resi_event【控制电机查看时里边三个按钮的显示】
+        private String origin;
+        //网格Id[上报给组织的事件、直接立项的项目此值为空]
+        private String gridId = "";
+        //网格名[上报给组织的事件、直接立项的项目此值为空]
+        private String gridName = "";
+        //状态:待处理 pending，已结案closed
+        private String status;
+        //标题
+        private String title;
+        //转项目时间
+        private String time;
+        //小程序居民端话题或事件创建人【立项项目此值为空】
+        private String userId = "";
+        //分类对应的所有上级,英文逗号隔开【目前分类只有两级，所以这个字段值其实就是一类的id值】
+        @JsonIgnore
+        private String categoryPids;
+        //二级分类code
+        @JsonIgnore
+        private String categoryCode;
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java
new file mode 100644
index 0000000000..1e50bd7c19
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/IssueProjectCategory.java
@@ -0,0 +1,12 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class IssueProjectCategory implements Serializable {
+    private static final long serialVersionUID = -2226298165882293959L;
+    private String issueId;
+    private String projectId;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java
new file mode 100644
index 0000000000..2601c26a63
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectAnalysisResultDTO.java
@@ -0,0 +1,63 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 赋能平台【项目处理分析】研判分析-接口返参
+ * @Auth sun
+ */
+@Data
+public class ProjectAnalysisResultDTO implements Serializable {
+    private static final long serialVersionUID = 6188316867855643263L;
+
+    //小程序居民Id
+    private String userId;
+    //负能平台居民Id
+    private String icUserId;
+    //负能平台居民名称
+    private String icUserName;
+    //家庭里人员集合
+    private List<Home> homeUserList = new ArrayList<>();
+    //楼院小组下分类项目列表
+    private List<Category> groupProjectList = new ArrayList<>();
+    //事件上报下分类项目列表
+    private List<Category> eventProjectList = new ArrayList<>();
+
+    @Data
+    public static class Home {
+        //家庭Id
+        private String homeId;
+        //居民Id
+        private String icUserId;
+        //居民姓名
+        private String icUserName;
+
+    }
+
+    @Data
+    public static class Category {
+        //一级分类Id
+        private String categoryCode;
+        //一级分类名称
+        private String categoryName;
+        //分类下项目列表【创建时间倒序】
+        private List<Project> projectList = new ArrayList<>();
+
+
+    }
+
+    @Data
+    public static class Project {
+        //项目Id
+        private String projectId;
+        //项目标题
+        private String title;
+        //状态:待处理 pending，结案closed
+        private String status;
+    }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryResultDTO.java
new file mode 100644
index 0000000000..f7846c3354
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author sun
+ * @dscription
+ */
+@NoArgsConstructor
+@Data
+public class ProjectCategoryResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 3217246702883400582L;
+	/**
+	 * 项目ID
+	 */
+	private String projectId;
+	/**
+	 * 项目标题
+	 */
+	private String title;
+	/**
+	 * 项目状态
+	 */
+	private String status;
+	/**
+	 * 二级分类Code
+	 */
+	private String categoryCode;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java
new file mode 100644
index 0000000000..5ae7d12cda
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 赋能平台【项目分类分析】各分类项目数图表-接口返参
+ * @Auth sun
+ */
+@Data
+public class ProjectCategoryTotalResultDTO implements Serializable {
+    private static final long serialVersionUID = 6188316867855643263L;
+
+    //组织Id
+    private String agencyId;
+    //一级分类Code
+    private String categoryCode;
+    //一级分类名称
+    private String categoryName;
+    //一级分类颜色
+    private String color = "";
+    //分类下项目总数
+    private Integer total = 0;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java
index 8947eb971b..037d54f845 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java
@@ -13,8 +13,8 @@ public class ProjectMonthIncrResultDTO implements Serializable {
     private static final long serialVersionUID = 6188316867855643263L;
 
     //横坐标值
-    private String value;
+    private Integer value = 0;
     //横坐标
-    private Integer type;
+    private String type;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java
index c8c895e549..bf74adac49 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java
@@ -17,12 +17,14 @@ public class ProjectStatusListResultDTO implements Serializable {
     //项目Id
     private String projectId;
     //来源：议题issue  项目立项:agency 事件:resi_event
-    private Integer origin;
+    private String origin;
     //状态:待处理 pending，结案closed
-    private Integer status;
+    private String status;
     //经度
-    private Integer longitude;
+    private String longitude;
     //纬度
-    private Integer dimension;
+    private String latitude;
+    //项目标题
+    private String title;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java
index 541a742582..9afb3cb712 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java
@@ -17,18 +17,18 @@ public class ProjectTotalResultDTO implements Serializable {
     //日期yyyymmdd
     private String dateId;
     //项目总数
-    private Integer projectTotal;
+    private Integer projectTotal = 0;
     //较昨日数
-    private Integer dateIncr;
+    private Integer dateIncr = 0;
     //较上月数
-    private Integer monthIncr;
+    private Integer monthIncr = 0;
     //未结案项目数
-    private Integer pendingTotal;
+    private Integer pendingTotal = 0;
     //为结案项目占比 xx%
-    private String pendingRatio;
+    private String pendingRatio = "0%";
     //已结案项目数
-    private Integer closedTotal;
+    private Integer closedTotal = 0;
     //已结案项目占比
-    private String closedRatio;
+    private String closedRatio = "0%";
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java
new file mode 100644
index 0000000000..cfedd6e6d9
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/UserTopicPageFormDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dataaggre.dto.resigroup.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class UserTopicPageFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+    //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class)
+    private List<String> epmetUserIdList;
+    @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+    @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java
new file mode 100644
index 0000000000..4d5fd23ca2
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/UserTopicResDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dataaggre.dto.resigroup.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 个人分析，发布话题分页列表
+ */
+@Data
+public class UserTopicResDTO implements Serializable {
+    private String topicId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date releaseTime;
+    private String topicContent;
+    private Boolean shiftIssue;
+    private String issueId;
+    private Boolean shiftProject=false;
+    private String projectId="";
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
index ad2d3bebf4..9b9c7a0ef1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
@@ -207,6 +207,15 @@ public class EpmetUserController {
         return new Result<UserEventLogoResultDTO>().ok(epmetUserService.mentionMeEvent(tokenDto.getUserId()));
     }
 
+    @GetMapping("export/staffpatroll")
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO, HttpServletResponse response) throws Exception {
+        ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
+        formDTO.setUserId(tokenDto.getUserId());
+        //formDTO.setUserId("73ae6280e46a6653a5605d51d5462725");
+        List<StaffListResultDTO> resultDTOS = epmetUserService.staffPatrolList(formDTO);
+        ExcelUtils.exportExcelToTarget(response, null, resultDTOS, StaffPatrollExcel.class);
+    }
+
     /**
      * @Param formDTO
      * @Description 通讯录】姓名检索工作人员
@@ -261,14 +270,6 @@ public class EpmetUserController {
         return new Result<CustomerStaffResultDTO>().ok(epmetUserService.getStaffInfo(staffId));
     }
 
-    @GetMapping("export/staffpatroll")
-    public void export(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO, HttpServletResponse response) throws Exception {
-        ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
-        formDTO.setUserId(tokenDto.getUserId());
-        //formDTO.setUserId("73ae6280e46a6653a5605d51d5462725");
-        List<StaffListResultDTO> resultDTOS = epmetUserService.staffPatrolList(formDTO);
-        ExcelUtils.exportExcelToTarget(response, null, resultDTOS, StaffPatrollExcel.class);
-    }
 
     /**
      * @Param formDTO
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java
index 503caedfb4..422aa74f4c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java
@@ -6,17 +6,13 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
-import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO;
-import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO;
+import com.epmet.dataaggre.dto.govproject.form.*;
+import com.epmet.dataaggre.dto.govproject.result.*;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -75,9 +71,9 @@ public class GovProjectController {
 	 * @author sun
 	 */
 	@PostMapping("projectmonthincr")
-	public Result<List<ProjectMonthIncrResultDTO>> projectMonthIncr(@RequestBody ProjectTotalFormDTO formDTO) {
+	public Result<LinkedList<ProjectMonthIncrResultDTO>> projectMonthIncr(@RequestBody ProjectTotalFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Monthincr.class);
-		return new Result<List<ProjectMonthIncrResultDTO>>().ok(govProjectService.projectMonthIncr(formDTO));
+		return new Result<LinkedList<ProjectMonthIncrResultDTO>>().ok(govProjectService.projectMonthIncr(formDTO));
 	}
 
 	/**
@@ -85,9 +81,42 @@ public class GovProjectController {
 	 * @author sun
 	 */
 	@PostMapping("projectstatuslist")
-	public Result<List<ProjectTotalResultDTO>> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) {
+	public Result<List<ProjectStatusListResultDTO>> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Statuslist.class);
-		return new Result<List<ProjectTotalResultDTO>>().ok(govProjectService.projectStatusList(formDTO));
+		return new Result<List<ProjectStatusListResultDTO>>().ok(govProjectService.projectStatusList(formDTO));
+	}
+
+	/**
+	 * @Description 赋能平台【项目分类分析】各分类项目数图表
+	 * @author sun
+	 */
+	@PostMapping("projectcategorylist")
+	public Result<List<ProjectCategoryTotalResultDTO>> projectCategoryList(@LoginUser TokenDto tokenDto, @RequestBody ProjectCategoryTotalFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, ProjectCategoryTotalFormDTO.Project.class);
+		formDTO.setCustomerId(tokenDto.getCustomerId());
+		return new Result<List<ProjectCategoryTotalResultDTO>>().ok(govProjectService.projectCategoryList(formDTO));
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】分类下项目列表
+	 * @author sun
+	 */
+	@PostMapping("categoryprojectlist")
+	public Result<CategoryProjectResultDTO> categoryProjectList(@LoginUser TokenDto tokenDto, @RequestBody CategoryProjectFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, CategoryProjectFormDTO.Category.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+		return new Result<CategoryProjectResultDTO>().ok(govProjectService.categoryProjectList(formDTO));
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】研判分析
+	 * @author sun
+	 */
+	@PostMapping("projectanalysis")
+	public Result<ProjectAnalysisResultDTO> projectAnalysis(@LoginUser TokenDto tokenDto, @RequestBody ProjectAnalysisFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, ProjectAnalysisFormDTO.Analysis.class);
+		formDTO.setCustomerId(tokenDto.getCustomerId());
+		return new Result<ProjectAnalysisResultDTO>().ok(govProjectService.projectAnalysis(formDTO));
 	}
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java
index 259b22cff0..8dc1a34527 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/ResiGroupController.java
@@ -1,12 +1,15 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
 import com.epmet.dataaggre.dto.resigroup.result.CandidateListResultDTO;
+import com.epmet.dataaggre.dto.resigroup.result.UserTopicResDTO;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
+import com.epmet.dto.form.PageUserReportEventFormDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,4 +42,13 @@ public class ResiGroupController {
         return new Result<List<CandidateListResultDTO>>().ok(resiGroupService.candidateList(formDTO));
     }
 
+    /**
+     * 数字赋能平台-个人分析，发布话题分页列表
+     * @return
+     */
+    @PostMapping("pageusertopic")
+    public Result<PageData<UserTopicResDTO>> pageUserTopic(@RequestBody PageUserReportEventFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PageUserReportEventFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<UserTopicResDTO>>().ok(resiGroupService.pageUserTopic(formDTO));
+    }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index 8696fa47a3..237432f5c2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -24,6 +24,8 @@ import com.epmet.dataaggre.dto.datastats.form.SubGridFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
@@ -335,4 +337,16 @@ public interface DataStatsDao {
      * @author sun
      */
     List<CustomerDataManageResultDTO.CustomerDataManage> projectList(CustomerDataManageFormDTO formDTO);
+
+    /**
+     * @Description 分别查询组织下dateId、较昨日、较上月项目统计数据
+     * @author sun
+     */
+    List<FactAgencyProjectResultDTO> getProjectTotal(ProjectTotalFormDTO formDTO);
+
+    /**
+     * @Description 查询dateId的上一月过去12个月份组织项目数据
+     * @author sun
+     */
+    List<FactAgencyProjectMonthResultDTO> getProjectMonthIncr(ProjectTotalFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java
new file mode 100644
index 0000000000..1e34921a43
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dao.epmetuser;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
+import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
+import com.epmet.dto.IcResiUserDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 用户基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Mapper
+public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
+
+    /**
+     * @Description 根据身份证号查询负能平台用户信息
+     * @author sun
+     */
+    IcResiUserDTO getIcResiUser(@Param("idCard") String idCard, @Param("customerId") String customerId);
+
+    /**
+     * @Description 查询人员的家庭成员数据
+     * @author sun
+     */
+    List<ProjectAnalysisResultDTO.Home> getHomeUserList(@Param("homeId") String homeId, @Param("icUserId") String icUserId);
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java
index 805657fc11..e79c563c0a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java
@@ -20,6 +20,7 @@ package com.epmet.dataaggre.dao.epmetuser;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.UserBaseInfoEntity;
+import com.epmet.dto.UserBaseInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -50,4 +51,9 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
      */
     List<String> selectUserIdByCustomerId(@Param("userIds") List<String> userIds);
 
+    /**
+     * @Description 查询userId的身份证号在小程序用户中存在的多个userId值
+     * @author sun
+     */
+    List<UserBaseInfoDTO> getUserBaseList(@Param("userId") String userId, @Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
index 138ff3d449..5afe394900 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
@@ -21,6 +21,8 @@ import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -103,4 +105,10 @@ public interface EvaluationIndexDao {
      */
     String selectAgencyNameByAgencyId(@Param("agencyId")String agencyId);
 
+    /**
+     * @Description 按dateId查询组织下一级分类项目总数统计
+     * @author sun
+     */
+    List<ProjectCategoryTotalResultDTO> projectCategoryList(ProjectCategoryTotalFormDTO formDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java
index 1e85e06366..17d16fd72d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dataaggre.dao.govissue;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO;
 import com.epmet.dataaggre.dto.govissue.form.ClosedIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.form.VotingIssueListFormDTO;
@@ -74,4 +75,10 @@ public interface IssueDao extends BaseDao<IssueEntity> {
     Integer selectIssueCount(@Param("gridIds") List<String> gridIds,@Param("issueType")String issueType);
 
     List<IssueInfoDTO> selectShiftProjectIssueList(@Param("customerId") String customerId, @Param("gridId") String gridId);
+
+    /**
+     * @Description 查询客户下分类信息
+     * @author sun
+     **/
+    List<IssueProjectCategoryDictDTO> getCategoryList(@Param("customerId") String customerId, @Param("level") String level, @Param("isDisable") String isDisable);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
index 4697a0f267..ee44c3cee8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
@@ -20,10 +20,14 @@ package com.epmet.dataaggre.dao.govproject;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectDTO;
+import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO;
+import com.epmet.dataaggre.dto.govproject.ResiEventDTO;
 import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO;
+import com.epmet.dataaggre.dto.govproject.form.CategoryProjectFormDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
+import com.epmet.dataaggre.dto.govproject.result.*;
 import com.epmet.dataaggre.entity.govproject.ProjectEntity;
+import com.epmet.dto.ProjectCategoryDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -70,4 +74,45 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
     List<ProjectDistributionResultDTO> selectList(@Param("customerId") String customerId,@Param("list")List<String> issueIds);
 
     int countRedDot(String userId);
+
+    /**
+     * @Description 查询组织下截止到dateId的某个状态的项目列表
+     * @author sun
+     */
+    List<ProjectStatusListResultDTO> getProjectStatusList(ProjectTotalFormDTO formDTO);
+
+    List<IssueProjectCategory> selectProjectIssueCategory(@Param("issueIds") List<String> issueIds);
+
+    /**
+     * @Description 查询组织截止某一天的某个分类下的项目列表
+     * @author sun
+     */
+    List<CategoryProjectResultDTO.Project> categoryProjectList(CategoryProjectFormDTO formDTO);
+
+    /**
+     * @Description 查询项目对应的所有分类信息
+     * @author sun
+     */
+    List<CategoryProjectResultDTO.Project> getCategoryList(@Param("projectIds") List<String> projectIds);
+
+    /**
+     * @Description 查询来源事件的项目居民端创建人信息
+     * @author sun
+     */
+    List<ResiEventDTO> getEventList(@Param("projectIds") List<String> projectIds);
+    /**
+     * @Description 查询来源话题的项目居民端创建人信息
+     * @author sun
+     */
+    List<ProjectRelatedPersonnelDTO> getTopicUser(@Param("projectIds") List<String> projectIds);
+
+    /**
+     * @Description 根据项目来源查询不同分类不同创建人下的分类项目
+     * @author sun
+     */
+    List<ProjectCategoryResultDTO> getProjectCategoryList(@Param("customerId") String customerId,
+                                                          @Param("secondCodeList") List<String> secondCodeList,
+                                                          @Param("userIds") List<String> userIds,
+                                                          @Param("origin") String origin);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java
index cd57936e2f..c41c85d0de 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/ResiTopicDao.java
@@ -19,7 +19,9 @@ package com.epmet.dataaggre.dao.resigroup;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
+import com.epmet.dataaggre.dto.resigroup.result.UserTopicResDTO;
 import com.epmet.dataaggre.entity.resigroup.ResiTopicEntity;
+import com.epmet.dto.form.PageUserReportEventFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,4 +37,12 @@ import java.util.List;
 public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
 
     List<ResiTopicDTO> selectTopicInfoByIds(@Param("list") List<String> topicIds);
+
+    /**
+     * 数据分析-个人档案-发布话题列表
+     *
+     * @param formDTO
+     * @return
+     */
+    List<UserTopicResDTO> selectListTopic(PageUserReportEventFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java
new file mode 100644
index 0000000000..e40441101d
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java
@@ -0,0 +1,493 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.epmetuser;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_resi_user")
+public class IcResiUserEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     *
+     */
+	private String agencyId;
+
+    /**
+     *
+     */
+	private String pids;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 所属小区ID
+     */
+	private String villageId;
+
+    /**
+     * 所属楼宇Id
+     */
+	private String buildId;
+
+    /**
+     * 单元id
+     */
+	private String unitId;
+
+    /**
+     * 所属家庭Id
+     */
+	private String homeId;
+
+    /**
+     * 是否本地户籍
+     */
+	private String isBdhj;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 性别
+     */
+	private String gender;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 出生日期
+     */
+	private String birthday;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     * 联系人
+     */
+	private String contacts;
+
+    /**
+     * 联系人电话
+     */
+	private String contactsMobile;
+
+    /**
+     * 九小场所url
+     */
+	private String ninePlace;
+
+    /**
+     * 是否党员
+     */
+	private String isParty;
+
+    /**
+     * 是否低保户
+     */
+	private String isDbh;
+
+    /**
+     * 是否保障房
+     */
+	private String isEnsureHouse;
+
+    /**
+     * 是否失业
+     */
+	private String isUnemployed;
+
+    /**
+     * 是否育龄妇女
+     */
+	private String isYlfn;
+
+    /**
+     * 是否退役军人
+     */
+	private String isVeterans;
+
+    /**
+     * 是否统战人员
+     */
+	private String isUnitedFront;
+
+    /**
+     * 是否信访人员
+     */
+	private String isXfry;
+
+    /**
+     * 是否志愿者
+     */
+	private String isVolunteer;
+
+    /**
+     * 是否老年人
+     */
+	private String isOldPeople;
+
+    /**
+     * 是否空巢
+     */
+	private String isKc;
+
+    /**
+     * 是否失独
+     */
+	private String isSd;
+
+    /**
+     * 是否失能
+     */
+	private String isSn;
+
+    /**
+     * 是否失智
+     */
+	private String isSz;
+
+    /**
+     * 是否残疾
+     */
+	private String isCj;
+
+    /**
+     * 是否大病
+     */
+	private String isDb;
+
+    /**
+     * 是否慢病
+     */
+	private String isMb;
+
+    /**
+     * 是否特殊人群
+     */
+	private String isSpecial;
+
+    /**
+     * 文化程度【字典表】
+     */
+	private String culture;
+
+    /**
+     * 文化程度备注
+     */
+	private String cultureRemakes;
+
+    /**
+     * 特长【字典表】
+     */
+	private String specialSkill;
+
+    /**
+     * 兴趣爱好
+     */
+	private String hobby;
+
+    /**
+     * 兴趣爱好备注
+     */
+	private String hobbyRemakes;
+
+    /**
+     * 宗教信仰
+     */
+	private String faith;
+
+    /**
+     * 宗教信仰备注
+     */
+	private String faithRemakes;
+
+    /**
+     * 残疾类别【字典表】
+     */
+	private String cjlb;
+
+    /**
+     * 残疾登记(状况)【字典表】
+     */
+	private String cjzk;
+
+    /**
+     * 残疾证号
+     */
+	private String cjzh;
+
+    /**
+     * 残疾说明
+     */
+	private String cjsm;
+
+    /**
+     * 有无监护人【yes no】
+     */
+	private String ynJdr;
+
+    /**
+     * 有无技能特长【yes no】
+     */
+	private String ynJntc;
+
+    /**
+     * 有无劳动能力
+     */
+	private String ynLdnl;
+
+    /**
+     * 有无非义务教育阶段助学【yes no】
+     */
+	private String ynFywjyjdzx;
+
+    /**
+     * 所患大病
+     */
+	private String shdb;
+
+    /**
+     * 患大病时间
+     */
+	private String dbsj;
+
+    /**
+     * 所患慢性病
+     */
+	private String shmxb;
+
+    /**
+     * 患慢性病时间
+     */
+	private String mxbsj;
+
+    /**
+     * 是否参保
+     */
+	private String isCb;
+
+    /**
+     * 自付金额
+     */
+	private String zfje;
+
+    /**
+     * 救助金额
+     */
+	private String jzje;
+
+    /**
+     * 救助时间[yyyy-MM-dd]
+     */
+	private String jzsj;
+
+    /**
+     * 享受救助明细序号
+     */
+	private String jzmxxh;
+
+    /**
+     * 健康信息备注
+     */
+	private String healthRemakes;
+
+    /**
+     * 工作单位
+     */
+	private String gzdw;
+
+    /**
+     * 职业
+     */
+	private String zy;
+
+    /**
+     * 离退休时间
+     */
+	private String ltxsj;
+
+    /**
+     * 工作信息备注
+     */
+	private String workRemake;
+
+    /**
+     * 退休金额
+     */
+	private String txje;
+
+    /**
+     * 月收入
+     */
+	private String ysr;
+
+    /**
+     * 籍贯
+     */
+	private String jg;
+
+    /**
+     * 户籍所在地
+     */
+	private String hjszd;
+
+    /**
+     * 现居住地
+     */
+	private String xjzd;
+
+    /**
+     * 人户情况
+     */
+	private String rhzk;
+
+    /**
+     * 居住信息备注
+     */
+	private String jzxxRemakes;
+
+    /**
+     * 民族【字典表】
+     */
+	private String mz;
+
+    /**
+     * 与户主关系【字典表】
+     */
+	private String yhzgx;
+
+    /**
+     * 居住情况【字典表】
+     */
+	private String jzqk;
+
+    /**
+     * 婚姻状况【字典表】
+     */
+	private String hyzk;
+
+    /**
+     * 配偶情况【字典表】
+     */
+	private String poqk;
+
+    /**
+     * 有无赡养人
+     */
+	private String ynSyr;
+
+    /**
+     * 与赡养人关系【字典表】
+     */
+	private String ysyrgx;
+
+    /**
+     * 赡养人电话
+     */
+	private String syrMobile;
+
+    /**
+     * 家庭信息备注
+     */
+	private String jtxxRemakes;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+    /**
+     * 预留字段6
+     */
+	private String field6;
+
+    /**
+     * 预留字段7
+     */
+	private String field7;
+
+    /**
+     * 预留字段8
+     */
+	private String field8;
+
+    /**
+     * 预留字段9
+     */
+	private String field9;
+
+    /**
+     * 预留字段10
+     */
+	private String field10;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 36fa24c7b2..de584839e2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -6,6 +6,8 @@ import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 
@@ -247,4 +249,15 @@ public interface DataStatsService {
      */
     CustomerDataManageResultDTO operateExport(CustomerDataManageFormDTO formDTO) throws ParseException;
 
+    /**
+     * @Description 分别查询组织下dateId、较昨日、较上月项目统计数据
+     * @author sun
+     */
+    List<FactAgencyProjectResultDTO> getProjectTotal(ProjectTotalFormDTO formDTO);
+
+    /**
+     * @Description 查询dateId的上一月过去12个月份组织项目数据
+     * @author sun
+     */
+    List<FactAgencyProjectMonthResultDTO> getProjectMonthIncr(ProjectTotalFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index d1c160080d..ac426b81d7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -23,7 +23,9 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
-import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
+ import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
+ import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO;
+ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
@@ -2121,5 +2123,23 @@ public class DataStatsServiceImpl implements DataStatsService {
         return resultDTO;
     }
 
+    /**
+     * @Description 分别查询组织下dateId、较昨日、较上月项目统计数据
+     * @author sun
+     */
+    @Override
+    public List<FactAgencyProjectResultDTO> getProjectTotal(ProjectTotalFormDTO formDTO) {
+        return dataStatsDao.getProjectTotal(formDTO);
+    }
+
+    /**
+     * @Description 查询dateId的上一月过去12个月份组织项目数据
+     * @author sun
+     */
+    @Override
+    public List<FactAgencyProjectMonthResultDTO> getProjectMonthIncr(ProjectTotalFormDTO formDTO) {
+        return dataStatsDao.getProjectMonthIncr(formDTO);
+    }
+
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
index 5f0a73ad1e..6979f5d8b4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
@@ -1,12 +1,13 @@
 package com.epmet.dataaggre.service.epmetuser;
 
-import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
-import com.epmet.dataaggre.dto.epmetuser.form.*;
 import com.epmet.dataaggre.dto.epmetuser.form.*;
 import com.epmet.dataaggre.dto.epmetuser.result.*;
 import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
+import com.epmet.dto.IcResiUserDTO;
+import com.epmet.dto.UserBaseInfoDTO;
 
 import java.util.List;
 
@@ -148,4 +149,22 @@ public interface EpmetUserService {
      * @author sun
      */
     StaffDetailV2FormDTO selectByStaffId(String staffId);
+
+    /**
+     * @Description 查询userId的身份证号在小程序用户中存在的多个userId值
+     * @author sun
+     */
+    List<UserBaseInfoDTO> getUserBaseList(String userId, String customerId);
+
+    /**
+     * @Description 根据身份证号查询负能平台用户信息
+     * @author sun
+     */
+    IcResiUserDTO getIcResiUser(String idNum, String customerId);
+
+    /**
+     * @Description 查询人员的家庭成员数据
+     * @author sun
+     */
+    List<ProjectAnalysisResultDTO.Home> getHomeUserList(String homeId, String icUserId);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index df47618648..759d1f5d1c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -26,6 +26,7 @@ import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.StaffOrgRelationResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
 import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity;
 import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
@@ -36,6 +37,8 @@ import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
+import com.epmet.dto.IcResiUserDTO;
+import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.result.StaffRoleResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -79,6 +82,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     private DataStatsService dataStatsService;
     @Resource
     private GovStaffRoleDao govStaffRoleDao;
+    @Resource
+    private IcResiUserDao icResiUserDao;
 
     /**
      * @Description  根据UserIds查询
@@ -703,5 +708,32 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         return result;
     }
 
+    /**
+     * @Description 查询userId的身份证号在小程序用户中存在的多个userId值
+     * @author sun
+     */
+    @Override
+    public List<UserBaseInfoDTO> getUserBaseList(String userId, String customerId) {
+        return userBaseInfoDao.getUserBaseList(userId, customerId);
+    }
+
+    /**
+     * @Description 根据身份证号查询负能平台用户信息
+     * @author sun
+     */
+    @Override
+    public IcResiUserDTO getIcResiUser(String idNum, String customerId) {
+        return icResiUserDao.getIcResiUser(idNum, customerId);
+    }
+
+    /**
+     * @Description 查询人员的家庭成员数据
+     * @author sun
+     */
+    @Override
+    public List<ProjectAnalysisResultDTO.Home> getHomeUserList(String homeId, String icUserId) {
+        return icResiUserDao.getHomeUserList(homeId, icUserId);
+    }
+
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
index 67468e32de..bd5cfd6886 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
@@ -6,6 +6,8 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO;
 
 import java.util.List;
 
@@ -86,4 +88,9 @@ public interface EvaluationIndexService {
      */
     ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String agencyId);
 
+    /**
+     * @Description 按dateId查询组织下一级分类项目总数统计
+     * @author sun
+     */
+    List<ProjectCategoryTotalResultDTO> projectCategoryList(ProjectCategoryTotalFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
index abb0f137f5..e3f1b246af 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
@@ -11,6 +11,8 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO;
 import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
 import com.epmet.dataaggre.service.opercrm.CustomerRelation;
 import lombok.extern.slf4j.Slf4j;
@@ -206,4 +208,13 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
         return resultDTO;
     }
 
+    /**
+     * @Description 按dateId查询组织下一级分类项目总数统计
+     * @author sun
+     */
+    @Override
+    public List<ProjectCategoryTotalResultDTO> projectCategoryList(ProjectCategoryTotalFormDTO formDTO) {
+        return evaluationIndexDao.projectCategoryList(formDTO);
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
index 5159bda48f..3e87ea18d3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.service.govissue;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO;
 import com.epmet.dataaggre.dto.govissue.form.AllIssueFormDTO;
 import com.epmet.dataaggre.dto.govissue.form.ClosedIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO;
@@ -45,4 +46,10 @@ public interface GovIssueService {
     List<ClosedIssueListResultDTO> closedIssueList(ClosedIssueListFormDTO fromDTO);
 
     List<IssueInfoDTO> selectShiftProjectIssueList(String customerId,String gridId,Integer pageNo,Integer pageSize);
+
+    /**
+     * @Description 查询客户下分类信息
+     * @author sun
+     **/
+    List<IssueProjectCategoryDictDTO> categoryList(String customerId, String level, String isDisable);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
index 7b68d96332..5556d2d3f0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
@@ -8,6 +8,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.constant.IssueConstant;
 import com.epmet.dataaggre.dao.govissue.IssueApplicationDao;
 import com.epmet.dataaggre.dao.govissue.IssueDao;
+import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO;
 import com.epmet.dataaggre.dto.govissue.form.AllIssueFormDTO;
 import com.epmet.dataaggre.dto.govissue.form.ClosedIssueListFormDTO;
 import com.epmet.dataaggre.dto.govissue.form.ShiftProjectIssueListFormDTO;
@@ -323,4 +324,13 @@ public class GovIssueServiceImpl implements GovIssueService {
         return issueDao.selectShiftProjectIssueList(customerId, gridId);
     }
 
+    /**
+     * @Description 查询客户下一级分类信息
+     * @author sun
+     **/
+    @Override
+    public List<IssueProjectCategoryDictDTO> categoryList(String customerId, String level, String isDisable) {
+        return issueDao.getCategoryList(customerId, level, isDisable);
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
index 0509c9c129..77c8c33d0f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -172,5 +172,4 @@ public interface GovOrgService {
      * @date 2021/11/5 2:57 下午
      */
     CustomerGridDTO getGridInfo(String gridId);
-
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
index a09c9257db..d118a05746 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
@@ -1,12 +1,12 @@
 package com.epmet.dataaggre.service.govproject;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
-import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
-import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO;
-import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
+import com.epmet.dataaggre.dto.govproject.form.*;
 import com.epmet.dataaggre.dto.govproject.result.*;
 
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -61,11 +61,37 @@ public interface GovProjectService {
 	 * @Description 赋能平台【项目处理分析】进12月新增项目折线图
 	 * @author sun
 	 */
-	List<ProjectMonthIncrResultDTO> projectMonthIncr(ProjectTotalFormDTO formDTO);
+	LinkedList<ProjectMonthIncrResultDTO> projectMonthIncr(ProjectTotalFormDTO formDTO);
 
 	/**
 	 * @Description 赋能平台【项目处理分析】按状态查询项目列表
 	 * @author sun
 	 */
-	List<ProjectTotalResultDTO> projectStatusList(ProjectTotalFormDTO formDTO);
+	List<ProjectStatusListResultDTO> projectStatusList(ProjectTotalFormDTO formDTO);
+
+	/**
+	 * @Description 赋能平台【项目分类分析】各分类项目数图表
+	 * @author sun
+	 */
+    List<ProjectCategoryTotalResultDTO> projectCategoryList(ProjectCategoryTotalFormDTO formDTO);
+
+	/**
+	 * @Description 赋能平台【项目处理分析】分类下项目列表
+	 * @author sun
+	 */
+	CategoryProjectResultDTO categoryProjectList(CategoryProjectFormDTO formDTO);
+
+	/**
+	 * @Description 赋能平台【项目处理分析】研判分析
+	 * @author sun
+	 */
+	ProjectAnalysisResultDTO projectAnalysis(ProjectAnalysisFormDTO formDTO);
+
+	/**
+	 * 找出这些议题中对应的项目id,以及项目对应的一级分类编码
+	 *
+	 * @param issueIds
+	 * @return
+	 */
+	List<IssueProjectCategory> getIssueProjectFirstCategory(List<String> issueIds);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
index a0401eb9b8..200054ae6d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
@@ -5,25 +5,37 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.constant.ProjectConstant;
 import com.epmet.dataaggre.dao.govproject.ProjectDao;
+import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO;
+import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO;
 import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectDTO;
-import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
-import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO;
-import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
+import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO;
+import com.epmet.dataaggre.dto.govproject.ResiEventDTO;
+import com.epmet.dataaggre.dto.govproject.form.*;
 import com.epmet.dataaggre.dto.govproject.result.*;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
+import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
+import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
 import com.epmet.dataaggre.service.govissue.GovIssueService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
+import com.epmet.dto.IcResiUserDTO;
+import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.form.TimestampIntervalFormDTO;
 import com.epmet.dto.form.WorkMinuteFormDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+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;
@@ -52,6 +64,12 @@ public class GovProjectServiceImpl implements GovProjectService {
 	private GovIssueService govIssueService;
 	@Autowired
 	private ResiGroupService resiGroupService;
+	@Autowired
+	private DataStatsService dataStatsService;
+	@Autowired
+	private EvaluationIndexService evaluationIndexService;
+	@Autowired
+	private EpmetUserService epmetUserService;
 
     /**
      * @Description  查询项目信息
@@ -251,7 +269,40 @@ public class GovProjectServiceImpl implements GovProjectService {
 	 */
 	@Override
 	public ProjectTotalResultDTO projectTotal(ProjectTotalFormDTO formDTO) {
-		return null;
+		ProjectTotalResultDTO result = new ProjectTotalResultDTO();
+		result.setAgencyId(formDTO.getAgencyId());
+		result.setDateId(formDTO.getDateId());
+		//较昨日dateId值
+		formDTO.setYeDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", -1));
+		//较上月monthId值
+		formDTO.setMonthId(DateUtils.dateOrmonthId(formDTO.getDateId(), "month", -1));
+
+		//1.分别查询组织下dateId、较昨日、较上月项目统计数据
+		List<FactAgencyProjectResultDTO> list = dataStatsService.getProjectTotal(formDTO);
+		if (CollectionUtils.isEmpty(list) || !formDTO.getDateId().equals(list.get(0).getDateId())) {
+			return result;
+		}
+
+		//2.封装数据
+		list.forEach(l -> {
+			if (formDTO.getDateId().equals(l.getDateId())) {
+				result.setProjectTotal(l.getProjectTotal());
+				result.setPendingTotal(l.getPendingTotal());
+				result.setPendingRatio(l.getPendingRatio());
+				result.setClosedTotal(l.getClosedTotal());
+				result.setClosedRatio(l.getClosedRatio());
+				//默认较昨日较上个月增长值就是当前日期的数据
+				result.setDateIncr(l.getProjectTotal());
+				result.setMonthIncr(l.getProjectTotal());
+			}
+			if (formDTO.getYeDateId().equals(l.getDateId())) {
+				result.setDateIncr(result.getProjectTotal() - l.getProjectTotal());
+			} else if (formDTO.getMonthId().equals(l.getMonthId())) {
+				result.setMonthIncr(result.getProjectTotal() - l.getProjectTotal());
+			}
+		});
+
+		return result;
 	}
 
 	/**
@@ -259,8 +310,30 @@ public class GovProjectServiceImpl implements GovProjectService {
 	 * @author sun
 	 */
 	@Override
-	public List<ProjectMonthIncrResultDTO> projectMonthIncr(ProjectTotalFormDTO formDTO) {
-		return null;
+	public LinkedList<ProjectMonthIncrResultDTO> projectMonthIncr(ProjectTotalFormDTO formDTO) {
+		LinkedList<ProjectMonthIncrResultDTO> resultList = new LinkedList<>();
+		//1.获取起始终止月份值
+		LinkedHashMap<String, String> map = DateUtils.getXproSub(formDTO.getDateId());
+		List<String> monthIdList = map.keySet().stream().collect(Collectors.toList());
+		formDTO.setStartMonth(monthIdList.get(NumConstant.ZERO));
+		formDTO.setEndMonth(monthIdList.get(NumConstant.ELEVEN));
+
+		//2.查询dateId的上一月过去12个月份数据【2021-12-08 数据是202012到202111的数据】
+		List<FactAgencyProjectMonthResultDTO> list = dataStatsService.getProjectMonthIncr(formDTO);
+
+		//3.封装数据并返回
+		map.forEach((k, v) -> {
+			ProjectMonthIncrResultDTO dto = new ProjectMonthIncrResultDTO();
+			dto.setType(v);
+			list.forEach(l -> {
+				if (k.equals(l.getMonthId())) {
+					dto.setValue(l.getProjectIncr());
+				}
+			});
+			resultList.add(dto);
+		});
+
+		return resultList;
 	}
 
 	/**
@@ -268,8 +341,236 @@ public class GovProjectServiceImpl implements GovProjectService {
 	 * @author sun
 	 */
 	@Override
-	public List<ProjectTotalResultDTO> projectStatusList(ProjectTotalFormDTO formDTO) {
-		return null;
+	public List<ProjectStatusListResultDTO> projectStatusList(ProjectTotalFormDTO formDTO) {
+		//所选日期后一天的dateId值
+		formDTO.setToDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", 1));
+		//1.查询组织下截止到dateId的某个状态的项目列表
+		List<ProjectStatusListResultDTO> resultList = projectDao.getProjectStatusList(formDTO);
+		return resultList;
+	}
+
+	/**
+	 * @Description 赋能平台【项目分类分析】各分类项目数图表
+,	 * @author sun
+	 */
+	@Override
+	public List<ProjectCategoryTotalResultDTO> projectCategoryList(ProjectCategoryTotalFormDTO formDTO) {
+		List<ProjectCategoryTotalResultDTO> resultList = new ArrayList<>();
+		//1.查询客户下一级分类信息
+		List<IssueProjectCategoryDictDTO> categoryList = govIssueService.categoryList(formDTO.getCustomerId(), "1", "enable");
+
+		//2.按dateId查询组织下一级分类项目总数
+		List<ProjectCategoryTotalResultDTO> list = evaluationIndexService.projectCategoryList(formDTO);
+
+		//3.封装数据并返回
+		//有数据的排在前边，没数据的按分类顺序排在后边
+		Map<String, String> map = new HashMap<>();
+		list.forEach(l -> {
+			ProjectCategoryTotalResultDTO dto = new ProjectCategoryTotalResultDTO();
+			dto.setAgencyId(formDTO.getAgencyId());
+			dto.setTotal(l.getTotal());
+			categoryList.forEach(ca -> {
+				if (ca.getCategoryCode().equals(l.getCategoryCode())) {
+					dto.setCategoryCode(ca.getCategoryCode());
+					dto.setCategoryName(ca.getCategoryName());
+					dto.setColor(ca.getColor());
+				}
+			});
+			map.put(l.getCategoryCode(), l.getCategoryCode());
+			resultList.add(dto);
+		});
+		categoryList.forEach(ca -> {
+			if (!map.containsKey(ca.getCategoryCode())) {
+				ProjectCategoryTotalResultDTO dto = new ProjectCategoryTotalResultDTO();
+				dto.setAgencyId(formDTO.getAgencyId());
+				dto.setCategoryCode(ca.getCategoryCode());
+				dto.setCategoryName(ca.getCategoryName());
+				dto.setColor(ca.getColor());
+				resultList.add(dto);
+				map.put(ca.getCategoryCode(), ca.getCategoryCode());
+			}
+		});
+
+		return resultList;
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】分类下项目列表
+	 * @author sun
+	 */
+	@Override
+	public CategoryProjectResultDTO categoryProjectList(CategoryProjectFormDTO formDTO) {
+		CategoryProjectResultDTO resultDTO = new CategoryProjectResultDTO();
+		//所选日期后一天的dateId值
+		formDTO.setToDateId(DateUtils.dateOrmonthId(formDTO.getDateId(), "date", 1));
+		//1.查询客户下分类信息
+		List<IssueProjectCategoryDictDTO> categoryList = govIssueService.categoryList(formDTO.getCustomerId(), null, null);
+		List<String> categoreCodeList = categoryList.stream().filter(ca -> ca.getParentCategoryCode().equals(formDTO.getCategoryCode())).map(m -> m.getCategoryCode()).collect(Collectors.toList());
+		formDTO.setCategoreCodeList(categoreCodeList);
+
+		//2.查询组织及下级截止某一天的某个一级分类下的项目列表
+		PageInfo<CategoryProjectResultDTO.Project> result =
+				PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> projectDao.categoryProjectList(formDTO));
+		if (org.springframework.util.CollectionUtils.isEmpty(result.getList())) {
+			return resultDTO;
+		}
+		resultDTO.setTotal((int) result.getTotal());
+
+		//3.查询已有项目列表涉及的所有分类信息【一个项目存在多个一级分类下的二级分类】
+		List<String> projectIds = result.getList().stream().map(CategoryProjectResultDTO.Project::getProjectId).collect(Collectors.toList());
+		List<CategoryProjectResultDTO.Project> list = projectDao.getCategoryList(projectIds);
+
+		//4.查询网格信息【楼院小组类项目、上报事件且上报给网格的项目才存在网格Id】
+		List<String> gridIds = result.getList().stream().map(CategoryProjectResultDTO.Project::getGridId).collect(Collectors.toList());
+		gridIds = gridIds.stream().distinct().collect(Collectors.toList());
+		List<GridsInfoListResultDTO> gridList = govOrgService.gridListByIds(gridIds);
+
+		//5.查询来源议题、事件的项目居民端创建人userId
+		List<ResiEventDTO> eventUser = projectDao.getEventList(projectIds);
+		List<ProjectRelatedPersonnelDTO> topicUser = projectDao.getTopicUser(projectIds);
+
+		//5.封装数据
+		result.getList().forEach(re -> {
+			//项目涉及网格信息
+			gridList.forEach(g -> {
+				if (StringUtils.isNotBlank(re.getGridId()) && re.getGridId().equals(g.getGridId())) {
+					re.setGridName(g.getName());
+				}
+			});
+			//项目涉及分类信息【一个项目涉及多个一级分类】
+			//一级分类Id
+			List<String> caId = new ArrayList<>();
+			list.forEach(ca -> {
+				if (ca.getProjectId().equals(re.getProjectId())) {
+					caId.add(ca.getCategoryPids());
+				}
+			});
+			//一级分类名称、code集合
+			List<String> caName = new ArrayList<>();
+			List<String> caCode = new ArrayList<>();
+			categoryList.forEach(ca -> caId.stream().filter(li -> ca.getId().equals(li)).forEach(s -> {
+				caName.add(ca.getCategoryName());
+				caCode.add(ca.getCategoryCode());
+			}));
+			re.setCategoryNames(caName);
+			re.setCategoryCodes(caCode);
+			//项目来源话题、事件的创建人信息
+			eventUser.forEach(ev -> {
+				if (re.getProjectId().equals(ev.getProjectId())) {
+					re.setUserId(ev.getReportUserId());
+				}
+			});
+			topicUser.forEach(to -> {
+				if (re.getProjectId().equals(to.getProjectId())) {
+					re.setUserId(to.getUserId());
+				}
+			});
+		});
+
+		resultDTO.setList(result.getList());
+		return resultDTO;
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】研判分析
+	 * @author sun
+	 */
+	@Override
+	public ProjectAnalysisResultDTO projectAnalysis(ProjectAnalysisFormDTO formDTO) {
+		ProjectAnalysisResultDTO resultDTO = new ProjectAnalysisResultDTO();
+		resultDTO.setUserId(formDTO.getUserId());
+		//1.查询userId的身份证号在小程序用户中存在的多个userId值
+		List<UserBaseInfoDTO> userList = epmetUserService.getUserBaseList(formDTO.getUserId(), formDTO.getCustomerId());
+		List<String> userIds = userList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList());
+
+		//2.查询对应负能平台用户家庭信息
+		if (!org.springframework.util.CollectionUtils.isEmpty(userList)) {
+			//2-1.根据身份证号查询负能平台用户信息
+			IcResiUserDTO icResiUserDTO = epmetUserService.getIcResiUser(userList.get(0).getIdNum(), formDTO.getCustomerId());
+			resultDTO.setIcUserId(icResiUserDTO.getId());
+			resultDTO.setIcUserName(icResiUserDTO.getName());
+			if (null != icResiUserDTO) {
+				//2-2.查询人员的家庭成员数据
+				List<ProjectAnalysisResultDTO.Home> homeList = epmetUserService.getHomeUserList(icResiUserDTO.getHomeId(), icResiUserDTO.getId());
+				resultDTO.setHomeUserList(homeList);
+			}
+		}
+		if (org.springframework.util.CollectionUtils.isEmpty(userIds)) {
+			userIds = new ArrayList<>();
+			userIds.add(formDTO.getUserId());
+		}
+
+		//3.查询一级分类数据
+		List<IssueProjectCategoryDictDTO> categoryList = govIssueService.categoryList(formDTO.getCustomerId(), null, null);
+		List<String> secondCodeList = formDTO.getCategoryCodeList().stream().flatMap(code -> categoryList.stream().filter(ca -> code.equals(ca.getParentCategoryCode())).map(second -> {
+			return second.getCategoryCode();
+		})).collect(Collectors.toList());
+
+		//4.根据userId集合和二级分类Code集合查询来源楼院小组的项目
+		List<ProjectCategoryResultDTO> groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "issue");
+
+		//5.根据userId集合和二级分类Code集合查询来源事件上报的项目
+		List<ProjectCategoryResultDTO> eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent");
+
+		//6.封装数据
+		//楼院小组下分类项目列表
+		List<ProjectAnalysisResultDTO.Category> groupProjectList = new ArrayList<>();
+		//事件上报下分类项目列表
+		List<ProjectAnalysisResultDTO.Category> eventProjectList = new ArrayList<>();
+		formDTO.getCategoryCodeList().forEach(code -> {
+			//一级分类code下的二级分类code集合
+			Map<String, String> secondCodeMap = new HashMap<>();
+			//来源楼院小组的分类及项目列表
+			ProjectAnalysisResultDTO.Category groupCa = new ProjectAnalysisResultDTO.Category();
+			List<ProjectAnalysisResultDTO.Project> groupPrList = new ArrayList<>();
+			//来源事件上报的分类及项目列表
+			ProjectAnalysisResultDTO.Category eventCa = new ProjectAnalysisResultDTO.Category();
+			List<ProjectAnalysisResultDTO.Project> eventPrList = new ArrayList<>();
+			categoryList.forEach(ca -> {
+				groupCa.setCategoryCode(code);
+				eventCa.setCategoryCode(code);
+				if (code.equals(ca.getCategoryCode())) {
+					groupCa.setCategoryName(ca.getCategoryName());
+					eventCa.setCategoryName(ca.getCategoryName());
+				}
+				if (code.equals(ca.getParentCategoryCode())) {
+					secondCodeMap.put(ca.getCategoryCode(), ca.getCategoryCode());
+				}
+			});
+			//当前分类下来源楼院小组的项目
+			groupList.forEach(gr -> {
+				if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) {
+					ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class);
+					groupPrList.add(project);
+				}
+			});
+			groupCa.setProjectList(groupPrList);
+			groupProjectList.add(groupCa);
+			//当前分类下来源事件上报的项目
+			eventList.forEach(gr -> {
+				if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) {
+					ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class);
+					eventPrList.add(project);
+				}
+			});
+			eventCa.setProjectList(eventPrList);
+			eventProjectList.add(eventCa);
+		});
+
+		resultDTO.setGroupProjectList(groupProjectList);
+		resultDTO.setEventProjectList(eventProjectList);
+		return resultDTO;
+	}
+
+	/**
+	 * 找出这些议题中对应的项目id,以及项目对应的一级分类编码
+	 *
+	 * @param issueIds
+	 * @return
+	 */
+	@Override
+	public List<IssueProjectCategory> getIssueProjectFirstCategory(List<String> issueIds) {
+		return projectDao.selectProjectIssueCategory(issueIds);
 	}
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
index 68f4afb4ee..2a353b0cc6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
@@ -1,9 +1,11 @@
 package com.epmet.dataaggre.service.resigroup;
 
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.dto.resigroup.form.*;
 import com.epmet.dataaggre.dto.resigroup.result.*;
+import com.epmet.dto.form.PageUserReportEventFormDTO;
 
 import java.util.List;
 
@@ -61,4 +63,11 @@ public interface ResiGroupService {
      * @return com.epmet.dataaggre.dto.resigroup.result.GroupActRankResultDTO
      */
     List<GroupActRankResultDTO> querySubRankList(GroupActRankFormDTO formDTO);
+
+    /**
+     * 分页查询我发布的话题
+     * @param formDTO
+     * @return
+     */
+    PageData<UserTopicResDTO> pageUserTopic(PageUserReportEventFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
index 374db9eedf..d0cd285b19 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
@@ -3,12 +3,15 @@ package com.epmet.dataaggre.service.resigroup.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.resigroup.ResiGroupDao;
 import com.epmet.dataaggre.dao.resigroup.ResiTopicDao;
 import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.dto.resigroup.form.*;
@@ -18,7 +21,9 @@ import com.epmet.dataaggre.redis.ResiGroupRedis;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
+import com.epmet.dataaggre.service.govproject.GovProjectService;
 import com.epmet.dataaggre.service.resigroup.ResiGroupService;
+import com.epmet.dto.form.PageUserReportEventFormDTO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -27,10 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -53,6 +55,8 @@ public class ResiGroupServiceImpl implements ResiGroupService {
     private DataStatsService dataStatsService;
     @Autowired
     private GovOrgService govOrgService;
+    @Autowired
+    private GovProjectService govProjectService;
 
     @Override
     public List<ResiTopicDTO> selectTopicInfoByIds(List<String> topicIds) {
@@ -358,4 +362,39 @@ public class ResiGroupServiceImpl implements ResiGroupService {
         }
         return resultDTOList;
     }
+
+    /**
+     * 数据分析-个人档案-发布话题列表
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<UserTopicResDTO> pageUserTopic(PageUserReportEventFormDTO formDTO) {
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
+            return new PageData<UserTopicResDTO>(new ArrayList<>(), NumConstant.ZERO);
+        }
+        PageInfo<UserTopicResDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> resiTopicDao.selectListTopic(formDTO));
+        List<UserTopicResDTO> list =pageInfo.getList();
+        //根据议题id查询出每个议题对应的项目id，以及项目分类编码
+        List<String> issueIds=list.stream().filter(dto -> StringUtils.isNotBlank(dto.getIssueId())).map(UserTopicResDTO::getIssueId).collect(Collectors.toList());
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(issueIds)){
+            List<IssueProjectCategory> categoryList= govProjectService.getIssueProjectFirstCategory(issueIds);
+            for(UserTopicResDTO topicResDTO :pageInfo.getList()){
+                topicResDTO.setShiftProject(false);
+                topicResDTO.setProjectId(StrConstant.EPMETY_STR);
+
+                for(IssueProjectCategory category:categoryList){
+                    if(topicResDTO.getIssueId().equals(category.getIssueId())&&StringUtils.isNotBlank(category.getProjectId())){
+                        topicResDTO.setShiftProject(true);
+                        topicResDTO.setProjectId(category.getProjectId());
+                        break;
+                    }
+                }
+
+            }
+        }
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
+    }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index e94f7859c3..681c057922 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -1045,4 +1045,66 @@
         GROUP BY t.orgId
     </select>
 
+    <select id="getProjectTotal" resultType="com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO">
+        SELECT * FROM (
+            SELECT
+                agency_id,
+                date_id,
+                month_id,
+                project_total,
+                pending_total,
+                (case when pending_ratio is null then '0%' else CONCAT(FORMAT(pending_ratio*100,2),'%') end) pendingRatio,
+                closed_total,
+                (case when closed_ratio is null then '0%' else CONCAT(FORMAT(closed_ratio*100,2),'%') end) closedRatio
+            FROM fact_agency_project_daily
+            WHERE agency_id = #{agencyId}
+                AND date_id = #{dateId}
+        UNION ALL
+            SELECT
+                agency_id,
+                date_id,
+                month_id,
+                project_total,
+                pending_total,
+                (case when pending_ratio is null then '0%' else CONCAT(FORMAT(pending_ratio*100,2),'%') end) pendingRatio,
+                closed_total,
+                (case when closed_ratio is null then '0%' else CONCAT(FORMAT(closed_ratio*100,2),'%') end) closedRatio
+            FROM fact_agency_project_daily
+            WHERE agency_id = #{agencyId}
+                AND date_id = #{yeDateId}
+        UNION ALL
+            (
+            SELECT
+                agency_id,
+                date_id,
+                month_id,
+                project_total,
+                pending_total,
+                (case when pending_ratio is null then '0%' else CONCAT(FORMAT(pending_ratio*100,2),'%') end) pendingRatio,
+                closed_total,
+                (case when closed_ratio is null then '0%' else CONCAT(FORMAT(closed_ratio*100,2),'%') end) closedRatio
+            FROM fact_agency_project_daily
+            WHERE agency_id = #{agencyId}
+                AND month_id = #{monthId}
+            ORDER BY date_id DESC
+            LIMIT 1
+            )
+        ) a
+        ORDER BY a.date_id DESC
+    </select>
+
+    <select id="getProjectMonthIncr" resultType="com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO">
+        SELECT
+            agency_id,
+            month_id,
+            project_incr
+        FROM
+            fact_agency_project_monthly
+        WHERE
+            agency_id = #{agencyId}
+        AND month_id &gt;= #{startMonth}
+        AND month_id <![CDATA[ <= ]]> #{endMonth}
+        ORDER BY month_id ASC
+    </select>
+
 </mapper>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
new file mode 100644
index 0000000000..c28d81375c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dataaggre.dao.epmetuser.IcResiUserDao">
+
+    <select id="getIcResiUser" resultType="com.epmet.dto.IcResiUserDTO">
+        SELECT
+            id,
+            customer_id,
+            agency_id,
+            grid_id,
+            home_id,
+            name,
+            mobile,
+            gender,
+            id_card,
+            birthday
+        FROM
+            ic_resi_user
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND id_card = #{idCard}
+    </select>
+
+    <select id="getHomeUserList" resultType="com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO$Home">
+        SELECT
+            id icUserId,
+            home_id homeId,
+            name icUserName
+        FROM
+            ic_resi_user
+        WHERE
+            del_flag = '0'
+        AND home_id = #{homeId}
+        ORDER BY id = #{icUserId} desc <!-- 指定某个人排在第一位 -->
+    </select>
+
+</mapper>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
index 1ce45a28d8..6c118e2ce0 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
@@ -38,4 +38,16 @@
               </foreach>
             )
     </select>
+
+    <select id="getUserBaseList" resultType="com.epmet.dto.UserBaseInfoDTO">
+        SELECT
+            *
+        FROM
+            user_base_info
+        WHERE
+            del_flag = '0'
+        AND id_num = ( SELECT id_num FROM user_base_info WHERE user_id = #{userId})
+        AND customer_id = #{customerId}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
index afa7e56c2d..c3b45aba0d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
@@ -182,4 +182,18 @@
           AND DEL_FLAG = 0
     </select>
 
+    <select id="projectCategoryList" resultType="com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO">
+        SELECT
+            org_id agencyId,
+            category_code categoryCode,
+            project_total total
+        FROM
+            screen_project_category_org_daily
+        WHERE
+            `level` = '1'
+        AND org_id = #{agencyId}
+        AND date_id = #{dateId}
+        ORDER BY project_total DESC
+    </select>
+
 </mapper>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
index 185816c9bb..90ecda4b20 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
@@ -124,4 +124,20 @@
             </if>
             order by i.SHIFTED_TIME desc
     </select>
+
+    <select id="getCategoryList" resultType="com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO">
+        SELECT
+            *
+        FROM issue_project_category_dict
+        WHERE del_flag = 0
+          AND customer_id = #{customerId}
+        <if test="level != null and level.trim() != ''">
+            AND category_type = #{level}
+        </if>
+        <if test="isDisable != null and isDisable.trim() != ''">
+            AND is_disable = #{isDisable}
+        </if>
+        ORDER BY category_code
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
index fde243eafa..60350c7a1e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
@@ -22,7 +22,8 @@
                 cg.grid_name,
                 CONCAT(ca.organization_name,'-',cg.grid_name)
             ) AS 'gridName',
-            cg.customer_id AS 'customerId'
+            cg.customer_id AS 'customerId',
+            cg.grid_name AS 'name'
         FROM
             customer_grid cg
         INNER JOIN customer_agency ca ON cg.pid = ca.id
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
index 1e144e3420..0282677e40 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
@@ -155,4 +155,142 @@
             AND rem.RED_DOT = '1'
             AND rem.USER_ID = #{userId}
     </select>
+
+    <select id="getProjectStatusList" resultType="com.epmet.dataaggre.dto.govproject.result.ProjectStatusListResultDTO">
+        SELECT
+            agency_id agencyId,
+            id projectId,
+            origin origin,
+            `status` status,
+            locate_longitude longitude,
+            locate_dimension latitude,
+            title title
+        FROM
+            project
+        WHERE
+            del_flag = '0'
+        AND org_id_path LIKE CONCAT('%', #{agencyId}, '%')
+        AND `status` = #{status}
+        AND created_time <![CDATA[<]]> DATE_FORMAT(#{toDateId}, '%Y-%m-%d')
+        ORDER BY created_time DESC
+    </select>
+
+    <select id="categoryProjectList" resultType="com.epmet.dataaggre.dto.govproject.result.CategoryProjectResultDTO$Project">
+        SELECT
+            p.agency_id agencyId,
+            p.id projectId,
+            p.origin origin,
+            IFNULL(pc.grid_id, '') gridId,
+            p.`status` status,
+            p.title title,
+            p.created_time time
+        FROM
+            project p
+        INNER JOIN project_category pc ON p.id = pc.project_id
+        WHERE
+            p.del_flag = '0'
+        AND p.org_id_path LIKE CONCAT('%', #{agencyId}, '%')
+        AND p.created_time <![CDATA[<]]> DATE_FORMAT(#{toDateId}, '%Y-%m-%d')
+        <foreach collection="categoreCodeList" item="code" open="AND pc.category_code IN (" separator="," close=")">
+            #{code}
+        </foreach>
+        GROUP BY
+            pc.project_id
+        ORDER BY
+            p.created_time DESC
+    </select>
+
+    <select id="getCategoryList" resultType="com.epmet.dataaggre.dto.govproject.result.CategoryProjectResultDTO$Project">
+        SELECT
+            project_id projectId,
+            substring_index(category_pids, ',', 1) categoryPids, <!-- 目前分类只有两级，所以这个字段值其实就是一类的id值，后续上报上来的数据会存在多个 -->
+            category_code categoryCode
+        FROM
+            project_category
+        WHERE
+            del_flag = '0'
+        <foreach collection="projectIds" item="projectId" open="AND project_id IN (" separator="," close=")">
+            #{projectId}
+        </foreach>
+        GROUP BY
+            category_pids, project_id
+        ORDER BY project_id
+    </select>
+
+    <select id="getEventList" resultType="com.epmet.dataaggre.dto.govproject.ResiEventDTO">
+        SELECT
+            project_id projectId,
+            report_user_id reportUserId
+        FROM
+            resi_event
+        WHERE
+            DEL_FLAG = '0'
+        <foreach collection="projectIds" item="projectId" open="AND project_id IN (" separator="," close=")">
+            #{projectId}
+        </foreach>
+    </select>
+
+    <select id="getTopicUser" resultType="com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO">
+        SELECT
+            project_id projectId,
+            user_id userId
+        FROM
+            project_related_personnel
+        WHERE
+            del_flag = '0'
+        AND source_type = 'topic'
+        <foreach collection="projectIds" item="projectId" open="AND project_id IN (" separator="," close=")">
+            #{projectId}
+        </foreach>
+    </select>
+
+    <select id="selectProjectIssueCategory" parameterType="map" resultType="com.epmet.dataaggre.dto.govproject.result.IssueProjectCategory">
+        SELECT
+            p.ORIGIN_ID AS issueId,
+            p.id AS projectId
+        FROM
+            project p
+        WHERE
+            p.DEL_FLAG = '0'
+        <foreach item="issueId" collection="issueIds" separator="OR" open="AND (" close=")" index="">
+            p.ORIGIN_ID = #{issueId}
+        </foreach>
+    </select>
+
+    <select id="getProjectCategoryList" resultType="com.epmet.dataaggre.dto.govproject.result.ProjectCategoryResultDTO">
+        SELECT
+            p.id projectId,
+            p.title title,
+            p.`status` status,
+            pc.category_code categoryCode
+        FROM
+            project p
+        INNER JOIN project_category pc ON p.id = pc.project_id
+        <if test="origin != null and origin != '' and origin == 'issue'">
+            INNER JOIN project_related_personnel prp ON p.id = prp.project_id AND prp.source_type = 'topic'
+        </if>
+        <if test="origin != null and origin != '' and origin == 'resiEvent'">
+            INNER JOIN resi_event re ON p.ID = re.PROJECT_ID
+        </if>
+        WHERE
+            p.del_flag = '0'
+        AND p.customer_id = #{customerId}
+        AND p.origin = #{origin}
+        <foreach collection="secondCodeList" item="code" open="AND pc.category_code IN (" separator="," close=")">
+            #{code}
+        </foreach>
+        <if test="origin != null and origin != '' and origin == 'issue'">
+            <foreach collection="userIds" item="userId" open="AND prp.user_id IN (" separator="," close=")">
+                #{userId}
+            </foreach>
+        </if>
+        <if test="origin != null and origin != '' and origin == 'resiEvent'">
+            <foreach collection="userIds" item="userId" open="AND re.report_user_id IN (" separator="," close=")">
+                #{userId}
+            </foreach>
+        </if>
+        GROUP BY pc.project_id
+        ORDER BY p.created_time DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml
index bd46639c94..c2e54e14ae 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml
@@ -22,4 +22,23 @@
                 #{topicId}
             </foreach>
     </select>
+
+    <!--    发布话题，分页-->
+    <select id="selectListTopic" parameterType="com.epmet.dto.form.PageUserReportEventFormDTO"
+            resultType="com.epmet.dataaggre.dto.resigroup.result.UserTopicResDTO">
+        SELECT
+            rt.id as topicId,
+            IFNULL(rt.TOPIC_CONTENT,'语音话题') as topicContent,
+            rt.SHIFT_ISSUE as shiftIssue,
+            IFNULL(rt.ISSUE_ID,'') AS issueId,
+            rt.CREATED_TIME as releaseTime
+        FROM
+            resi_topic RT
+        WHERE
+            rt.DEL_FLAG = '0'
+            <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
+                rt.CREATED_BY = #{epmetUserId}
+            </foreach>
+            order by rt.CREATED_TIME desc
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/heart/VolunteerDemandServiceStatsResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/heart/VolunteerDemandServiceStatsResultDTO.java
new file mode 100644
index 0000000000..2dfcb5426a
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/heart/VolunteerDemandServiceStatsResultDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.result.heart;
+
+import lombok.Data;
+
+/**
+ * @Description 描述
+ * @Author wangxianzhang
+ * @Date 2021/12/10 4:24 下午
+ * @Version 1.0
+ */
+@Data
+public class VolunteerDemandServiceStatsResultDTO {
+    
+    private String customerId;
+    private String dateId;
+    /**
+     * 客户下志愿者总数
+     */
+    private Integer volunteerTotal;
+    /**
+     * 客户下志愿者中，党员数量
+     */
+    private Integer partyTotal;
+    /**
+     * 客户下志愿者中，居民数量
+     */
+    private Integer resiTotal;
+    /**
+     * 客户下志愿者服务总次数
+     */
+    private Integer serviceTotal;
+    /**
+     * 客户下党员志愿者服务次数
+     */
+    private Integer partyServiceTotal;
+    /**
+     * 客户下居民志愿者服务次数
+     */
+    private Integer resiServiceTotal;
+    
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java
index d8b33c9d12..5826f74e94 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java
@@ -87,4 +87,6 @@ public class FineExampleResultDTO implements Serializable {
      * PLAT_JOIN PARTY_RATIO 平台参与议事的党员占比
      */
     private String platJoinPartyRatio = "0.00%";
+
+    private String dataEndTime;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java
index bf6ae28829..4056d1976f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java
@@ -44,4 +44,6 @@ public class GovernCapacityRankResultDTO implements Serializable {
      * 当前agencyName的上一级组织名称
      */
     private String parentAgencyName;
+
+    private String monthId;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java
index e749c0e218..be8c7d4398 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java
@@ -46,4 +46,6 @@ public class GovernCapacityResultDTO implements Serializable {
     private String parentAgencyName;
 
     private String orgId;
+
+    private String monthId;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java
index ac2072d44c..624868df62 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java
@@ -39,4 +39,9 @@ public class GrassRootsGovernRankResultDTO implements Serializable {
 	 * 组织名称
 	 */
 	private String orgName;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java
index 05b2e6c382..27be4bb8ce 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java
@@ -35,4 +35,9 @@ public class GrassRootsGovernResultDTO implements Serializable {
 	 * 办结率（当前界面是社区时显示）
 	 */
 	private String closedProjectRatio;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java
index 61b7ab9b74..e6c3ee3971 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java
@@ -31,4 +31,6 @@ public class GrassRootsOrgRankResultDTO implements Serializable {
 	 * 组织名称
 	 */
 	private String orgName;
+
+	private String monthId;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java
index d01bf5837e..8c4f0df674 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java
@@ -27,4 +27,9 @@ public class GrassRootsOrgResultDTO implements Serializable {
 	 * 项目数
 	 */
 	private Integer projectTotal;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java
index fa37c1f731..3319d73fd1 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java
@@ -57,4 +57,8 @@ public class OrgRankDataResultDTO implements Serializable {
     private String parentAgencyName;
 
     private String orgId;
+    /**
+     * 数据所属月份
+     */
+    private String monthId;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java
index 3450a623a6..6e63822e65 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java
@@ -28,4 +28,6 @@ public class PartyUserPointResultDTO implements Serializable {
      * 用户积分
      * */
     private Integer point;
+
+    private String dataEndTime;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java
index aa5dcb67b5..2024fcd9d8 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java
@@ -31,4 +31,9 @@ public class PmTotalResultDTO implements Serializable {
 	 * 议题数
 	 */
 	private Integer issueTotal;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java
index 9e6b2d509e..a5f3f8ce4f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java
@@ -27,4 +27,6 @@ public class ProjectProfileResultDTO implements Serializable {
 	 * 级别
 	 */
 	private String level;
+
+	private String dataEndTime;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java
index e95933e1c1..793306dcbc 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java
@@ -49,4 +49,8 @@ public class PublicPartiProfileResultDTO implements Serializable {
 
     private String joinCompareLatestTrend = "";
 
+    /**
+     * 数据所属月份
+     */
+    private String monthId;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java
index 55c281db6c..5d95da3a5e 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java
@@ -42,4 +42,6 @@ public class TopProfileResultDTO implements Serializable {
      * 项目总数
      */
     private Integer projectNum = 0;
+
+    private String dataEndTime;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/heart/DataReportHeartDemandController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/heart/DataReportHeartDemandController.java
new file mode 100644
index 0000000000..86eabe2b3c
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/heart/DataReportHeartDemandController.java
@@ -0,0 +1,38 @@
+package com.epmet.datareport.controller.heart;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.datareport.service.heart.DemandService;
+import com.epmet.dto.result.heart.VolunteerDemandServiceStatsResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 描述
+ * @Author wangxianzhang
+ * @Date 2021/12/10 3:55 下午
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("heart/demand")
+public class DataReportHeartDemandController {
+
+    @Autowired
+    private DemandService demandService;
+    
+    /**
+     * 查询志愿者需求服务统计信息
+     * @param loginUser
+     * @return
+     */
+    @PostMapping("volunteer/service")
+    public Result<VolunteerDemandServiceStatsResultDTO> getVolunteerServiceStats(@LoginUser TokenDto loginUser) {
+        String customerId = loginUser.getCustomerId();
+        VolunteerDemandServiceStatsResultDTO r = demandService.getVolunteerServiceStats(customerId);
+        return new Result<VolunteerDemandServiceStatsResultDTO>().ok(r);
+    }
+    
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
index 6f485e507e..abd9b25e92 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
@@ -11,6 +11,14 @@ import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantity
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService;
 import com.epmet.datareport.service.project.ProjectService;
 import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.form.screen.EfficiencyAnalysisFormDTO;
+import com.epmet.dto.form.screen.QueryQuantityMonthlyFormDTO;
+import com.epmet.dto.form.screen.ScreenCommonFormDTO;
+import com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO;
+import com.epmet.dto.result.screen.ProjectQuantityResultDTO;
+import com.epmet.dto.result.screen.QueryQuantityMonthlyResultDTO;
+import com.epmet.datareport.service.project.ProjectService;
+import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.project.MassesDiscontentFormV2DTO;
 import com.epmet.dto.result.project.MassesDiscontentResultV2DTO;
 import com.epmet.project.constant.ProjectConstant;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
index 051a6ec3e6..5883d352e7 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
@@ -20,6 +20,7 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 import com.epmet.dto.ScreenCustomerAgencyCommonDTO;
 import com.epmet.dto.ScreenCustomerGridDTO;
 import com.epmet.dto.result.ParentListResultDTO;
+import com.epmet.dto.ScreenCustomerAgencyCommonDTO;
 import com.epmet.dto.result.ScreenCustomerAgencyDTO;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
 import com.epmet.dto.result.plugins.DeptNodeDTO;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java
new file mode 100644
index 0000000000..fd4d28afb0
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactVolunteerServiceDailyDao.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.fact;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.datareport.entity.heart.FactVolunteerServiceDailyEntity;
+import com.epmet.dto.result.heart.VolunteerDemandServiceStatsResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 志愿者服务情况统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-12-08
+ */
+@Mapper
+public interface FactVolunteerServiceDailyDao extends BaseDao<FactVolunteerServiceDailyEntity> {
+
+    /**
+     * 查询最新一条"志愿者需求服务统计信息"
+     * @param customerId
+     * @return
+     */
+    VolunteerDemandServiceStatsResultDTO getLatestVolunteerDemandServiceStats(@Param("customerId") String customerId);
+}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/heart/FactVolunteerServiceDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/heart/FactVolunteerServiceDailyEntity.java
new file mode 100644
index 0000000000..a668e52a63
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/heart/FactVolunteerServiceDailyEntity.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.entity.heart;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 志愿者服务情况统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-12-08
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_volunteer_service_daily")
+public class FactVolunteerServiceDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 截止到当前dateId，当前客户下，共有多少个爱心互助的志愿者
+     */
+	private Integer volunteerTotal;
+
+    /**
+     * 截止到当前dateId，当前客户下，XX个爱心互助志愿者中，党员有多少个
+     */
+	private Integer partyTotal;
+
+    /**
+     * 截止到当前dateId，当前客户下，XX个爱心互助志愿者中，居民有多少个
+     */
+	private Integer resiTotal;
+
+    /**
+     * 服务总次数
+     */
+	private Integer serviceTotal;
+
+    /**
+     * 党员服务总次数
+     */
+	private Integer partyServiceTotal;
+
+    /**
+     * 居民服务总次数
+     */
+	private Integer resiServiceTotal;
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
index 0c75304942..18978f6e23 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
@@ -190,6 +190,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         result.setMonthIncr(convertPercentStr(latest.getMonthIncr(), NumConstant.ZERO));
         result.setJoinCompareLatestMonth(convertPercentStr(latest.getJoinCompareLatestMonth().abs(), NumConstant.ZERO));
         result.setIssueCompareLatestMonth(convertPercentStr(latest.getIssueCompareLatestMonth().abs(), NumConstant.ZERO));
+        result.setMonthId(monthId);
         return result;
     }
 
@@ -286,6 +287,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
             rank.setResponseRatio(convertPercentStr(o.getResponseRatio(),NumConstant.ONE));
             rank.setSatisfactionRatio(convertPercentStr(o.getSatisfactionRatio(),NumConstant.ONE));
             rank.setParentAgencyName(o.getParentAgencyName());
+            rank.setMonthId(o.getMonthId());
             result.add(rank);
         });
         return result;
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/DemandService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/DemandService.java
new file mode 100644
index 0000000000..ccbbb319a1
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/DemandService.java
@@ -0,0 +1,13 @@
+package com.epmet.datareport.service.heart;
+
+import com.epmet.dto.result.heart.VolunteerDemandServiceStatsResultDTO;
+
+/**
+ * @Description 需求服务
+ * @Author wangxianzhang
+ * @Date 2021/12/10 4:18 下午
+ * @Version 1.0
+ */
+public interface DemandService {
+    VolunteerDemandServiceStatsResultDTO getVolunteerServiceStats(String customerId);
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/impl/DemandServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/impl/DemandServiceImpl.java
new file mode 100644
index 0000000000..79ba0274ea
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/heart/impl/DemandServiceImpl.java
@@ -0,0 +1,29 @@
+package com.epmet.datareport.service.heart.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.dao.fact.FactVolunteerServiceDailyDao;
+import com.epmet.datareport.entity.heart.FactVolunteerServiceDailyEntity;
+import com.epmet.datareport.service.heart.DemandService;
+import com.epmet.dto.result.heart.VolunteerDemandServiceStatsResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 需求服务
+ * @Author wangxianzhang
+ * @Date 2021/12/10 4:20 下午
+ * @Version 1.0
+ */
+@Service
+public class DemandServiceImpl implements DemandService {
+    
+    @Autowired
+    private FactVolunteerServiceDailyDao factVolunteerServiceDailyDao;
+    
+    @Override
+    public VolunteerDemandServiceStatsResultDTO getVolunteerServiceStats(String customerId) {
+        return factVolunteerServiceDailyDao.getLatestVolunteerDemandServiceStats(customerId);
+    }
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
index 070fcca43a..55e0d3c7c0 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
@@ -211,7 +211,7 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     /**
-     * @Description  项目详情
+     * @Description 项目详情
      * @Param processListFormDTO
      * @author zxc
      * @date 2020/10/23 10:33 上午
@@ -285,9 +285,9 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     /**
+     * @return
      * @Description 难点赌点-获取组织下拉框
      * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
-     * @return
      * @author jiangyy
      * @date 2020.10.19 16:38
      **/
@@ -297,7 +297,7 @@ public class ProjectServiceImpl implements ProjectService {
 
         //1、根据token获取本级agencyId、获取userId
         String agencyId = getLoginUserDetails(tokenDto);
-        String userId=getLoginUserUserId(tokenDto);
+        String userId = getLoginUserUserId(tokenDto);
 
         //2、获取本级组织机构
         Result<CustomerAgencyDTO> customerAgencyDTO = govOrgOpenFeignClient.getAgencyById(agencyId);
@@ -328,7 +328,7 @@ public class ProjectServiceImpl implements ProjectService {
             Result<SubAgencyResultDTO> SubAgencyResultDTO = govOrgOpenFeignClient.subAgencyList(form);
 
             List<SubListResultDTO> subAgencyList = SubAgencyResultDTO.getData().getAgencyList();
-            for(int i=0;i<subAgencyList.size();i++){
+            for (int i = 0; i < subAgencyList.size(); i++) {
                 ProjectNextAgencyResultDTO subAgencyDto = new ProjectNextAgencyResultDTO();
                 subAgencyDto.setOrgId(subAgencyList.get(i).getAgencyId());
                 subAgencyDto.setOrgName(subAgencyList.get(i).getAgencyName());
@@ -337,30 +337,30 @@ public class ProjectServiceImpl implements ProjectService {
             }
         }
 
-        if(null == resultList) return new ArrayList<>();
+        if (null == resultList) return new ArrayList<>();
         return resultList;
     }
 
     /**
-     * @Description 难点赌点-耗时最长|涉及部门最多|处理次数
-     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
      * @param param
      * @return
+     * @Description 难点赌点-耗时最长|涉及部门最多|处理次数
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
      * @author jiangyy
      * @date 2020.10.19 16:38
      **/
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     public List<ProjectDifficultRankResultDTO> getDifficultyRank(DifficultyRankFormDTO param) {
         PageHelper.startPage(null == param.getPageNo() ? NumConstant.ONE:param.getPageNo(),param.getTopNum());
         List<ProjectDifficultRankResultDTO> result = projectDao.difficultyRank(param);
-        for (int i = 0; i < result.size (); i ++){
-            List<String> imgUrlList  ;
-            imgUrlList = projectDao.getDifficultyImgList(result.get(i).getProjectId()) ;
+        for (int i = 0; i < result.size(); i++) {
+            List<String> imgUrlList;
+            imgUrlList = projectDao.getDifficultyImgList(result.get(i).getProjectId());
 
             result.get(i).setImgUrlList(imgUrlList);
         }
-        if(null == result) return new ArrayList<>();
+        if (null == result) return new ArrayList<>();
         return result;
     }
 
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactVolunteerServiceDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactVolunteerServiceDailyDao.xml
new file mode 100644
index 0000000000..fbe645deb3
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactVolunteerServiceDailyDao.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.fact.FactVolunteerServiceDailyDao">
+
+    <resultMap type="com.epmet.datareport.entity.heart.FactVolunteerServiceDailyEntity" id="factVolunteerServiceDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="volunteerTotal" column="VOLUNTEER_TOTAL"/>
+        <result property="partyTotal" column="PARTY_TOTAL"/>
+        <result property="resiTotal" column="RESI_TOTAL"/>
+        <result property="serviceTotal" column="SERVICE_TOTAL"/>
+        <result property="partyServiceTotal" column="PARTY_SERVICE_TOTAL"/>
+        <result property="resiServiceTotal" column="RESI_SERVICE_TOTAL"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    
+    <select id="getLatestVolunteerDemandServiceStats"
+            resultType="com.epmet.dto.result.heart.VolunteerDemandServiceStatsResultDTO">
+        select *
+        from fact_volunteer_service_daily
+        where DEL_FLAG = 0
+            and CUSTOMER_ID = #{customerId}
+        order by DATE_ID desc
+            limit 1        
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
index abbf1de8e4..1568e078b5 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
@@ -35,7 +35,8 @@
             IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO,
             IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO,
             IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
-            pa.AGENCY_NAME AS parentAgencyName
+            pa.AGENCY_NAME AS parentAgencyName,
+            rankData.MONTH_ID as monthId
             FROM screen_customer_agency agency
             left join screen_customer_agency pa
                 on(agency.PARENT_AREA_CODE=pa.AREA_CODE
@@ -61,7 +62,8 @@
             IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO,
             IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO,
             IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
-            ca.agency_name AS parentAgencyName
+            ca.agency_name AS parentAgencyName,
+            rankData.MONTH_ID as monthId
             FROM screen_customer_grid grid
             left join screen_customer_agency ca
              on (ca.agency_id = grid.parent_agency_id)
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
index 6908b80953..ac2ad698eb 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
@@ -14,7 +14,8 @@
             rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio,
             rankData.SATISFACTION_RATIO AS satisfactionRatio,
             agency.AGENCY_NAME AS parentAgencyName,
-            rankData.ORG_ID as orgId
+            rankData.ORG_ID as orgId,
+            rankData.MONTH_ID
         FROM
             screen_org_rank_data rankData
         LEFT JOIN screen_customer_agency agency
@@ -39,7 +40,8 @@
                     rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio,
                     rankData.SATISFACTION_RATIO AS satisfactionRatio,
                     agency.AGENCY_NAME AS parentAgencyName,
-                    rankData.ORG_ID as orgId
+                    rankData.ORG_ID as orgId,
+                    rankData.MONTH_ID
             FROM
                     screen_org_rank_data rankData
             left join screen_customer_grid scg on(
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index fdde620908..4e84fe035c 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -103,7 +103,8 @@
         SELECT
                 m.USER_ID,
                 concat( m.surname, CASE char_length( m.NAME ) WHEN 1 THEN '*' WHEN 2 THEN '**' ELSE '***' END )  AS name,
-                m.POINT_TOTAL AS point
+                m.POINT_TOTAL AS point,
+                m.DATA_END_TIME
         FROM
                 screen_party_user_rank_data m
         left join screen_customer_grid scg
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
index b1f890b3a5..90e3cf0b91 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
@@ -17,7 +17,8 @@
             publish_issue_total AS publishIssueTotal,
             IFNULL(publish_issue_ratio,0) AS publishIssueRatioA,
             PLAT_ISSUE_TOTAL AS platIssueTotal,
-            IFNULL(PLAT_JOIN_PARTY_RATIO,0) AS platJoinPartyRatio
+            IFNULL(PLAT_JOIN_PARTY_RATIO,0) AS platJoinPartyRatio,
+            DATA_END_TIME as dataEndTime
         FROM
             screen_pioneer_data
         WHERE
@@ -44,7 +45,8 @@
             CEILING(sum(data.publish_issue_total)) AS publishIssueTotal,
             IFNULL(avg(data.publish_issue_ratio),0) AS publishIssueRatioA,
             CEILING(sum(data.PLAT_ISSUE_TOTAL)) AS platIssueTotal,
-            IFNULL(avg(data.PLAT_JOIN_PARTY_RATIO),0) AS platJoinPartyRatio
+            IFNULL(avg(data.PLAT_JOIN_PARTY_RATIO),0) AS platJoinPartyRatio,
+            DATA_END_TIME as dataEndTime
         FROM
             screen_pioneer_data data
         LEFT JOIN
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
index af7f1bfc34..31e5262c75 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
@@ -38,7 +38,8 @@
             group_total AS groupNum,
             topic_total AS topicNum,
             issue_total AS issueNum,
-            project_total AS projectNum
+            project_total AS projectNum,
+            DATA_END_TIME as dataEndTime
         FROM
             screen_user_total_data
         WHERE
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml
index 10679f3f96..8718bfa0f2 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml
@@ -5,7 +5,8 @@
     <select id="selectProjectProfile" resultType="com.epmet.evaluationindex.screen.dto.result.ProjectProfileResultDTO">
         SELECT ORG_ID,
                PROJECT_TOTAL,
-               LEVEL
+               LEVEL,
+               DATA_END_TIME as dataEndTime
         FROM screen_an_community_project_profile
         WHERE DEL_FLAG = 0
         AND CUSTOMER_ID = #{customerId}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml
index 4f4e7e96c5..f9c4917cdc 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml
@@ -9,7 +9,8 @@
                CLOSED_PROJECT_TOTAL,
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "projectResponseRatio",
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "projectSatisRatio",
-               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio"
+               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio",
+               MONTH_ID
         FROM screen_an_grass_roots_govern_monthly
         WHERE DEL_FLAG = 0
         AND ORG_ID = #{agencyId}
@@ -55,7 +56,8 @@
                CLOSED_PROJECT_TOTAL,
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "projectResponseRatio",
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "projectSatisRatio",
-               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio"
+               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio",
+               MONTH_ID
         FROM screen_an_grass_roots_govern_monthly
         WHERE DEL_FLAG = 0
           AND PID = #{agencyId}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml
index 9bf5d9a061..2b5be8dfcf 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml
@@ -7,7 +7,8 @@
     <select id="selectGrassRootsOrg" resultType="com.epmet.evaluationindex.screen.dto.result.GrassRootsOrgResultDTO">
         SELECT GROUP_TOTAL,
                ISSUE_TOTAL,
-               PROJECT_TOTAL
+               PROJECT_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_org_monthly
         WHERE DEL_FLAG = 0
         AND ORG_ID = #{agencyId}
@@ -47,7 +48,8 @@
         SELECT ORG_NAME,
                GROUP_TOTAL,
                ISSUE_TOTAL,
-               PROJECT_TOTAL
+               PROJECT_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_org_monthly
         WHERE DEL_FLAG = 0
           AND PID = #{agencyId}
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml
index 58b7001046..0cb482df47 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml
@@ -7,7 +7,8 @@
         SELECT GROUP_MEMBER_TOTAL,
                TOPIC_TOTAL,
                TOPIC_PARTI_USER_TOTAL,
-               ISSUE_TOTAL
+               ISSUE_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_pm_total_monthly
         WHERE DEL_FLAG = '0'
           AND ORG_ID = #{agencyId}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java
new file mode 100644
index 0000000000..16cbee4538
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/heart/result/DemandServiceCountResultDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.heart.result;
+
+import lombok.Data;
+
+/**
+ * @Description 描述
+ * @Author wangxianzhang
+ * @Date 2021/12/8 4:39 下午
+ * @Version 1.0
+ */
+@Data
+public class DemandServiceCountResultDTO {
+    // 服务者ID
+    private String serverId;
+    // 服务类型
+    private String serviceType;
+    // 服务次数
+    private int serveTimes;   
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java
index c07037ee92..872dbc96a2 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java
@@ -113,4 +113,9 @@ public class IssueProjectCategoryDictDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 颜色
+     */
+	private String color;
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
index 047a16e87b..dab2edf301 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
@@ -25,6 +25,7 @@ import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -341,4 +342,15 @@ public interface DataStatisticalOpenFeignClient {
      */
     @PostMapping("/data/stats/datareporting/eventinfo")
     Result<List<EventInfoResultDTO>> getEventInfo(@RequestBody EventInfoFormDTO formDTO);
+
+    /**
+     * wangxianzhang
+     *
+     * 计算客户下志愿者服务相关数据
+     *
+     * @param customerId 客户ID，可以为空，为空则计算所有客户
+     * @return
+     */
+    @PostMapping("/data/stats/demand/volunteer/daily")
+    Result statsVolunteerDemandServicesDaily(@RequestParam(value = "customer-id", required = false) String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
index 43638c894e..56fea9c03f 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
@@ -334,4 +334,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result<List<EventInfoResultDTO>> getEventInfo(EventInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getEventInfo", formDTO);
     }
+
+    @Override
+    public Result statsVolunteerDemandServicesDaily(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "statsVolunteerDemandServicesDaily", customerId);
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java
new file mode 100644
index 0000000000..cd77d2b25a
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemandController.java
@@ -0,0 +1,38 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.service.DemandService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Description 描述
+ * @Author wangxianzhang
+ * @Date 2021/12/8 10:44 上午
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("demand")
+public class DemandController {
+
+    @Autowired
+    private DemandService demandStatsService;
+    
+    /**
+     * wangxianzhang
+     * 
+     * 计算客户下志愿者服务相关数据
+     * 
+     * @param customerId 客户ID，可以为空，为空则计算所有客户
+     * @return
+     */
+    @PostMapping("volunteer/daily")
+    public Result statsVolunteerDemandServicesDaily(@RequestParam(value = "customer-id", required = false) String customerId) {
+
+        demandStatsService.statsVolunteerDemandServicesDaily(customerId);
+        
+        return new Result();
+    }
+    
+    
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 191c03bf7e..ef567e92f1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -158,7 +158,7 @@ public class DemoController {
      */
     @GetMapping("testthreadpool")
     public void testThreadPool() {
-        System.out.println(LocalDateTime.now().getSecond());;
+        System.out.println(LocalDateTime.now().getSecond());
         System.out.println("----------->>");
         Future<Boolean> future1 = executorService.submit(() -> demoService.testThreadPool());
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java
new file mode 100644
index 0000000000..165ae6b91c
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/IcUserDemandServiceDao.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.heart;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.heart.result.DemandServiceCountResultDTO;
+import com.epmet.entity.heart.IcUserDemandServiceEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 居民需求服务记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Mapper
+public interface IcUserDemandServiceDao extends BaseDao<IcUserDemandServiceEntity> {
+
+    /**
+     * 需求服务次数查询
+     * @param customerId 客户id
+     * @param serviceType 服务者类型
+     */
+    List<DemandServiceCountResultDTO> listDemandServeTimes(@Param("customerId") String customerId, @Param("endTime") Date endTime, @Param("serviceType") String serviceType);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/VolunteerInfoDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/VolunteerInfoDao.java
new file mode 100644
index 0000000000..11b5aad534
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/heart/VolunteerInfoDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.heart;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.heart.VolunteerInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 志愿者信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-12-08
+ */
+@Mapper
+public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactVolunteerServiceDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactVolunteerServiceDailyDao.java
new file mode 100644
index 0000000000..605364c820
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactVolunteerServiceDailyDao.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactVolunteerServiceDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 志愿者服务情况统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-12-08
+ */
+@Mapper
+public interface FactVolunteerServiceDailyDao extends BaseDao<FactVolunteerServiceDailyEntity> {
+
+    /**
+     * 删除指定客户，指定dateId的志愿者服务统计记录
+     * @param customerIds
+     * @param dateDimId
+     */
+    void clearVolunteerDemandServiceDailyStats(@Param("customerIds") List<String> customerIds, @Param("dateDimId") String dateDimId);
+}
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
index 2c8f46ea9b..584bfdf64c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
@@ -264,5 +264,7 @@ public interface UserDao {
     List<MidPatrolRecordResult> getPatrolRecordList(MidPatrolFormDTO formDTO);
 
     List<MidPatrolDetailResult> getPatrolDetailList(MidPatrolFormDTO formDTO);
+
+    List<String> filterUserIds(@Param("userIds") List<String> userIds, @Param("roleKey") String roleKey);
 }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
index 9de3701b58..cf6c373dca 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
@@ -39,7 +39,6 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity {
      * 客户id
      */
 	private String customerId;
-	private String code;
 
     /**
      * 网格id
@@ -93,4 +92,9 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity {
 	 * desc: 是否参与上级计算yes:参与;no:不参与 add 01.14
 	 */
 	private String upToCal;
+
+	/**
+	 * 地区码
+	 */
+	private String code;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/IcUserDemandServiceEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/IcUserDemandServiceEntity.java
new file mode 100644
index 0000000000..002b1db875
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/IcUserDemandServiceEntity.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.heart;
+
+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-11-19
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_user_demand_service")
+public class IcUserDemandServiceEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 需求id
+     */
+	private String demandRecId;
+
+    /**
+     * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+     */
+	private String serviceType;
+
+    /**
+     * 志愿者：居民端爱心互助的志愿者userId；
+     */
+	private String serverId;
+
+    /**
+     * 实际服务开始时间
+     */
+	private Date serviceStartTime;
+
+    /**
+     * 实际服务结束时间
+     */
+	private Date serviceEndTime;
+
+    /**
+     * 完成情况
+     */
+	private String finishDesc;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java
new file mode 100644
index 0000000000..60f41bd0fa
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/heart/VolunteerInfoEntity.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.heart;
+
+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-12-08
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("volunteer_info")
+public class VolunteerInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 志愿者自我介绍
+     */
+	private String volunteerIntroduce;
+
+    /**
+     * 志愿者签名
+     */
+	private String volunteerSignature;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java
index 67c82fee00..1c1afbcc08 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java
@@ -80,4 +80,9 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity {
 	 */
 	private String isDisable;
 
+	/**
+	 * 颜色
+	 */
+	private String color;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java
new file mode 100644
index 0000000000..f2b473bfe9
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactVolunteerServiceDailyEntity.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+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-12-08
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_volunteer_service_daily")
+public class FactVolunteerServiceDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 截止到当前dateId，当前客户下，共有多少个爱心互助的志愿者
+     */
+	private Integer volunteerTotal;
+
+    /**
+     * 截止到当前dateId，当前客户下，XX个爱心互助志愿者中，党员有多少个
+     */
+	private Integer partyTotal;
+
+    /**
+     * 截止到当前dateId，当前客户下，XX个爱心互助志愿者中，居民有多少个
+     */
+	private Integer resiTotal;
+
+    /**
+     * 服务总次数
+     */
+	private Integer serviceTotal;
+
+    /**
+     * 党员服务总次数
+     */
+	private Integer partyServiceTotal;
+
+    /**
+     * 居民服务总次数
+     */
+	private Integer resiServiceTotal;
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java
index 7ad372c8cc..2f9a0d6d7a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java
@@ -1,12 +1,18 @@
 package com.epmet.healthcheck;
 
 import com.epmet.commons.tools.utils.Result;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 @RestController
 @RequestMapping("healthcheck")
+@Slf4j
 public class HealthCheckController {
 
     /**
@@ -15,7 +21,14 @@ public class HealthCheckController {
      */
     @PostMapping("http")
     public Result httpHealthCheck() {
-        return new Result();
+        InetAddress serverIp = null;
+        try {
+            serverIp = Inet4Address.getLocalHost();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+        log.info("健康检查：serverName:{}", serverIp);
+        return new Result().ok(serverIp);
     }
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
index 690543f0d2..687e04e0a7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
@@ -35,7 +35,6 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
      * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
      */
     private static volatile boolean isGroup = false;
-    ;
     AtomicInteger total = new AtomicInteger(0);
     Map<String, IndexDictEntity> indexDicMap = new HashMap<>();
     Map<String, IndexGroupTemplateEntity> indexGroupMap = new HashMap<>();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DemandService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DemandService.java
new file mode 100644
index 0000000000..a5baf1a613
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DemandService.java
@@ -0,0 +1,20 @@
+package com.epmet.service;
+
+/**
+ * @Description 需求service
+ * @Author wangxianzhang
+ * @Date 2021/12/8 12:14 下午
+ * @Version 1.0
+ */
+public interface DemandService {
+
+    /**
+     * wangxianzhang
+     *
+     * 按日统计
+     *
+     * @param customerId 客户ID，可为空，为空计算所有
+     */
+    void statsVolunteerDemandServicesDaily(String customerId);
+    
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
index 06d2b580fc..e199d2f46c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
@@ -67,10 +67,7 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
     @Override
     public boolean haveSubCustomer(String customerId) {
         List<CustomerRelationEntity> list = baseDao.selectListByPids(customerId);
-        if (null == list || list.isEmpty()) {
-            return false;
-        }
-        return true;
+        return null != list && !list.isEmpty();
     }
 
     /**
@@ -86,4 +83,4 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
         }
         return baseDao.selectSubCustomer(customerId);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index 087ba8e2d2..0a4d543698 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -317,7 +317,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
             // 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数
             int communityClosedCount= NumConstant.ZERO;
             // 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
-            int streetClosedCount=NumConstant.ZERO;;
+            int streetClosedCount=NumConstant.ZERO;
             // 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
             int districtDeptClosedCount=NumConstant.ZERO;
             int gridSelfGovernProjectTotal=NumConstant.ZERO;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
index 72888c5420..1ed3f51ba8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
@@ -215,7 +215,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
                 //判断用户是否是党员，调用相成写的方法
                 //话题发布人是否是党员：1是党员0不是。 默认0
                 if (null != userIsPartyMap && null != userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId())) {
-                    mainDailyEntity.setCreateTopicUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE ? true : false);
+                    mainDailyEntity.setCreateTopicUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE);
                 } else {
                     mainDailyEntity.setCreateTopicUserIsParty(false);
                 }
@@ -232,7 +232,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
             logDailyEntity.setPids(gridInfoDTO.getPids());
             //判断用户是否是党员，调用相成写的方法
             if (null != userIsPartyMap && null != userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId())) {
-                logDailyEntity.setOperateUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE ? true : false);
+                logDailyEntity.setOperateUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE);
             } else {
                 logDailyEntity.setOperateUserIsParty(false);
             }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
index efd51f1f90..230238b288 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
@@ -210,6 +210,10 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         imgMap.values().forEach(imgList::addAll);
 
         //立案后会有 一个process 如果没有则说明是垃圾数据 如果有其他方式立项的项目则需要考虑下兼容
+        difficulties.removeIf(diff -> StringUtils.isBlank(diff.getLatestOperateDesc()));
+
+        screenDifficultyDataService.dataClean(param.getCustomerId(), difficulties, imgList);
+        log.info("【大屏数据抽取-难点赌点执行完毕】 客户Id{} 难点赌点数据{}", param.getCustomerId(), JSON.toJSONString(difficulties));
         difficulties.removeIf( diff -> StringUtils.isBlank(diff.getLatestOperateDesc()));
         imgList.forEach(item -> {
             item.setCustomerId(param.getCustomerId());
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
index 4f0cbb1896..02e4df412b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
@@ -462,7 +462,6 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService {
         int month = calendar.get(Calendar.MONTH) + NumConstant.ONE;
         date[NumConstant.ZERO] = String.valueOf(year);
         date[NumConstant.ONE] = String.valueOf(month);
-        ;
         if (NumConstant.TEN >= month) {
             date[NumConstant.ONE] = NumConstant.ZERO_STR + month;
         }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java
new file mode 100644
index 0000000000..baaa29c97b
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartDemandService.java
@@ -0,0 +1,15 @@
+package com.epmet.service.heart;
+
+import com.epmet.dto.heart.result.DemandServiceCountResultDTO;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+  *@Description 爱心互助，需求service
+  *@Author      wangxianzhang
+  *@Date        2021/12/8
+  */
+public interface HeartDemandService {
+    List<DemandServiceCountResultDTO> listDemandServeTimesPage(String customerId, Date endTime, int serviceCountPageNo, int serviceCountPageSize);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java
new file mode 100644
index 0000000000..b8e4414f60
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/HeartVolunteerService.java
@@ -0,0 +1,15 @@
+package com.epmet.service.heart;
+
+import com.epmet.entity.heart.VolunteerInfoEntity;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+  *@Description heart  志愿者service
+  *@Author      wangxianzhang
+  *@Date        2021/12/8
+  */
+public interface HeartVolunteerService {
+    List<VolunteerInfoEntity> listVolunteers(String customerId, Date endCreateTime);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java
new file mode 100644
index 0000000000..c33f426ad5
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartDemandServiceImpl.java
@@ -0,0 +1,40 @@
+package com.epmet.service.heart.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.heart.IcUserDemandServiceDao;
+import com.epmet.dto.heart.result.DemandServiceCountResultDTO;
+import com.epmet.service.heart.HeartDemandService;
+import com.github.pagehelper.ISelect;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description 爱心互助，需求service
+ * @Author wangxianzhang
+ * @Date 2021/12/8 12:33 下午
+ * @Version 1.0
+ */
+@Service
+@DataSource(DataSourceConstant.EPMET_HEART)
+public class HeartDemandServiceImpl implements HeartDemandService {
+    
+    @Autowired
+    private IcUserDemandServiceDao demandServiceDao;
+    
+    @Override
+    public List<DemandServiceCountResultDTO> listDemandServeTimesPage(String customerId, Date endTime, int serviceCountPageNo, int serviceCountPageSize) {
+        return PageHelper.startPage(serviceCountPageNo, serviceCountPageSize).doSelectPage(new ISelect() {
+            @Override
+            public void doSelect() {
+                demandServiceDao.listDemandServeTimes(customerId, endTime, "volunteer");
+            }
+        });
+    }
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java
new file mode 100644
index 0000000000..902a6a8713
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/heart/impl/HeartVolunteerServiceImpl.java
@@ -0,0 +1,38 @@
+package com.epmet.service.heart.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.heart.VolunteerInfoDao;
+import com.epmet.entity.heart.VolunteerInfoEntity;
+import com.epmet.service.heart.HeartVolunteerService;
+import com.github.pagehelper.ISelect;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description 描述
+ * @Author wangxianzhang
+ * @Date 2021/12/8 1:35 下午
+ * @Version 1.0
+ */
+@Service
+@DataSource(DataSourceConstant.EPMET_HEART)
+public class HeartVolunteerServiceImpl implements HeartVolunteerService {
+    
+    @Autowired
+    private VolunteerInfoDao volunteerInfoDao;
+    
+    @Override
+    public List<VolunteerInfoEntity> listVolunteers(String customerId, Date endCreateTime) {
+        LambdaQueryWrapper<VolunteerInfoEntity> query = new LambdaQueryWrapper<>();
+        query.eq(VolunteerInfoEntity::getCustomerId, customerId);
+        query.lt(VolunteerInfoEntity::getCreatedTime, endCreateTime);
+        return volunteerInfoDao.selectList(query);
+    }
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index 21a7c06860..82d1a4a0e0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -147,8 +147,8 @@ public class DataReportingServiceImpl implements DataReportingService {
 		if (StringUtils.isNotBlank(parentCustomer.getData())) {
 			epmetCodeMap = customerProjectCategoryDictService.getByCategoryCodeMap(parentCustomer.getData());
 		}
-		Map<String, CustomerProjectCategoryDictEntity> codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId());;
-		//项目ID不为空时，因为只有一条，可以直接处理
+		Map<String, CustomerProjectCategoryDictEntity> codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId());
+        //项目ID不为空时，因为只有一条，可以直接处理
 		Map<String, CustomerProjectCategoryDictEntity> finalEpmetCodeMap = epmetCodeMap;
 		if (CollectionUtils.isNotEmpty(formDTO.getProjectId())) {
 			list = projectList.stream().map(project -> {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java
new file mode 100644
index 0000000000..66cbf1058d
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DemandServiceImpl.java
@@ -0,0 +1,176 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.dto.heart.result.DemandServiceCountResultDTO;
+import com.epmet.entity.crm.CustomerEntity;
+import com.epmet.entity.heart.VolunteerInfoEntity;
+import com.epmet.entity.stats.FactVolunteerServiceDailyEntity;
+import com.epmet.service.DemandService;
+import com.epmet.service.crm.CustomerService;
+import com.epmet.service.heart.HeartDemandService;
+import com.epmet.service.heart.HeartVolunteerService;
+import com.epmet.service.stats.DemandStatsService;
+import com.epmet.service.user.UserService;
+import com.epmet.util.DimIdGenerator;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Description 需求service
+ * @Author wangxianzhang
+ * @Date 2021/12/8 12:14 下午
+ * @Version 1.0
+ */
+@Service
+public class DemandServiceImpl implements DemandService {
+
+    @Autowired
+    private HeartDemandService heartDemandService;
+
+    @Autowired
+    private HeartVolunteerService heartVolunteerService;
+
+    @Autowired
+    private UserService userService;
+    
+    @Autowired
+    private DemandStatsService demandStatsService;
+    
+    @Autowired
+    private CustomerService customerService;
+
+    @Override
+    public void statsVolunteerDemandServicesDaily(String customerId) {
+
+        Date now = new Date();
+        Date today = DateUtils.integrate(now, "yyyy-MM-dd");
+        Date yestoday = DateUtils.addDateDays(today, -1);
+        
+        if (StringUtils.isNotBlank(customerId)) {
+            // 只计算单个客户
+            clearOldDatas(Arrays.asList(customerId), yestoday);
+            statsVolunteerDemandServicesDaily4Customer(customerId, today, yestoday);
+        } else {
+            // 查询所有客户ID
+            List<String> customerIds = customerService.listValidCustomersByCreateTime(null, null).stream().map(c -> c.getId()).collect(Collectors.toList());
+            clearOldDatas(customerIds, yestoday);
+            customerIds.stream().forEach(cId -> {
+                statsVolunteerDemandServicesDaily4Customer(cId, today, yestoday);
+            });
+        }
+    }
+
+    /**
+     * 清理旧数据
+     * @param targetDate 要清理哪天的数据
+     * @param customerIds 要清理哪些客户的
+     */
+    private void clearOldDatas(List<String> customerIds, Date targetDate) {
+
+        String dateDimId = DimIdGenerator.getDateDimId(targetDate);
+
+        demandStatsService.clearVolunteerDemandServiceDailyStats(customerIds, dateDimId);
+
+    }
+
+    /**
+     * 统计单个客户的志愿者服务情况
+     * @param customerId 客户ID
+     * @param endTime 统计截止时间(<endTime)
+     */
+    private void statsVolunteerDemandServicesDaily4Customer(String customerId, Date endTime, Date belongTime) {
+        // 1.志愿者分流为党员志愿者&普通居民志愿者
+        Integer volunteerTotalCount = 0;
+        // 党员志愿者数量
+        Integer partymemberVolunteerCount = 0;
+        // 居民志愿者数量
+        Integer resiVolunteerCount = 0;
+
+        // 党员志愿者用户id列表
+        List<String> partymemberVolunteerUserIds = new ArrayList<>(16);
+
+        List<VolunteerInfoEntity> volunteers = heartVolunteerService.listVolunteers(customerId, endTime);
+
+        volunteerTotalCount = volunteers.size();
+
+        // 分片开始下标
+        int shardingStartIndex = 0;
+        // 分片大小(条数)
+        int shardingSize = 100;
+        
+        // 分片去确定党员身份，防止in条件过大
+        while (true) {
+            int realShardingSize = Math.min(shardingSize, volunteerTotalCount - shardingStartIndex);
+
+            if (realShardingSize <= 0) {
+                break;
+            }
+
+            int shardingEndIndex = shardingStartIndex + realShardingSize;
+            List<String> volunteerUserIds = volunteers.subList(shardingStartIndex, shardingEndIndex)
+                    .stream()
+                    .map((volunteerInfoEntity) -> volunteerInfoEntity.getUserId())
+                    .collect(Collectors.toList());
+
+            List<String> tempPartymemberUserIds = userService.filterUserIds(volunteerUserIds, EpmetRoleKeyConstant.PARTYMEMBER);
+
+            partymemberVolunteerUserIds.addAll(tempPartymemberUserIds);
+
+            shardingStartIndex = shardingEndIndex;
+        }
+
+        partymemberVolunteerCount = partymemberVolunteerUserIds.size();
+        resiVolunteerCount = volunteerTotalCount - partymemberVolunteerCount;
+
+        //2. 查询志愿者服务次数
+
+        // 总服务次数
+        int totalDemandServeTimes = 0;
+        // 党员服务次数
+        int partymemberDemandServeTimes = 0;
+        // 居民服务次数
+        int resiDemandServeTimes = 0;
+
+        int serviceCountPageNo = 0;
+        int serviceCountPageSize = 1000;
+        while (true) {
+
+            // 取出每一个服务者的服务次数
+            List<DemandServiceCountResultDTO> damendServeTimes = heartDemandService.listDemandServeTimesPage(customerId, endTime, serviceCountPageNo, serviceCountPageSize);
+
+            for (DemandServiceCountResultDTO damendServiceTimes : damendServeTimes) {
+                String serverId = damendServiceTimes.getServerId();
+                if (partymemberVolunteerUserIds.contains(serverId)) {
+                    partymemberDemandServeTimes += damendServiceTimes.getServeTimes();
+                } else {
+                    resiDemandServeTimes += damendServiceTimes.getServeTimes();
+                }
+            }
+
+            if (damendServeTimes.size() <= serviceCountPageSize) {
+                break;
+            }
+        }
+
+        totalDemandServeTimes = partymemberDemandServeTimes + resiDemandServeTimes;
+        
+        // 3.持久化
+        FactVolunteerServiceDailyEntity insert = new FactVolunteerServiceDailyEntity();
+        insert.setDateId(DimIdGenerator.getDateDimId(belongTime));
+        insert.setCustomerId(customerId);
+        insert.setMonthId(DimIdGenerator.getMonthDimId(belongTime));
+        insert.setPartyServiceTotal(partymemberDemandServeTimes);
+        insert.setServiceTotal(totalDemandServeTimes);
+        insert.setPartyTotal(partymemberVolunteerCount);
+        insert.setResiServiceTotal(resiDemandServeTimes);
+        insert.setResiTotal(resiVolunteerCount);
+        insert.setVolunteerTotal(volunteerTotalCount);
+
+        demandStatsService.addVolunteerServiceDaily(insert);
+    }
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
index bdc1999ff7..a3ccd6c5a1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
@@ -178,7 +178,7 @@ public class StatsUserServiceImpl implements StatsUserService {
             while (iterator.hasNext()) {
                 GmUploadEventFormDTO.DataList m = iterator.next();
                 AtomicReference<Boolean> bl = new AtomicReference<>(false);
-                StringBuffer gridPids = new StringBuffer("");
+                StringBuffer gridPids = new StringBuffer();
                 agencyList.forEach(ag -> {
                     if (m.getAgencyId().equals(ag.getId())) {
                         bl.set(true);
@@ -239,8 +239,8 @@ public class StatsUserServiceImpl implements StatsUserService {
             while (iterator.hasNext()) {
                 GmUploadDataFormDTO.DataList m = iterator.next();
                 AtomicReference<Boolean> bl = new AtomicReference<>(false);
-                StringBuffer pid = new StringBuffer("");
-                StringBuffer pids = new StringBuffer("");
+                StringBuffer pid = new StringBuffer();
+                StringBuffer pids = new StringBuffer();
                 agencyList.forEach(ag -> {
                     if (m.getAgencyId().equals(ag.getId())) {
                         bl.set(true);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
index bb160098e0..156b7294a9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
@@ -51,6 +51,7 @@ public interface CustomerAgencyService {
      */
     CustomerAgencyEntity getAgencyByDeptId(String deptId);
 
+
     /**
      * 将孔村、榆山、锦水3个街道的组织插入到gov-org库的customer_agency
      *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
index 64a5a0186d..3e06682b15 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
@@ -69,31 +69,6 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
         return customerAgencyDao.getRootAgencyInfo(customerId);
     }
 
-    /**
-     * 获取每个组织、每个网格下工作人员userId集合
-     *
-     * @param customerId
-     * @return com.epmet.dto.org.result.OrgStaffResultDTO
-     */
-    @Override
-    public List<OrgStaffDTO> queryOrgStaffIds(String customerId) {
-        List<OrgStaffDTO> resultList=new ArrayList<>();
-        List<CustomerAgencyEntity> list=customerAgencyDao.selectListByCustomerId(customerId);
-        for(CustomerAgencyEntity agencyEntity:list){
-            List<String> agencyStaffIds=customerAgencyDao.selectAgencyStaffIds(customerId,agencyEntity.getId());
-            if(!CollectionUtils.isEmpty(agencyStaffIds)){
-                OrgStaffDTO agencyStaffDTO=new OrgStaffDTO();
-                agencyStaffDTO.setOrgId(agencyEntity.getId());
-                agencyStaffDTO.setOrgType("agency");
-                agencyStaffDTO.setStaffIds(agencyStaffIds);
-                resultList.add(agencyStaffDTO);
-            }
-        }
-        List<OrgStaffDTO> gridStaffIds=customerAgencyDao.selectGridStaffIds(customerId);
-        resultList.addAll(gridStaffIds);
-        return resultList;
-    }
-
     @Override
     public List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId) {
         return customerAgencyDao.queryAgencyListByCustomerId(customerId);
@@ -121,6 +96,31 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
         return customerAgencyDao.selectByDeptId(deptId);
     }
 
+    /**
+     * 获取每个组织、每个网格下工作人员userId集合
+     *
+     * @param customerId
+     * @return com.epmet.dto.org.result.OrgStaffResultDTO
+     */
+    @Override
+    public List<OrgStaffDTO> queryOrgStaffIds(String customerId) {
+        List<OrgStaffDTO> resultList=new ArrayList<>();
+        List<CustomerAgencyEntity> list=customerAgencyDao.selectListByCustomerId(customerId);
+        for(CustomerAgencyEntity agencyEntity:list){
+            List<String> agencyStaffIds=customerAgencyDao.selectAgencyStaffIds(customerId,agencyEntity.getId());
+            if(!CollectionUtils.isEmpty(agencyStaffIds)){
+                OrgStaffDTO agencyStaffDTO=new OrgStaffDTO();
+                agencyStaffDTO.setOrgId(agencyEntity.getId());
+                agencyStaffDTO.setOrgType("agency");
+                agencyStaffDTO.setStaffIds(agencyStaffIds);
+                resultList.add(agencyStaffDTO);
+            }
+        }
+        List<OrgStaffDTO> gridStaffIds=customerAgencyDao.selectGridStaffIds(customerId);
+        resultList.addAll(gridStaffIds);
+        return resultList;
+    }
+
     /**
      * 将孔村、榆山、锦水3个街道的组织插入到gov-org库的customer_agency
      *
@@ -245,7 +245,7 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
      * @param parentCustomerEntity 在平阴客户里，网格所属组织信息
      * @author yinzuomei
      * @description 将3个街道的网格，插入到gov-org.customer_grid库
-     * @Date 2021/7/7 9:54 
+     * @Date 2021/7/7 9:54
      **/
     private void insertCustomerGrid(String customerId, String agencyId, CustomerAgencyEntity parentCustomerEntity) {
         List<ScreenCustomerGridEntity> gridEntityList = screenCustomerGridService.selectEntityByAgencyId(customerId, agencyId);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
index 7a8f1b3806..76376efd82 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
@@ -86,7 +86,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
      */
     @Override
     public List<CustomerStaffGridDTO> getCustomerStaffGridList(String customerId) {
-        return customerGridDao.getCustomerStaffGridList(customerId);
+        return baseDao.getCustomerStaffGridList(customerId);
     }
 
     /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DemandStatsService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DemandStatsService.java
new file mode 100644
index 0000000000..dec4ed26ef
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DemandStatsService.java
@@ -0,0 +1,18 @@
+package com.epmet.service.stats;
+
+import com.epmet.entity.stats.FactVolunteerServiceDailyEntity;
+
+import java.util.List;
+
+/**
+  *@Description 统计客户下的志愿者需求服务数据
+  *@Author      wangxianzhang
+  *@Date        2021/12/8
+  */
+public interface DemandStatsService {
+
+
+    void addVolunteerServiceDaily(FactVolunteerServiceDailyEntity entity);
+
+    void clearVolunteerDemandServiceDailyStats(List<String> customerIds, String dateDimId);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java
new file mode 100644
index 0000000000..54a8525877
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DemandStatsServiceImpl.java
@@ -0,0 +1,36 @@
+package com.epmet.service.stats.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.dao.stats.FactVolunteerServiceDailyDao;
+import com.epmet.entity.stats.FactVolunteerServiceDailyEntity;
+import com.epmet.service.stats.DemandStatsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description 描述
+ * @Author wangxianzhang
+ * @Date 2021/12/8 10:54 上午
+ * @Version 1.0
+ */
+@Service
+@DataSource(DataSourceConstant.STATS)
+public class DemandStatsServiceImpl implements DemandStatsService {
+    
+    @Autowired
+    private FactVolunteerServiceDailyDao factVolunteerServiceDailyDao;
+    
+    @Override
+    public void addVolunteerServiceDaily(FactVolunteerServiceDailyEntity entity) {
+        factVolunteerServiceDailyDao.insert(entity);
+    }
+
+    @Override
+    public void clearVolunteerDemandServiceDailyStats(List<String> customerIds, String dateDimId) {
+        factVolunteerServiceDailyDao.clearVolunteerDemandServiceDailyStats(customerIds, dateDimId);
+    }
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java
index 5bad47d7f0..250a54f690 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java
@@ -122,7 +122,7 @@ public class DimQuarterServiceImpl extends BaseServiceImpl<DimQuarterDao, DimQua
 
         Date now = new Date();
 
-        Date endQMonth = DateUtils.integrate(now, DateUtils.DATE_PATTERN_YYYYMM);;//初始化至当季
+        Date endQMonth = DateUtils.integrate(now, DateUtils.DATE_PATTERN_YYYYMM);//初始化至当季
         Date startQMonth;//从该季开始初始化，不包含该季
 
         if (latestDimEntity == null) {
@@ -199,4 +199,4 @@ public class DimQuarterServiceImpl extends BaseServiceImpl<DimQuarterDao, DimQua
         return yyyy.concat("年").concat(quarterName);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
index ffa464d4fa..1d0a500b0a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
@@ -146,4 +146,6 @@ public interface UserService {
     List<MidPatrolRecordResult> getPatrolRecordList(MidPatrolFormDTO formDTO);
 
     List<MidPatrolDetailResult> getPatrolDetailList(MidPatrolFormDTO formDTO);
+    
+    List<String> filterUserIds(List<String> userIds, String roleKey);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
index a8bf95d7f0..a2d56125a6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
@@ -1109,4 +1109,8 @@ public class UserServiceImpl implements UserService {
         return userDao.getPatrolDetailList(formDTO);
     }
 
+    @Override
+    public List<String> filterUserIds(List<String> userIds, String roleKey) {
+        return userDao.filterUserIds(userIds, roleKey);
+    }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java
index 08ca203821..01906d5bae 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java
@@ -159,10 +159,7 @@ public abstract class ScoreCalculator<T> {
      * @return
      */
     protected  <T> boolean validSourceArray(T[] sourceArray) {
-        if (sourceArray == null || sourceArray.length == 0) {
-            return false;
-        }
-        return true;
+        return sourceArray != null && sourceArray.length != 0;
     }
 
     /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.26__create_volunteer_service_daily.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.26__create_volunteer_service_daily.sql
new file mode 100644
index 0000000000..7eade2a679
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.26__create_volunteer_service_daily.sql
@@ -0,0 +1,21 @@
+CREATE TABLE epmet_data_statistical.`fact_volunteer_service_daily`
+(
+    `ID`                  varchar(64) NOT NULL COMMENT '主键',
+    `CUSTOMER_ID`         varchar(64) NOT NULL COMMENT '客户id',
+    `DATE_ID`             varchar(8)  NOT NULL COMMENT 'yyyyMMdd',
+    `MONTH_ID`            varchar(6)  NOT NULL COMMENT 'yyyyMM',
+    `VOLUNTEER_TOTAL`     int(11) NOT NULL COMMENT '截止到当前dateId，当前客户下，共有多少个爱心互助的志愿者',
+    `PARTY_TOTAL`         int(11) NOT NULL COMMENT '截止到当前dateId，当前客户下，XX个爱心互助志愿者中，党员有多少个',
+    `RESI_TOTAL`          int(11) NOT NULL COMMENT '截止到当前dateId，当前客户下，XX个爱心互助志愿者中，居民有多少个',
+    `SERVICE_TOTAL`       int(11) NOT NULL COMMENT '服务总次数',
+    `PARTY_SERVICE_TOTAL` int(11) NOT NULL COMMENT '党员服务总次数',
+    `RESI_SERVICE_TOTAL`  int(11) NOT NULL COMMENT '居民服务总次数',
+    `DEL_FLAG`            int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除',
+    `REVISION`            int(11) NOT NULL COMMENT '乐观锁',
+    `CREATED_BY`          varchar(32) NOT NULL COMMENT '创建人',
+    `CREATED_TIME`        datetime    NOT NULL COMMENT '创建时间',
+    `UPDATED_BY`          varchar(32) NOT NULL COMMENT '更新人',
+    `UPDATED_TIME`        datetime    NOT NULL COMMENT '更新时间',
+    PRIMARY KEY (`ID`),
+    UNIQUE KEY `uni_vsd` (`CUSTOMER_ID`,`DATE_ID`,`DEL_FLAG`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='志愿者服务情况统计'
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql
index 541d0d7307..701305aa6d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql
@@ -1,2 +1,2 @@
-/*ALTER TABLE dim_agency ADD COLUMN AGENCY_DIM_TYPE VARCHAR(10) NOT NULL COMMENT '机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等';*/
+#ALTER TABLE dim_agency ADD COLUMN AGENCY_DIM_TYPE VARCHAR(10) NOT NULL COMMENT '机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等';
 select 1;
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index ff340e097c..f111a535eb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
@@ -1069,7 +1069,7 @@
     <select id="selectAgencyClosedProjectStaticDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
             a.ID AS AGENCY_ID,
-            a.`LEVEL`,
+            b.`LEVEL`,
             COUNT( b.PROJECT_ID ) AS "sum",
             SUM(IF( b.ORG_TYPE = 'department', 1, 0 )) AS "count"
         FROM
@@ -1078,7 +1078,8 @@
             SELECT
                     PROJECT_ID,
                     main.PIDS,
-                    ORG_TYPE
+                    ORG_TYPE,
+                    da.`LEVEL`
             FROM
                     fact_origin_project_main_daily main
             INNER JOIN	fact_origin_project_log_daily log ON main.ID = log.PROJECT_ID
@@ -1086,17 +1087,16 @@
                 AND (ORG_TYPE = 'agency' OR ORG_TYPE = 'department')
                 AND log.DEL_FLAG = '0'
                 AND log.CUSTOMER_ID = #{customerId}
+            INNER JOIN dim_agency da ON log.AGENCY_ID = da.ID AND da.CUSTOMER_ID = #{customerId}
             WHERE
                     main.CUSTOMER_ID = #{customerId}
                     AND main.DATE_ID &lt;= #{dateId}
-
-
             ) b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
         WHERE
             a.CUSTOMER_ID = #{customerId}
         GROUP BY
             a.ID,
-            a.`LEVEL`
+            b.`LEVEL`
     </select>
 
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
index 75ec0bb250..f97f5b4946 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
@@ -429,32 +429,33 @@
         (SELECT DEPT_ID AS orgId FROM screen_customer_dept WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId})
     </select>
 
-    <!-- 查询顶级组织ID -->
-    <select id="selectTopAgency" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
+    <!-- 查询客户下所有的组织的上级组织 -->
+    <select id="selectAgencyIdAndParentId" resultType="com.epmet.dto.indexcal.AgencyAndParentResultDTO">
         SELECT
             AGENCY_ID,
-            PID,
-            PIDS
+            PID
         FROM
             screen_customer_agency
         WHERE
-            DEL_FLAG = '0'
-          AND PID = '0'
+            DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}
     </select>
 
-    <!-- 查询客户下所有的组织的上级组织 -->
-    <select id="selectAgencyIdAndParentId" resultType="com.epmet.dto.indexcal.AgencyAndParentResultDTO">
+    <!-- 查询顶级组织ID -->
+    <select id="selectTopAgency" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
         SELECT
             AGENCY_ID,
-            PID
+            PID,
+            PIDS
         FROM
             screen_customer_agency
         WHERE
-            DEL_FLAG = 0
+            DEL_FLAG = '0'
+          AND PID = '0'
           AND CUSTOMER_ID = #{customerId}
     </select>
 
+
     <select id="selectRootAgency" parameterType="java.lang.String" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
         SELECT
             *
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml
new file mode 100644
index 0000000000..ddebabef66
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/IcUserDemandServiceDao.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.heart.IcUserDemandServiceDao">
+
+    <resultMap type="com.epmet.entity.heart.IcUserDemandServiceEntity" id="icUserDemandServiceMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="demandRecId" column="DEMAND_REC_ID"/>
+        <result property="serviceType" column="SERVICE_TYPE"/>
+        <result property="serverId" column="SERVER_ID"/>
+        <result property="serviceStartTime" column="SERVICE_START_TIME"/>
+        <result property="serviceEndTime" column="SERVICE_END_TIME"/>
+        <result property="finishDesc" column="FINISH_DESC"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    
+    <select id="listDemandServeTimes" resultType="com.epmet.dto.heart.result.DemandServiceCountResultDTO">
+        select service.SERVER_ID, SERVICE_TYPE, count(1) as SERVE_TIMES
+        from ic_user_demand_rec damend
+                 inner join ic_user_demand_service service on (damend.ID = service.DEMAND_REC_ID and service.DEL_FLAG = 0)
+        where damend.DEL_FLAG = 0
+          and damend.STATUS = 'finished'
+          and damend.CUSTOMER_ID = #{customerId}
+          and service.SERVICE_END_TIME <![CDATA[<]]> #{endTime}
+          and service.SERVICE_TYPE = #{serviceType}
+        group by service.SERVER_ID, SERVICE_TYPE
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/VolunteerInfoDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/VolunteerInfoDao.xml
new file mode 100644
index 0000000000..a426712a22
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/heart/VolunteerInfoDao.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.VolunteerInfoDao">
+
+    <resultMap type="com.epmet.entity.heart.VolunteerInfoEntity" id="volunteerInfoMap">
+        <result property="id" column="ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="volunteerIntroduce" column="VOLUNTEER_INTRODUCE"/>
+        <result property="volunteerSignature" column="VOLUNTEER_SIGNATURE"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactVolunteerServiceDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactVolunteerServiceDailyDao.xml
new file mode 100644
index 0000000000..59dfd96c12
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactVolunteerServiceDailyDao.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.FactVolunteerServiceDailyDao">
+
+    <resultMap type="com.epmet.entity.stats.FactVolunteerServiceDailyEntity" id="factVolunteerServiceDailyMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="volunteerTotal" column="VOLUNTEER_TOTAL"/>
+        <result property="partyTotal" column="PARTY_TOTAL"/>
+        <result property="resiTotal" column="RESI_TOTAL"/>
+        <result property="serviceTotal" column="SERVICE_TOTAL"/>
+        <result property="partyServiceTotal" column="PARTY_SERVICE_TOTAL"/>
+        <result property="resiServiceTotal" column="RESI_SERVICE_TOTAL"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    
+    <delete id="clearVolunteerDemandServiceDailyStats">
+        delete
+        from fact_volunteer_service_daily
+        where DATE_ID=#{dateDimId}
+          and CUSTOMER_ID in
+        <foreach collection="customerIds" open="(" separator="," close=")" item="customerId">
+            #{customerId}
+        </foreach>
+
+    </delete>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
index 4715f23c2a..6542440fb8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
@@ -1052,5 +1052,18 @@
             order by created_time
             LIMIT #{offset},#{pageSize}
     </select>
+    
+    <!-- 从UserId列表中过滤符合条件的UserId列表出来 -->
+    <select id="filterUserIds" resultType="java.lang.String">
+        select distinct ur.USER_ID
+        from user_role ur
+                 inner join epmet_role er on (ur.ROLE_ID = er.ID)
+        where ur.DEL_FLAG = 0
+          and ur.USER_ID in 
+          <foreach collection="userIds" open="(" item="userId" separator="," close=")">
+            #{userId}
+          </foreach>
+            and er.ROLE_KEY = #{roleKey}
+    </select>
 
 </mapper>
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
index 0483a1d3dc..4afee3fa08 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
@@ -3,6 +3,16 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.CostDayFormDTO;
+import com.epmet.dto.form.ExternalAppAuthFormDTO;
+import com.epmet.dto.form.GetJwtAccessTokenFormDTO;
+import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.result.AppIdInfoResultDTO;
+import com.epmet.dto.form.WorkMinuteFormDTO;
+import com.epmet.dto.result.CostDayResultDTO;
+import com.epmet.dto.result.AppIdInfoResultDTO;
+import com.epmet.dto.result.ExternalAppAuthResultDTO;
+import com.epmet.dto.result.WorkDayResultDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
index fc0d7555e3..a8c770f8e9 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java
@@ -69,7 +69,7 @@ public class IcPartyActivityDTO implements Serializable {
      */
     @NotBlank(message = "服务事项不能为空",groups = AddGroup.class)
 	private String serviceMatter;
-
+    private String serviceMatterName;
     /**
      * 活动标题
      */
@@ -97,7 +97,7 @@ public class IcPartyActivityDTO implements Serializable {
      * 活动时间
      */
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm")
 	private Date activityTime;
 
     /**
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
index 40ac5563ac..1f108568e1 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -16,6 +17,7 @@ import java.util.Date;
 @Data
 public class PartyActivityFormDTO implements Serializable {
     private static final long serialVersionUID = -2510068555703677L;
+    @NotBlank(message = "组织Id不能为空" )
     private String agencyId;
     private String unitId;
     private String title;
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java
new file mode 100644
index 0000000000..2e564db7cc
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+
+/**
+ * 服务措施分析-柱状图入参
+ */
+@Data
+public class CategoryAnalysisFormDTO implements Serializable {
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "先选择组织或网格", groups = AddUserShowGroup.class)
+    private String orgId;
+
+    @NotBlank(message = "组织:agency,网格：grid", groups = AddUserShowGroup.class)
+    private String orgType;
+    @NotBlank(message = "起止日期不能为空,格式yyyy-MM-dd", groups = AddUserShowGroup.class)
+    private String startDateId;
+    @NotBlank(message = "截止日期不能为空,格式yyyy-MM-dd", groups = AddUserShowGroup.class)
+    private String endDateId;
+
+    @NotBlank(message = "先选择组织或网格", groups = AddUserInternalGroup.class)
+    private String cusotmerId;
+
+
+    /**
+     * orgType=agency时pid拼接上orgId
+     */
+    private String gridPids;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java
new file mode 100644
index 0000000000..893a383708
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandResearchAnalysisFormDTO.java
@@ -0,0 +1,46 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 需求研判分析 入参DTO
+ */
+@Data
+public class DemandResearchAnalysisFormDTO implements Serializable {
+    private static final long serialVersionUID = 3528172570410679765L;
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "firstCategoryCode不能为空",groups = AddUserInternalGroup.class)
+    private String firstCategoryCode;
+
+    //@NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class)
+    private String icResiUserId;
+
+    private List<String> epmetUserIdList;
+
+
+    @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    /**
+     * 个人档案：personal-data
+     * 服务措施分析：demand-analysis
+     */
+    @NotBlank(message = "queryOrigin不能为空：个人档案：personal-data;服务措施分析：demand-analysis",groups = AddUserInternalGroup.class)
+    private String queryOrigin;
+
+    /**
+     * 当前查看的需求详情的需求id
+     */
+    private String demandRecId;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java
index f29e088293..ea0f862854 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java
@@ -16,8 +16,8 @@ public class IcResiUserDemandFromDTO implements Serializable {
     /**
      * 居民信息录入的居民的id
      */
-    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
-    private String userId;
+    @NotBlank(message = "icResiUserId不能为空", groups = AddUserInternalGroup.class)
+    private String icResiUserId;
 
     /**
      * icresiuser/persondata接口返参中有此值
@@ -41,4 +41,10 @@ public class IcResiUserDemandFromDTO implements Serializable {
      * epmetUserIdList+userId
      */
     private List<String> userIds;
+
+
+    /**
+     * 当前查看的需求详情的需求id 可空
+     */
+    private String demandRecId;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java
new file mode 100644
index 0000000000..464d1062a8
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java
@@ -0,0 +1,52 @@
+package com.epmet.dto.form.demand;
+
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 数据分析-服务措施分析-分页查询接口入参
+ */
+@Data
+public class PageListAnalysisFormDTO implements Serializable {
+    private static final long serialVersionUID = 4993949289966075260L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotNull(message = "页码不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+
+    @NotNull(message = "每页数量不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+
+    @NotBlank(message = "先选择组织或网格不能为空", groups = AddUserShowGroup.class)
+    private String orgId;
+
+    @NotBlank(message = "orgType=grid或者agency,不能为空", groups = AddUserInternalGroup.class)
+    private String orgType;
+
+    @NotBlank(message = "分类编码不能为空", groups = AddUserInternalGroup.class)
+    private String categoryCode;
+    @NotBlank(message = "上报时间起始日期不能为空,格式yyyy-MM-dd", groups = AddUserInternalGroup.class)
+    private String startDateId;
+    @NotBlank(message = "上报时间截止日期不能为空,格式yyyy-MM-dd", groups = AddUserInternalGroup.class)
+    private String endDateId;
+
+    @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+    /**
+     * orgType=agency时pid拼接上orgId
+     */
+    private String gridPids;
+
+    private Boolean pageFlag;
+
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java
new file mode 100644
index 0000000000..c8893697a8
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.form.resi;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description
+ * @Author wangxianzhang
+ * @Date 2021/12/10 6:10 下午
+ * @Version 1.0
+ */
+@Data
+public class VolunteerCommonFormDTO {
+
+    public interface VolunteerPage {
+    }
+
+    @NotBlank(message = "客户ID不能为空", groups = {VolunteerPage.class})
+    private String customerId;
+
+    private Integer pageNo = 0;
+
+    private Integer pageSize = 20;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ActivityStatisticsDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ActivityStatisticsDTO.java
new file mode 100644
index 0000000000..a941c3eb8f
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ActivityStatisticsDTO.java
@@ -0,0 +1,16 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/9 16:05
+ */
+@Data
+public class ActivityStatisticsDTO implements Serializable {
+    private String unitCount;
+    private String activityCount;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitDistributionResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitDistributionResultDTO.java
new file mode 100644
index 0000000000..e8ef54c842
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitDistributionResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/9 10:05
+ */
+@Data
+public class PartyUnitDistributionResultDTO implements Serializable {
+    private static final long serialVersionUID = -4066938451623510159L;
+    private String id;
+    private String name;
+    private String type;
+    private String longitude;
+    private String latitude;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDTO.java
new file mode 100644
index 0000000000..fc7a8eaad8
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.result.demand;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CategoryAnalysisDTO implements Serializable {
+    private static final long serialVersionUID = 3007202497989446585L;
+    private String categoryCode;
+    private String categoryName;
+    private Integer total;
+    private List<CategoryAnalysisDetail> detail;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDetail.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDetail.java
new file mode 100644
index 0000000000..c082d11074
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisDetail.java
@@ -0,0 +1,32 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CategoryAnalysisDetail implements Serializable {
+    private static final long serialVersionUID = -4606305611297470078L;
+    /**
+     * 区域党建单位：party_unit；
+     * 社会组织：social_org；
+     * 社区自组织：community_org；
+     * 志愿者：volunteer；
+     * 未完成：unfinished
+     */
+    private String legendCode;
+
+    /**
+     * 服务方类型名称
+     */
+    private String legendName;
+
+    /**
+     * 服务方的个数
+     */
+    private Integer totalService;
+    /**
+     *  需求个数
+     */
+    private Integer serviceDemandTotal;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisResDTO.java
new file mode 100644
index 0000000000..1b39a2befd
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryAnalysisResDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.dto.result.demand;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CategoryAnalysisResDTO implements Serializable {
+    private static final long serialVersionUID = -3112952115061180189L;
+    private List<LegendDTO> legend;
+    private List<CategoryAnalysisDTO> categoryList;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryDetailDTO.java
new file mode 100644
index 0000000000..9e2802362a
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/CategoryDetailDTO.java
@@ -0,0 +1,11 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CategoryDetailDTO extends  CategoryAnalysisDetail implements Serializable {
+    private static final long serialVersionUID = 4459219163308113201L;
+    private String categoryCode;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDataDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDataDTO.java
new file mode 100644
index 0000000000..f5ca265feb
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDataDTO.java
@@ -0,0 +1,13 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DemandDataDTO implements Serializable {
+    private String firstCategoryCode;
+    private String firstCategoryName;
+    private List<IcResiUserReportDemandRes> demandList;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java
new file mode 100644
index 0000000000..15f02110b4
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecExcelResultDTO.java
@@ -0,0 +1,52 @@
+package com.epmet.dto.result.demand;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class DemandRecExcelResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1110606022410166621L;
+
+    @Excel(name = "状态", width = 15)
+    private String statusName;
+
+    @Excel(name = "所属网格", width = 40)
+    private String gridName;
+
+    @Excel(name = "需求类型", width = 40)
+    private String categoryName;
+
+    @Excel(name = "需求内容", width = 40)
+    private String content;
+
+    @Excel(name = "上报类型", width = 40)
+    private String reportTypeName;
+
+    @Excel(name = "上报人", width = 20)
+    private String reportUserName;
+
+    @Excel(name = "上报时间", width = 25,format ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date reportTime;
+
+    @Excel(name = "需求人", width = 20)
+    private String demandUserName;
+
+    /**
+     * 尹作梅(志愿者)
+     * XXX(社会组织)
+     * XXX(社区自组织)
+     * XXX(区域化党建单位)
+     */
+    @Excel(name = "服务方", width = 15)
+    private String serviceShowName;
+
+    @Excel(name = "服务时间", width = 25,format ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date wantServiceTime;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
index feb5c70b84..e7b673d22f 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
@@ -88,6 +88,10 @@ public class DemandRecResultDTO implements Serializable {
      * XXX(区域化党建单位)
      */
     private String serviceShowName;
+    /**
+     * 只要有服务方就显示
+     */
+    private Boolean serviceShowFlag;
     /**
      * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
      */
@@ -114,4 +118,7 @@ public class DemandRecResultDTO implements Serializable {
      * 完成情况
      */
     private String finishDesc;
+
+    private String icResiUserId;
+    private String epmetUserId;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java
new file mode 100644
index 0000000000..4828385812
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandResearchAnalysisResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 数据分析-个人档案-需求详情，研判分析
+ */
+@Data
+public class DemandResearchAnalysisResultDTO extends  HouseMemResDTO implements Serializable {
+    private static final long serialVersionUID = -1024304149893118204L;
+
+    private List<DemandDataDTO> demandData;
+    /**
+     * 入参中给的，再返回去
+     */
+    private List<String> epmetUserIdList;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java
new file mode 100644
index 0000000000..f8126473b5
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/HouseMemResDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.result.demand;
+
+import com.epmet.dto.result.HouseUserDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 数据分析-个人档案-需求详情，研判分析
+ * 案件居民、家属
+ */
+@Data
+public class HouseMemResDTO implements Serializable {
+    /**
+     * 居民信息及家属列表
+     */
+    private String icResiUserId;
+    private String icUserName;
+    private String houseId;
+    private List<HouseUserDTO> houseUserList;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java
index e4792920b3..19757a671c 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java
@@ -26,8 +26,11 @@ public class IcResiUserReportDemandRes implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date wantServiceTime;
 
-    @JsonIgnore
+    //@JsonIgnore
     private String status;
 
     private String statusName;
+
+    private String firstCategoryCode;
+    private String firstCategoryName;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/LegendDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/LegendDTO.java
new file mode 100644
index 0000000000..e1f6c9b282
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/LegendDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.result.demand;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 服务措施分析-柱状图
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LegendDTO implements Serializable {
+    private static final long serialVersionUID = 7205666632591639499L;
+    /**
+     * 区域党建单位：party_unit；
+     * 社会组织：social_org；
+     * 社区自组织：community_org；
+     * 志愿者：volunteer；
+     * 未完成：unfinished
+     */
+    private String legendCode;
+    private String legendName;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/PageVolunteerInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/PageVolunteerInfoResultDTO.java
new file mode 100644
index 0000000000..d23f2023da
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/PageVolunteerInfoResultDTO.java
@@ -0,0 +1,14 @@
+package com.epmet.dto.result.resi;
+
+import lombok.Data;
+
+/**
+ * @Description 志愿者信息分页查询结果
+ * @Author wangxianzhang
+ * @Date 2021/12/10 6:17 下午
+ * @Version 1.0
+ */
+@Data
+public class PageVolunteerInfoResultDTO {
+    private String userId;
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
index 7a4a6c8ad5..4bad8f25d7 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
@@ -6,6 +6,8 @@ import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
+import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
+import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -56,4 +58,12 @@ public interface EpmetHeartOpenFeignClient {
 
     @PostMapping("/heart/icresidemanddict/demangnames")
     Result<String> queryDemandNames(@RequestBody UserDemandNameQueryFormDTO formDTO);
+
+    /**
+     * 分页查询志愿者列表
+     * @param input
+     * @return
+     */
+    @PostMapping("/heart/resi/volunteer/page")
+    Result<List<PageVolunteerInfoResultDTO>> queryVolunteerPage(@RequestBody VolunteerCommonFormDTO input);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
index e0e140b02e..27c2c9bdc8 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
@@ -7,6 +7,8 @@ import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
+import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
+import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
 
 import java.util.List;
@@ -53,4 +55,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result<String> queryDemandNames(UserDemandNameQueryFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryDemandNames", formDTO);
     }
+
+    @Override
+    public Result<List<PageVolunteerInfoResultDTO>> queryVolunteerPage(VolunteerCommonFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryVolunteerPage", input);
+    }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java
index c28768b30f..85168b8a32 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java
@@ -50,4 +50,12 @@ public interface UserDemandConstant {
     String SOCIAL_ORG="social_org";
     String COMMUNITY_ORG="community_org";
     String PARTY_UNIT="party_unit";
+
+
+    /**
+     * 个人档案：personal-data
+     * 服务措施分析：demand-analysis
+     */
+    String PERSONAL_DATA="personal-data";
+    String DEMAND_ANALYSIS="demand-analysis";
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
index a17609835d..5071fd8710 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
@@ -29,6 +29,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.excel.IcPartyActivityExcel;
 import com.epmet.service.IcPartyActivityService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -117,4 +118,24 @@ public class IcPartyActivityController {
     public Result importData(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws IOException {
         return icPartyActivityService.importData(tokenDto, response, file);
     }
+
+    /**
+     * @Description 联建活动分类统计
+     * @Param formDTO
+     * @Return {@link Result< List< OptionDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 16:20
+     */
+    @PostMapping("statistics")
+    public Result<List<OptionDTO>> statistics(@RequestBody PartyActivityFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<OptionDTO>>().ok(icPartyActivityService.statistics(formDTO));
+    }
+
+    @PostMapping("activitylist")
+    public Result<PageData<IcPartyActivityDTO>> activityList(@LoginUser TokenDto tokenDto, @RequestBody PartyActivityFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        PageData<IcPartyActivityDTO> page = icPartyActivityService.getActivityList(tokenDto, formDTO);
+        return new Result<PageData<IcPartyActivityDTO>>().ok(page);
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
index 90c500b87d..27f193b978 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
@@ -20,6 +20,7 @@ package com.epmet.controller;
 import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -29,8 +30,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
+import com.epmet.dto.result.PartyUnitDistributionResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.excel.IcPartyUnitExcel;
 import com.epmet.service.IcPartyUnitService;
@@ -152,6 +155,32 @@ public class IcPartyUnitController {
         return icPartyUnitService.importData(tokenDto, response, file);
     }
 
+    /**
+     * @Description 按类型统计单位数量
+     * @Param dto
+     * @Return {@link Result< List< OptionDataResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/8 14:52
+     */
+    @PostMapping("typestatistics")
+    public Result<List<OptionDataResultDTO>> typeStatistics(@RequestBody PartyActivityFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<OptionDataResultDTO>>().ok(icPartyUnitService.typeStatistics(formDTO));
+    }
+
+    /**
+     * @Description 联建单位分布
+     * @Param formDTO
+     * @Return {@link Result< List< PartyUnitDistributionResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 10:11
+     */
+    @PostMapping("distribution")
+    public Result<List<PartyUnitDistributionResultDTO>> distribution(@RequestBody PartyActivityFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<PartyUnitDistributionResultDTO>>().ok(icPartyUnitService.distribution(formDTO));
+    }
+
 
     /**
      * 计算区域化党建单位的群众满意度
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java
index 0d5567ad63..06c991b31c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java
@@ -21,12 +21,14 @@ import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserDemandConstant;
 import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.demand.*;
+import com.epmet.dto.result.demand.*;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
 import com.epmet.dto.result.demand.FinishResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
@@ -35,11 +37,13 @@ import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 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.servlet.http.HttpServletResponse;
 import java.util.List;
 
 
@@ -225,7 +229,64 @@ public class IcUserDemandRecController {
     }
 
 
+    /**
+     *  数据分析-个人档案-需求详情，研判分析
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("demand-research-analysis")
+    public Result<DemandResearchAnalysisResultDTO> queryDemandResearchAnalysis(@LoginUser TokenDto tokenDto,@RequestBody DemandResearchAnalysisFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO, DemandResearchAnalysisFormDTO.AddUserInternalGroup.class);
+        return new Result<DemandResearchAnalysisResultDTO>().ok(icUserDemandRecService.queryDemandResearchAnalysis(formDTO));
+    }
+
+    /**
+     * 数分析-服务措施分析-分页查询
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("pagelist-analysis")
+    public Result<PageData<DemandRecResultDTO>> pageListAnalysis(@LoginUser TokenDto tokenDto,@RequestBody PageListAnalysisFormDTO formDTO){
+        formDTO.setPageFlag(true);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,PageListAnalysisFormDTO.AddUserShowGroup.class,PageListAnalysisFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<DemandRecResultDTO>>().ok(icUserDemandRecService.pageListAnalysis(formDTO));
+    }
 
+    /**
+     * 数据分析-服务措施分析-导出
+     * @param response
+     * @param tokenDto
+     * @param formDTO
+     * @throws Exception
+     */
+    @PostMapping("analysis-export")
+    public Result analysisExport(HttpServletResponse response,@LoginUser TokenDto tokenDto, @RequestBody PageListAnalysisFormDTO formDTO)throws Exception {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setPageFlag(false);
+        PageData<DemandRecResultDTO> res=icUserDemandRecService.pageListAnalysis(formDTO);
+        if (!CollectionUtils.isEmpty(res.getList())) {
+            ExcelUtils.exportExcelToTarget(response, null, res.getList(), DemandRecExcelResultDTO.class);
+            return new Result();
+        }
+        return new Result();
+    }
+
+    /**
+     * 数据分析-服务措施分析-柱状图
+     *
+     * @return
+     */
+    @PostMapping("category-analysis")
+    public Result<CategoryAnalysisResDTO> categoryAnalysis(@LoginUser TokenDto tokenDto,@RequestBody  CategoryAnalysisFormDTO formDTO){
+        formDTO.setCusotmerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,CategoryAnalysisFormDTO.AddUserShowGroup.class,CategoryAnalysisFormDTO.AddUserInternalGroup.class);
+        return new Result<CategoryAnalysisResDTO>().ok(icUserDemandRecService.categoryAnalysis(formDTO));
+    }
 
 
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
index e144e9c11f..e1d18e5536 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java
@@ -26,7 +26,9 @@ import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
+import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
 import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
 import com.epmet.service.VolunteerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -125,4 +127,21 @@ public class ResiVolunteerController {
     public Result<List<OptionDTO>> queryListVolunteer(@LoginUser TokenDto tokenDto,@RequestBody ServiceQueryFormDTO formDTO){
         return new Result<List<OptionDTO>>().ok(volunteerInfoService.queryListVolunteer(tokenDto.getCustomerId(),formDTO.getServiceName()));
     }
+
+    /**
+     * 分页查询志愿者列表
+     * @param input
+     * @return
+     */
+    @PostMapping("page")
+    public Result<List<PageVolunteerInfoResultDTO>> queryVolunteerPage(@RequestBody VolunteerCommonFormDTO input) {
+        
+        ValidatorUtils.validateEntity(input, VolunteerCommonFormDTO.VolunteerPage.class);
+        
+        Integer pageNo = input.getPageNo();
+        Integer pageSize = input.getPageSize();
+        String customerId = input.getCustomerId();
+        List<PageVolunteerInfoResultDTO> l = volunteerInfoService.queryVolunteerPage(customerId, pageNo, pageSize);
+        return new Result<List<PageVolunteerInfoResultDTO>>().ok(l);
+    }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java
index c596572fee..bb7e41c2ed 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java
@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.PartyActivityFormDTO;
+import com.epmet.dto.result.ActivityStatisticsDTO;
 import com.epmet.entity.IcPartyActivityEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -29,5 +31,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcPartyActivityDao extends BaseDao<IcPartyActivityEntity> {
+
+    /**
+     * @Description 联建活动统计
+     * @Param formDTO
+     * @Return {@link ActivityStatisticsDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 16:06
+     */
+    ActivityStatisticsDTO getStatistics(PartyActivityFormDTO formDTO);
 	
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
index 4efaff7d84..faddda7644 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
+import com.epmet.dto.result.PartyUnitDistributionResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -45,5 +47,23 @@ public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
                                          @Param("unitName") String unitName,
                                          @Param("customerId")String customerId);
 
+    /**
+     * 单位分类统计
+     * @Param agencyId
+     * @Return {@link java.util.List<com.epmet.commons.tools.dto.result.OptionDataResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/8 15:25
+     */
+    List<OptionDataResultDTO> getTypeStatistics(@Param("agencyId")String agencyId);
+
+    /**
+     * @Description 联建单位分布
+     * @Param agencyId
+     * @Return {@link List< PartyUnitDistributionResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 14:24
+     */
+    List<PartyUnitDistributionResultDTO> getDistribution(@Param("agencyId")String agencyId);
+
     int updateSatisfaction(@Param("partyUnitId") String serverId, @Param("satisfaction") BigDecimal satisfaction);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
index 3089b64be9..6c36e11618 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
@@ -19,7 +19,9 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.demand.IcResiUserDemandFromDTO;
+import com.epmet.dto.form.demand.PageListAnalysisFormDTO;
 import com.epmet.dto.form.demand.UserDemandPageFormDTO;
+import com.epmet.dto.result.demand.*;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
 import com.epmet.dto.result.demand.ServiceStatDTO;
@@ -58,5 +60,30 @@ public interface IcUserDemandRecDao extends BaseDao<IcUserDemandRecEntity> {
      */
     DemandRecResultDTO selectDemandRecDetail(@Param("customerId") String customerId, @Param("demandRecId") String demandRecId);
 
+    /**
+     * 数分析-服务措施分析-分页查询
+     *
+     * @param formDTO
+     * @return
+     */
+    List<DemandRecResultDTO> pageListAnalysis(PageListAnalysisFormDTO formDTO);
+
+
+    List<CategoryAnalysisDetail> selectDetail(@Param("categoryCode") String categoryCode,
+                                              @Param("orgType") String orgType,
+                                              @Param("orgId") String orgId,
+                                              @Param("gridPids") String gridPids,
+                                              @Param("customerId") String customerId,
+                                              @Param("startDateId") String startDateId,
+                                              @Param("endDateId") String endDateId);
+
+    List<CategoryAnalysisDTO> selectListCategoryAnalysisDTO(@Param("firstCategoryList") List<OptionDTO> firstCategoryList,
+                                                            @Param("customerId") String customerId,
+                                                            @Param("orgId") String orgId,
+                                                            @Param("orgType") String orgType,
+                                                            @Param("gridPids") String gridPids,
+                                                            @Param("startDateId") String startDateId,
+                                                            @Param("endDateId") String endDateId);
+
     List<ServiceStatDTO> selectGroupByPartyUnit(@Param("customerId") String customerId, @Param("partyUnitId") String partyUnitId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java
index dc0ca8b8a9..c3931bbd0b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyActivityEntity;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -98,4 +99,22 @@ public interface IcPartyActivityService extends BaseService<IcPartyActivityEntit
      * @Date 2021/11/29 11:01
      */
     Result importData(TokenDto tokenDto, HttpServletResponse response, MultipartFile file) throws IOException;
+
+    /**
+     * 联建活动统计
+     * @Param formDTO
+     * @Return {@link List< OptionDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 14:55
+     */
+    List<OptionDTO> statistics(PartyActivityFormDTO formDTO);
+
+    /**
+     * 联建活动统计列表
+     * @Param formDTO
+     * @Return {@link PageData< IcPartyActivityDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 16:24
+     */
+    PageData<IcPartyActivityDTO> getActivityList(TokenDto tokenDto, PartyActivityFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
index b303cab184..490e19bee6 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
@@ -18,13 +18,16 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
+import com.epmet.dto.result.PartyUnitDistributionResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import org.springframework.web.multipart.MultipartFile;
@@ -122,6 +125,24 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
      */
     Result importData(TokenDto tokenDto, HttpServletResponse response, MultipartFile file) throws IOException;
 
+    /**
+     * @Description 按类型统计单位数量
+     * @Param formDTO
+     * @Return {@link List< OptionDataResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/8 14:56
+     */
+    List<OptionDataResultDTO> typeStatistics(PartyActivityFormDTO formDTO);
+
+    /**
+     * 联建单位分布
+     * @Param formDTO
+     * @Return {@link List< PartyUnitDistributionResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 10:10
+     */
+    List<PartyUnitDistributionResultDTO> distribution(PartyActivityFormDTO formDTO);
+
     /**
      * 计算区域化党建单位的群众满意度
      * @param formDTO
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
index 87ffcaa67f..d17b6b3bfc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
@@ -21,7 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.demand.*;
+import com.epmet.dto.result.demand.CategoryAnalysisResDTO;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.DemandResearchAnalysisResultDTO;
 import com.epmet.dto.result.demand.FinishResultDTO;
 import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
 import com.epmet.dto.result.demand.ServiceStatDTO;
@@ -147,6 +149,29 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
      */
     DemandRecResultDTO queryDemandDetail(DemandDetailFormDTO formDTO);
 
+    /**
+     *  数据分析-个人档案-需求详情，研判分析
+     *
+     * @param formDTO
+     * @return
+     */
+    DemandResearchAnalysisResultDTO queryDemandResearchAnalysis(DemandResearchAnalysisFormDTO formDTO);
+
+    /**
+     * 数分析-服务措施分析-分页查询
+     *
+     * @param formDTO
+     * @return
+     */
+    PageData<DemandRecResultDTO> pageListAnalysis(PageListAnalysisFormDTO formDTO);
+
+    /**
+     * 数据分析-服务措施分析-柱状图
+     *
+     * @return
+     */
+    CategoryAnalysisResDTO categoryAnalysis(CategoryAnalysisFormDTO formDTO);
+
     /**
      * 计算出服务方，评价总分，服务的需求个数
      *
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
index 850c4367de..6a84fb67a1 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java
@@ -25,6 +25,7 @@ import com.epmet.dto.form.CommonCustomerFormDTO;
 import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
 import com.epmet.entity.VolunteerInfoEntity;
 
@@ -94,4 +95,6 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @return
      */
     List<OptionDTO> queryListVolunteer(String customerId,String userRealName);
+
+    List<PageVolunteerInfoResultDTO> queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
index 213dacc377..4057d1ba41 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
@@ -36,6 +36,7 @@ import com.epmet.dto.IcPartyActivityDTO;
 import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.demand.SubCodeFormDTO;
+import com.epmet.dto.result.ActivityStatisticsDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyActivityEntity;
 import com.epmet.excel.IcPartyActivityImportExcel;
@@ -71,6 +72,10 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
     private IcPartyUnitService icPartyUnitService;
     @Resource
     private IcResiDemandDictService icResiDemandDictService;
+    /**
+     * 服务事项code
+     */
+    private static final String SERVICE_MATTER_CODE = "1010";
 
     @Override
     public PageData<IcPartyActivityDTO> search(PartyActivityFormDTO formDTO) {
@@ -149,7 +154,22 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
     @Override
     public IcPartyActivityDTO get(String id) {
         IcPartyActivityEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IcPartyActivityDTO.class);
+        if (null == entity) {
+            return null;
+        }
+        //获取服务事项名称
+        SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
+        codeFormDTO.setCustomerId(entity.getCustomerId());
+        codeFormDTO.setParentCategoryCode(SERVICE_MATTER_CODE);
+        Map<String, String> categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+        IcPartyActivityDTO dto = ConvertUtils.sourceToTarget(entity, IcPartyActivityDTO.class);
+        dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter()));
+        //获取单位名称
+        IcPartyUnitDTO unitDTO = icPartyUnitService.get(dto.getUnitId());
+        if (null != unitDTO) {
+            dto.setUnitName(unitDTO.getUnitName());
+        }
+        return dto;
     }
 
     @Override
@@ -206,7 +226,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
         //获取服务事项
         SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
         codeFormDTO.setCustomerId(tokenDto.getCustomerId());
-        codeFormDTO.setParentCategoryCode("1010");
+        codeFormDTO.setParentCategoryCode(SERVICE_MATTER_CODE);
         Map<String, String> categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getLabel, OptionDTO::getValue));
         //获取联建单位
         IcPartyUnitDTO unitDTO = new IcPartyUnitDTO();
@@ -287,4 +307,93 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
         return new Result().ok(str);
     }
 
+    /**
+     * 联建活动统计
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List< OptionDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 14:55
+     */
+    @Override
+    public List<OptionDTO> statistics(PartyActivityFormDTO formDTO) {
+        List<OptionDTO> list = new ArrayList<>();
+        if (null == formDTO.getStartTime() && null == formDTO.getEndTime()) {
+            setDate(formDTO);
+        }
+        ActivityStatisticsDTO dto = baseDao.getStatistics(formDTO);
+
+        OptionDTO unit = new OptionDTO();
+        unit.setLabel("组织单位");
+        unit.setValue(dto.getUnitCount());
+        list.add(unit);
+        OptionDTO activity = new OptionDTO();
+        activity.setLabel("组织活动");
+        activity.setValue(dto.getActivityCount());
+        list.add(activity);
+
+        return list;
+    }
+
+    /**
+     * 联建活动统计列表
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link PageData< IcPartyActivityDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 16:24
+     */
+    @Override
+    public PageData<IcPartyActivityDTO> getActivityList(TokenDto tokenDto, PartyActivityFormDTO formDTO) {
+        if (null == formDTO.getStartTime() && null == formDTO.getEndTime()) {
+            setDate(formDTO);
+        }
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        //获取活动列表
+        LambdaQueryWrapper<IcPartyActivityEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.and(wp -> wp.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId()).or().
+                like(IcPartyActivityEntity::getPids, formDTO.getAgencyId()));
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyActivityEntity::getServiceMatter, formDTO.getServiceMatter());
+        wrapper.ge(null != formDTO.getStartTime(),IcPartyActivityEntity::getActivityTime, formDTO.getStartTime());
+        wrapper.le(null != formDTO.getEndTime(), IcPartyActivityEntity::getActivityTime, formDTO.getEndTime());
+        wrapper.orderByDesc(IcPartyActivityEntity::getActivityTime);
+        List<IcPartyActivityEntity> list = baseDao.selectList(wrapper);
+        List<IcPartyActivityDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyActivityDTO.class);
+
+        IcPartyUnitDTO unitDTO = new IcPartyUnitDTO();
+        unitDTO.setAgencyId(formDTO.getAgencyId());
+        if (CollectionUtils.isNotEmpty(dtoList)) {
+            //获取联建单位
+            Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+            //获取服务事项字典
+            SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
+            codeFormDTO.setCustomerId(tokenDto.getCustomerId());
+            codeFormDTO.setParentCategoryCode(SERVICE_MATTER_CODE);
+            Map<String, String> categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+            //数据组装
+            dtoList.forEach(dto -> {
+                dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter()));
+                dto.setUnitName(option.get(dto.getUnitId()));
+            });
+        }
+        PageInfo<IcPartyActivityDTO> pageInfo = new PageInfo<>(dtoList);
+        return new PageData<>(dtoList, pageInfo.getTotal());
+    }
+
+    /**
+     * 近30天开始时间和结束时间 （精确到秒）
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/12/13 17:40
+     */
+    private void setDate(PartyActivityFormDTO formDTO) {
+        String start = DateUtils.getBeforeNDay(30);
+        formDTO.setStartTime(DateUtils.parse(start.concat("000000"), DateUtils.DATE_TIME_NO_SPLIT));
+        String end = DateUtils.format(new Date(), DateUtils.DATE_PATTERN);
+        formDTO.setEndTime(DateUtils.parse(end.concat(" 23:59:59"), DateUtils.DATE_TIME_PATTERN));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index 5b49e3a276..ab96c7c68b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -26,7 +26,10 @@ import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.DictListResultDTO;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.enums.PartyUnitTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -39,9 +42,11 @@ import com.epmet.commons.tools.utils.ExcelPoiUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcPartyUnitDao;
 import com.epmet.dto.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.form.demand.SubCodeFormDTO;
+import com.epmet.dto.result.PartyUnitDistributionResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceStatDTO;
 import com.epmet.entity.IcPartyUnitEntity;
@@ -379,6 +384,57 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         return new Result().ok(str);
     }
 
+    /**
+     * @param formDTO
+     * @Description 按类型统计单位数量
+     * @Param formDTO
+     * @Return {@link List<OptionDataResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/8 14:56
+     */
+    @Override
+    public List<OptionDataResultDTO> typeStatistics(PartyActivityFormDTO formDTO) {
+        DictListFormDTO dictFromDTO = new DictListFormDTO();
+        dictFromDTO.setDictType(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
+        Result<List<DictListResultDTO>> dictResult = epmetAdminOpenFeignClient.dictList(dictFromDTO);
+        if (!dictResult.success()) {
+            throw new EpmetException(dictResult.getCode());
+        }
+
+        List<OptionDataResultDTO> list = baseDao.getTypeStatistics(formDTO.getAgencyId());
+        Map<String, String> map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue));
+
+        return dictResult.getData().stream().map(item -> {
+            OptionDataResultDTO dto = new OptionDataResultDTO();
+            dto.setLabel(item.getLabel());
+            dto.setCode(item.getValue());
+            dto.setValue(null == map.get(item.getValue())?NumConstant.ZERO_STR:map.get(item.getValue()));
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 联建单位分布
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List<PartyUnitDistributionResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/12/9 10:10
+     */
+    @Override
+    public List<PartyUnitDistributionResultDTO> distribution(PartyActivityFormDTO formDTO) {
+        Result<Map<String, String>> unitTypeMap =  epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
+        List<PartyUnitDistributionResultDTO> list = baseDao.getDistribution(formDTO.getAgencyId());
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        list.forEach(item -> {
+            item.setType(unitTypeMap.getData().get(item.getType()));
+        });
+        return list;
+    }
+
     /**
      * 计算区域化党建单位的群众满意度
      * 总分➗需求个数
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java
index 5fe0df4eff..8dfd1599cf 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java
@@ -36,11 +36,13 @@ import com.epmet.service.IcResiDemandDictService;
 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 org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -203,7 +205,11 @@ public class IcResiDemandDictServiceImpl extends BaseServiceImpl<IcResiDemandDic
 
     @Override
     public List<OptionDTO> querySubCodeList(SubCodeFormDTO formDTO) {
-        return baseDao.selectByPCode(formDTO.getParentCategoryCode(),formDTO.getCustomerId(),formDTO.getCategoryName());
+        List<OptionDTO> list = baseDao.selectByPCode(formDTO.getParentCategoryCode(),formDTO.getCustomerId(),formDTO.getCategoryName());
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list;
     }
 
     @Override
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 447531f7fd..e66cb7cdc9 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -37,16 +38,15 @@ import com.epmet.dao.IcUserDemandOperateLogDao;
 import com.epmet.dao.IcUserDemandRecDao;
 import com.epmet.dao.IcUserDemandSatisfactionDao;
 import com.epmet.dao.IcUserDemandServiceDao;
+import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.form.FindIcUserFormDTO;
+import com.epmet.dto.form.ResiUserFormDTO;
 import com.epmet.dto.form.demand.*;
-import com.epmet.dto.result.AllGridsByUserIdResultDTO;
-import com.epmet.dto.result.UserBaseInfoResultDTO;
-import com.epmet.dto.result.demand.DemandRecResultDTO;
-import com.epmet.dto.result.demand.FinishResultDTO;
-import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
-import com.epmet.dto.result.demand.ServiceStatDTO;
+import com.epmet.dto.result.*;
+import com.epmet.dto.result.demand.*;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -55,6 +55,7 @@ import com.epmet.service.IcResiDemandDictService;
 import com.epmet.service.IcUserDemandRecService;
 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.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -72,6 +73,7 @@ import java.util.stream.Collectors;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-11-19
  */
+@Slf4j
 @Service
 public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecDao, IcUserDemandRecEntity> implements IcUserDemandRecService {
     @Autowired
@@ -321,6 +323,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                         res.setServiceShowName(res.getServiceName().concat("(区域化党建单位)"));
                         break;
                 }*/
+                res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId()) ? true : false);
             }
         }
         return new PageData<>(list, pageInfo.getTotal());
@@ -488,10 +491,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         formDTO.setEpmetUserId(userRes.getData().getEpmetUserId());*/
         //icresiuser/persondata接口已经返回去epmetUserId，这里就不需要再查询了。直接让前端传过来
         List<String> userIds=new ArrayList<>();
-        userIds.add(formDTO.getUserId());
+        userIds.add(formDTO.getIcResiUserId());
         if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){
             userIds.addAll(formDTO.getEpmetUserIdList());
         }
+        formDTO.setUserIds(userIds);
         //2、小程序内自己上报+赋能平台待录入的
         PageInfo<IcResiUserReportDemandRes> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO));
@@ -510,6 +514,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
                 if (null != dictMap && dictMap.containsKey(resDto.getCategoryCode())) {
                     resDto.setCategoryName(dictMap.get(resDto.getCategoryCode()));
                 }
+                resDto.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(),resDto.getFirstCategoryCode()));
             }
         }
         return new PageData<>(list, pageInfo.getTotal());
@@ -559,10 +564,338 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
 
             //服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
             res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType()) ? res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")") : StrConstant.EPMETY_STR);
+            res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId())?true:false);
         }
         return res;
     }
 
+
+    /**
+     * 数据分析-个人档案-需求详情，研判分析
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public DemandResearchAnalysisResultDTO queryDemandResearchAnalysis(DemandResearchAnalysisFormDTO formDTO) {
+        //获取案件居民和及家属列表
+        HouseMemResDTO houseMemResDTO=queryDemandUserFamily(formDTO);
+        DemandResearchAnalysisResultDTO resultDTO = ConvertUtils.sourceToTarget(houseMemResDTO, DemandResearchAnalysisResultDTO.class);
+        //log.info(JSON.toJSONString(formDTO));
+
+        //返参格式套一层类别和类别名称
+        List<DemandDataDTO> demandData=new ArrayList<>();
+        DemandDataDTO demandDataDTO=new DemandDataDTO();
+        demandDataDTO.setFirstCategoryCode(formDTO.getFirstCategoryCode());
+        demandDataDTO.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(),formDTO.getFirstCategoryCode()));
+        demandDataDTO.setDemandList(new ArrayList<>());
+        demandData.add(demandDataDTO);
+
+        //如果是服务措施分析来的，并且是pc录入的需求，需要先去找epmetUserIdList
+        if (UserDemandConstant.DEMAND_ANALYSIS.equals(formDTO.getQueryOrigin())
+                && StringUtils.isNotBlank(formDTO.getIcResiUserId())
+                && CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
+            ResiUserFormDTO resiUserFormDTO = new ResiUserFormDTO();
+            resiUserFormDTO.setCustomerId(formDTO.getCustomerId());
+            resiUserFormDTO.setIcResiUserId(formDTO.getIcResiUserId());
+            Result<ResiUserResDTO> resiRes = epmetUserOpenFeignClient.findEpmetUser(resiUserFormDTO);
+            if (!resiRes.success()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询小程序用户异常");
+            }
+            if (null != resiRes.getData() && CollectionUtils.isNotEmpty(resiRes.getData().getEpmetUserIdList())) {
+                formDTO.setEpmetUserIdList(resiRes.getData().getEpmetUserIdList());
+            }
+        }
+        //获取当前需求人，相同分类的需求列表。不分页，直接返回所有
+        List<String> userIds=new ArrayList<>();
+        if(StringUtils.isNotBlank(formDTO.getIcResiUserId())){
+            userIds.add(formDTO.getIcResiUserId());
+        }
+        if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){
+            userIds.addAll(formDTO.getEpmetUserIdList());
+        }
+        if(StringUtils.isBlank(formDTO.getIcResiUserId())&&CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
+            //需求人不能为空
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "需求人不能为空，icResiUserId与epmetUserIdList不能同时为空");
+        }
+
+
+        IcResiUserDemandFromDTO icResiUserDemandFromDTO=new IcResiUserDemandFromDTO();
+        icResiUserDemandFromDTO.setUserIds(userIds);
+        icResiUserDemandFromDTO.setFirstCategoryCode(formDTO.getFirstCategoryCode());
+        icResiUserDemandFromDTO.setDemandRecId(formDTO.getDemandRecId());
+        List<IcResiUserReportDemandRes> demandList =  baseDao.selectUserDemand(icResiUserDemandFromDTO);
+
+        if(CollectionUtils.isNotEmpty(demandList)){
+            // 1、状态字典
+            Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode());
+            Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>();
+            //2、查询分类名称
+            List<String> categoryCodes = demandList.stream().map(IcResiUserReportDemandRes::getCategoryCode).collect(Collectors.toList());
+            List<IcResiDemandDictEntity> dictList = demandDictService.listByCodes(formDTO.getCustomerId(), categoryCodes);
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName));
+
+            for (IcResiUserReportDemandRes resDto : demandList) {
+                //状态赋值
+                resDto.setStatusName(statusMap.containsKey(resDto.getStatus()) ? statusMap.get(resDto.getStatus()) : StrConstant.EPMETY_STR);
+                if (null != dictMap && dictMap.containsKey(resDto.getCategoryCode())) {
+                    //分类名称XXX-XX  或者XXX
+                    resDto.setCategoryName(dictMap.get(resDto.getCategoryCode()));
+                }
+                //一级分类名称
+                resDto.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(),resDto.getFirstCategoryCode()));
+            }
+            demandData.get(NumConstant.ZERO).setDemandList(CollectionUtils.isNotEmpty(demandList) ? demandList : Collections.emptyList());
+        }
+
+        resultDTO.setEpmetUserIdList(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList()) ? formDTO.getEpmetUserIdList() : Collections.emptyList());
+        resultDTO.setDemandData(demandData);
+        return resultDTO;
+    }
+
+    /**
+     * 数据分析-个人档案-需求详情，研判分析
+     * 获取案件居民和及家属列表
+     *
+     *
+     * @param formDTO
+     * @return
+     */
+    private HouseMemResDTO queryDemandUserFamily(DemandResearchAnalysisFormDTO formDTO) {
+        HouseMemResDTO houseMemResDTO=new HouseMemResDTO();
+        if(StringUtils.isBlank(formDTO.getIcResiUserId())&&CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
+            //需求人不能为空
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "需求人不能为空，icResiUserId与epmetUserIdList不能同时为空");
+        }
+        //服务措施分析点击了PC录入的需求，或者个人档案进来的（这两种情况肯定会有icResiUserId）
+        if(StringUtils.isNotBlank(formDTO.getIcResiUserId())){
+            Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId());
+            if (!userRes.success() || null == userRes.getData()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常");
+            }
+            houseMemResDTO=ConvertUtils.sourceToTarget(userRes.getData(),HouseMemResDTO.class);
+        }
+        //服务措施点击了，小程序用户上报的需求
+        if (StringUtils.isBlank(formDTO.getIcResiUserId())&&CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())) {
+            //需要找到当前这个epmetUserIdList相同身份证号的人，
+            //以及这个身份证号所对应的居民的家属
+            FindIcUserFormDTO findIcUserFormDTO=new FindIcUserFormDTO();
+            findIcUserFormDTO.setCustomerId(formDTO.getCustomerId());
+            findIcUserFormDTO.setEpmetUserId(formDTO.getEpmetUserIdList().get(NumConstant.ZERO));
+            Result<EpmetUserFamilyDTO> epmetUserFamilyDTOResult=epmetUserOpenFeignClient.findIcUser(findIcUserFormDTO);
+            if (!epmetUserFamilyDTOResult.success() || null == epmetUserFamilyDTOResult.getData()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "根据小程序用户id,获取ic居民信息接口异常");
+            }
+            houseMemResDTO=ConvertUtils.sourceToTarget(epmetUserFamilyDTOResult.getData(),HouseMemResDTO.class);
+            formDTO.setEpmetUserIdList(epmetUserFamilyDTOResult.getData().getEpmetUserIdList());
+        }
+        return houseMemResDTO;
+    }
+
+    /**
+     * 数分析-服务措施分析-分页查询
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<DemandRecResultDTO> pageListAnalysis(PageListAnalysisFormDTO formDTO) {
+        if("agency".equals(formDTO.getOrgType())){
+            //找到当前组织的所有上级，再拼接上自己
+            Result<CustomerAgencyDTO> customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId());
+            if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById");
+            }
+            if(NumConstant.ZERO_STR.equals(customerAgencyDTOResult.getData().getPid())){
+                //当前传入的组织id=客户的根组织
+                formDTO.setGridPids(formDTO.getOrgId());
+            }else{
+                formDTO.setGridPids(customerAgencyDTOResult.getData().getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()));
+            }
+        }
+        long total=NumConstant.ZERO;
+        List<DemandRecResultDTO> list=new ArrayList<>();
+        if(formDTO.getPageFlag()){
+            PageInfo<DemandRecResultDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
+                    formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.pageListAnalysis(formDTO));
+            list=pageInfo.getList();
+            total=pageInfo.getTotal();
+        }else{
+            list=baseDao.pageListAnalysis(formDTO);
+        }
+        if(CollectionUtils.isNotEmpty(list)){
+            //1、查询网格信息
+            List<String> gridIds=list.stream().map(DemandRecResultDTO::getGridId).collect(Collectors.toList());
+            Result<List<AllGridsByUserIdResultDTO>> gridInfoRes=govOrgOpenFeignClient.getGridListByGridIds(gridIds);
+            List<AllGridsByUserIdResultDTO> gridInfoList = gridInfoRes.success() && !CollectionUtils.isEmpty(gridInfoRes.getData()) ? gridInfoRes.getData() : new ArrayList<>();
+            Map<String, AllGridsByUserIdResultDTO> gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, Function.identity()));
+
+            //2、查询分类名称
+            List<String> categoryCodes=list.stream().map(DemandRecResultDTO::getCategoryCode).collect(Collectors.toList());
+            List<IcResiDemandDictEntity> dictList=demandDictService.listByCodes(formDTO.getCustomerId(),categoryCodes);
+            Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName));
+
+            //3、查询志愿者
+            // 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+            Map<String,String> userInfoMap=new HashMap<>();
+            Set<String> userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet());
+            if(CollectionUtils.isNotEmpty(userIdList)){
+                Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIdList));
+                if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){
+                    throw new RenException("查询志愿者信息异常");
+                }
+                userInfoMap=userInfoRes.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, UserBaseInfoResultDTO::getRealName));
+            }
+
+            //查询字典表
+            Result<Map<String, String>> reportTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_REPORT_TYPE.getCode());
+            Map<String,String> reportTypeMap=reportTypeRes.success()&& MapUtils.isNotEmpty(reportTypeRes.getData())?reportTypeRes.getData():new HashMap<>();
+
+            Result<Map<String, String>> statusRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode());
+            Map<String,String> statusMap=statusRes.success()&& MapUtils.isNotEmpty(statusRes.getData())?statusRes.getData():new HashMap<>();
+
+            Result<Map<String, String>> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode());
+            Map<String,String> serviceTypeMap=serviceTypeRes.success()&& MapUtils.isNotEmpty(serviceTypeRes.getData())?serviceTypeRes.getData():new HashMap<>();
+
+            for(DemandRecResultDTO res:list){
+                if (null != gridInfoMap && gridInfoMap.containsKey(res.getGridId())) {
+                    res.setGridName(gridInfoMap.get(res.getGridId()).getGridName());
+                }
+
+                if (null != dictMap && dictMap.containsKey(res.getCategoryCode())) {
+                    res.setCategoryName(dictMap.get(res.getCategoryCode()));
+                }
+                res.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(), res.getFirstCategoryCode()));
+                if (null != userInfoMap && userInfoMap.containsKey(res.getServerId())) {
+                    res.setServiceName(userInfoMap.get(res.getServerId()));
+                }
+                //社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
+                res.setReportTypeName(reportTypeMap.containsKey(res.getReportType())?reportTypeMap.get(res.getReportType()):StrConstant.EPMETY_STR);
+                //待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
+                res.setStatusName(statusMap.containsKey(res.getStatus())?statusMap.get(res.getStatus()):StrConstant.EPMETY_STR);
+                //服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+                res.setServiceShowName(serviceTypeMap.containsKey(res.getServiceType())?res.getServiceName().concat("(").concat(serviceTypeMap.get(res.getServiceType())).concat(")"):StrConstant.EPMETY_STR);
+                res.setServiceShowFlag(StringUtils.isNotBlank(res.getServerId())?true:false);
+            }
+        }
+        return new PageData<>(list, total);
+    }
+
+    /**
+     * 数据分析-服务措施分析-柱状图
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public CategoryAnalysisResDTO categoryAnalysis(CategoryAnalysisFormDTO formDTO) {
+        //1、一级分类字典，没有分类直接退出
+        SubCodeFormDTO subCodeFormDTO=new SubCodeFormDTO();
+        subCodeFormDTO.setCustomerId(formDTO.getCusotmerId());
+        subCodeFormDTO.setParentCategoryCode(NumConstant.ZERO_STR);
+        List<OptionDTO> firstCategoryList=demandDictService.querySubCodeList(subCodeFormDTO);
+        if(CollectionUtils.isEmpty(firstCategoryList)){
+            return new CategoryAnalysisResDTO(Collections.EMPTY_LIST,Collections.EMPTY_LIST);
+        }
+        //2、没有服务类型直接退出
+        Result<Map<String, String>> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode());
+        if(!serviceTypeRes.success()||MapUtils.isEmpty(serviceTypeRes.getData())){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"查询服务方类型异常，请检查是否已经配置字典信息");
+        }
+        List<LegendDTO> legend=new ArrayList<>();
+        serviceTypeRes.getData().forEach((code,name)->{
+            LegendDTO legendDTO=new LegendDTO(code,name);
+            legend.add(legendDTO);
+        });
+        LegendDTO unfinishLegend = new LegendDTO("unfinished", "未完成");
+        legend.add(unfinishLegend);
+
+        log.info("阶段性胜利1："+ JSON.toJSONString(legend));
+        // 3、传进来的是组织id的话，查询出全路径
+        if("agency".equals(formDTO.getOrgType())){
+            //找到当前组织的所有上级，再拼接上自己
+            Result<CustomerAgencyDTO> customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId());
+            if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById");
+            }
+            if(NumConstant.ZERO_STR.equals(customerAgencyDTOResult.getData().getPid())){
+                //当前传入的组织id=客户的根组织
+                formDTO.setGridPids(formDTO.getOrgId());
+            }else{
+                formDTO.setGridPids(customerAgencyDTOResult.getData().getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()));
+            }
+        }
+
+        //4、构造最后的反参
+        List<CategoryAnalysisDTO> list=new ArrayList<>();
+        // firstCategoryList是所有的一级分类字典
+        firstCategoryList.forEach(firstCategory->{
+            CategoryAnalysisDTO categoryAnalysisDTO=new CategoryAnalysisDTO(firstCategory.getValue(),firstCategory.getLabel(),NumConstant.ZERO,Collections.EMPTY_LIST);
+            categoryAnalysisDTO.setDetail(constructDefaultDetail(legend));
+            list.add(categoryAnalysisDTO);
+        });
+
+        log.info("阶段性胜利2："+ JSON.toJSONString(list));
+
+        // 5、查询出有数据的一级分类，sql计算出detail
+        List<CategoryAnalysisDTO> haveDemandList=baseDao.selectListCategoryAnalysisDTO(firstCategoryList,
+                                                                                    formDTO.getCusotmerId(),
+                                                                                    formDTO.getOrgId(),
+                                                                                    formDTO.getOrgType(),
+                                                                                    formDTO.getGridPids(),
+                                                                                    formDTO.getStartDateId(),
+                                                                                    formDTO.getEndDateId());
+        if(!CollectionUtils.isEmpty(haveDemandList)){
+            log.info("阶段性胜利3："+ JSON.toJSONString(haveDemandList));
+            Map<String, CategoryAnalysisDTO> map = haveDemandList.stream().filter(temp -> CollectionUtils.isNotEmpty(temp.getDetail())).collect(Collectors.toMap(CategoryAnalysisDTO::getCategoryCode, dto -> dto));
+            if(MapUtils.isNotEmpty(map)){
+                log.info("阶段性胜利4："+ JSON.toJSONString(map));
+                for(CategoryAnalysisDTO result:list){
+                    if (map.containsKey(result.getCategoryCode()) && null != map.get(result.getCategoryCode())) {
+                        //如果当前分类下有上报的需求,将原来的0改为实际的需求数量
+                        CategoryAnalysisDTO tempDto=map.get(result.getCategoryCode());
+                        result.setTotal(tempDto.getTotal());
+
+                        //当前分类有居民的明细：未完成多少个，xxx个志愿者完成xxx个需求
+                        if(CollectionUtils.isNotEmpty(tempDto.getDetail())){
+                            List<CategoryAnalysisDetail> resDetailList=tempDto.getDetail();
+                            Map<String, CategoryAnalysisDetail> detailMap = resDetailList.stream().collect(Collectors.toMap(CategoryAnalysisDetail::getLegendCode, dto -> dto));
+
+                            //遍历之前构造好的图例
+                            for(CategoryAnalysisDetail resultDetail:result.getDetail()){
+                                if(detailMap.containsKey(resultDetail.getLegendCode())&&null!=detailMap.get(resultDetail.getLegendCode())){
+                                    resultDetail.setTotalService(detailMap.get(resultDetail.getLegendCode()).getTotalService());
+                                    resultDetail.setServiceDemandTotal(detailMap.get(resultDetail.getLegendCode()).getServiceDemandTotal());
+                                }
+                            }
+
+                        }
+
+                    }
+
+                }
+
+            }
+
+        }
+
+        //返回结果，也不知道对不对
+        CategoryAnalysisResDTO result=new CategoryAnalysisResDTO();
+        result.setLegend(legend);
+        result.setCategoryList(list);
+        return result;
+    }
+
+    private List<CategoryAnalysisDetail> constructDefaultDetail(List<LegendDTO> legend) {
+        List<CategoryAnalysisDetail> l = new ArrayList<>();
+        legend.forEach(legendDTO -> {
+            CategoryAnalysisDetail d = ConvertUtils.sourceToTarget(legendDTO, CategoryAnalysisDetail.class);
+            d.setServiceDemandTotal(NumConstant.ZERO);
+            d.setTotalService(NumConstant.ZERO);
+            l.add(d);
+        });
+        return l;
+    }
     /**
      * 计算出服务方，评价总分，服务的需求个数
      *
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index a0ac541131..ac87cc6b4c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -18,6 +18,7 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -44,12 +45,14 @@ import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.SendVerificationCodeResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
 import com.epmet.entity.VolunteerInfoEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.HeartUserInfoService;
 import com.epmet.service.VolunteerInfoService;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -258,4 +261,21 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         }
         return resultList;
     }
+
+    @Override
+    public List<PageVolunteerInfoResultDTO> queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize) {
+        LambdaQueryWrapper<VolunteerInfoEntity> query = new LambdaQueryWrapper<>();
+        query.eq(VolunteerInfoEntity::getCustomerId, customerId);
+
+        PageHelper.startPage(pageNo, pageSize);
+        List<VolunteerInfoEntity> volunteerInfoEntities = baseDao.selectList(query);
+
+        List<PageVolunteerInfoResultDTO> list = volunteerInfoEntities.stream().map(vi -> {
+            PageVolunteerInfoResultDTO p = new PageVolunteerInfoResultDTO();
+            p.setUserId(vi.getUserId());
+            return p;
+        }).collect(Collectors.toList());
+        
+        return list;
+    }
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql
index dcfead8989..cb638c9c74 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql
@@ -1,7 +1,7 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : 外网192.168.1.130
+ Source Server         : 外网192.168.1.140
  Source Server Type    : MySQL
  Source Server Version : 50728
  Source Host           : 118.190.150.119:47306
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
index aacc15fdab..df57dd24a6 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
@@ -138,10 +138,9 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="local,dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
index fd84685f0e..ede5b4c0e1 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
@@ -26,6 +26,24 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="getStatistics" resultType="com.epmet.dto.result.ActivityStatisticsDTO" parameterType="com.epmet.dto.form.PartyActivityFormDTO">
+        SELECT
+            count( ID ) AS "activityCount",
+            COUNT( DISTINCT UNIT_ID ) AS "unitCount"
+        FROM
+            ic_party_activity
+        WHERE DEL_FLAG = '0'
+        AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
+        <if test='null != serviceMatter'>
+           AND SERVICE_MATTER = #{serviceMatter}
+        </if>
+        <if test='null != startTime'>
+           AND ACTIVITY_TIME &gt;= #{startTime}
+        </if>
+        <if test='null != endTime'>
+           AND ACTIVITY_TIME &lt;= #{endTime}
+        </if>
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
index 024b33adf6..d7f02b7109 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
@@ -46,6 +46,34 @@
         </foreach>
     </select>
 
+    <select id="getTypeStatistics" resultType="com.epmet.commons.tools.dto.result.OptionDataResultDTO">
+        SELECT
+            TYPE AS "code",
+            COUNT( ID ) AS "value"
+        FROM
+            ic_party_unit
+        WHERE
+            DEL_FLAG = '0'
+            AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
+        GROUP BY
+            TYPE
+    </select>
+    <select id="getDistribution" resultType="com.epmet.dto.result.PartyUnitDistributionResultDTO">
+        SELECT
+            ID,
+            UNIT_NAME AS "name",
+            TYPE,
+            LONGITUDE,
+            LATITUDE
+        FROM
+            ic_party_unit
+        WHERE
+            DEL_FLAG = '0'
+            AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
+        ORDER BY
+            ID
+    </select>
+
     <update id="updateSatisfaction" parameterType="map">
         update ic_party_unit
         set SATISFACTION=#{satisfaction},UPDATED_TIME=NOW()
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml
index be50e98601..d9d79ecaec 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml
@@ -141,7 +141,7 @@
                 AND m.CATEGORY_CODE =#{firstCategoryCode}
             </if>
         ORDER BY
-            m.CREATED_TIME DESC
+            m.CREATED_TIME DESC,m.sort desc
     </select>
 
 
@@ -163,7 +163,7 @@
             AND m.CUSTOMER_ID = #{customerId}
             AND m.PARENT_CODE = #{parentCode}
         ORDER BY
-        m.CREATED_TIME DESC
+        m.CREATED_TIME DESC,m.sort desc
     </select>
 
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index f352685356..11d3190a6c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -75,7 +75,17 @@
             case when r.PARENT_CODE !='0' then r.PARENT_CODE
             ELSE R.CATEGORY_CODE
             END
-            ) as firstCategoryCode
+            ) as firstCategoryCode,
+            (
+                CASE WHEN R.DEMAND_USER_TYPE='ic_resi_user' THEN R.DEMAND_USER_ID
+                ELSE ''
+                END
+            ) as icResiUserId,
+            (
+                CASE WHEN R.DEMAND_USER_TYPE='mini_resi' THEN R.DEMAND_USER_ID
+                ELSE ''
+                END
+            ) as epmetUserId
         FROM
             ic_user_demand_rec r
             left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )
@@ -90,7 +100,7 @@
                 AND r.GRID_PIDS LIKE concat('%',#{gridPids},'%')
             </if>
             <if test="null != level and level ==1">
-                and r.PARENT_CODE=#{categoryCode}
+                and (r.PARENT_CODE=#{categoryCode} or r.CATEGORY_CODE=#{categoryCode})
             </if>
             <if test="null != level and level ==2">
                 and r.CATEGORY_CODE=#{categoryCode}
@@ -129,7 +139,8 @@
             r.PARENT_CODE as parentCode,
             r.CONTENT,
             r.`STATUS`,
-            r.WANT_SERVICE_TIME as wantServiceTime
+            r.WANT_SERVICE_TIME as wantServiceTime,
+            left(r.CATEGORY_CODE,4) as firstCategoryCode
         FROM
             ic_user_demand_rec r
         WHERE
@@ -141,6 +152,9 @@
             <if test="null !=firstCategoryCode and firstCategoryCode!=''">
                 and r.CATEGORY_CODE like concat(#{firstCategoryCode},'%')
             </if>
+            <if test="null !=demandRecId and demandRecId!=''">
+                and r.id !=#{demandRecId}
+            </if>
         ORDER BY
             r.WANT_SERVICE_TIME DESC
     </select>
@@ -181,11 +195,17 @@
             IFNULL(s.FINISH_DESC,'') as  finishDesc,
             '' AS serviceShowName,
             s.id as serviceId,
+            left(r.CATEGORY_CODE,4) as firstCategoryCode,
             (
-            case when r.PARENT_CODE !='0' then r.PARENT_CODE
-            ELSE R.CATEGORY_CODE
-            END
-            ) as firstCategoryCode
+                CASE WHEN R.DEMAND_USER_TYPE='ic_resi_user' THEN R.DEMAND_USER_ID
+                ELSE ''
+                END
+            ) as icResiUserId,
+            (
+                CASE WHEN R.DEMAND_USER_TYPE='mini_resi' THEN R.DEMAND_USER_ID
+                ELSE ''
+                END
+            ) as epmetUserId
         FROM
             ic_user_demand_rec r
             left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )
@@ -197,6 +217,180 @@
     </select>
 
 
+    <!--    列表查询 -->
+    <select id="pageListAnalysis" parameterType="com.epmet.dto.form.demand.PageListAnalysisFormDTO" resultType="com.epmet.dto.result.demand.DemandRecResultDTO">
+        SELECT
+        r.ID as demandRecId,
+        r.GRID_ID as gridId,
+        r.agency_id as agencyId,
+        r.CATEGORY_CODE as categoryCode,
+        r.PARENT_CODE as parentCode,
+        r.CONTENT,
+        r.REPORT_TYPE as reportType,
+        r.REPORT_TIME as reportTime,
+        r.REPORT_USER_NAME as reportUserName,
+        r.REPORT_USER_MOBILE as reportUserMobile,
+        r.`STATUS` as status,
+        r.DEMAND_USER_ID as demandUserId,
+        r.DEMAND_USER_NAME as demandUserName,
+        r.DEMAND_USER_MOBILE as demandUserMobile,
+        concat(r.DEMAND_USER_NAME,'(',r.DEMAND_USER_MOBILE,')') as demandUser,
+        r.WANT_SERVICE_TIME as wantServiceTime,
+        IFNULL(r.FINISH_RESULT,'') as finishResult,
+        r.CANCEL_TIME as cancelTime,
+        r.EVALUATE_FLAG as evaluateFlag,
+        IFNULL(sa.SCORE,0) as score,
+        IFNULL( s.SERVICE_TYPE, '' ) AS serviceType,
+        IFNULL( s.SERVER_ID, '' ) AS serverId,
+        (
+        CASE WHEN s.SERVICE_TYPE='social_org' then (select m1.SOCIETY_NAME as socialOrgName from ic_society_org m1 where m1.id=s.SERVER_ID)
+        WHEN s.SERVICE_TYPE='community_org' then (select m2.ORGANIZATION_NAME as communityName from ic_community_self_organization m2 where m2.id=s.SERVER_ID)
+        WHEN s.SERVICE_TYPE='party_unit' then (select m3.UNIT_NAME as partyUnitName from ic_party_unit m3 where m3.id=s.SERVER_ID)
+        else ''
+        end
+        ) as serviceName,
+        s.SERVICE_START_TIME as serviceStartTime,
+        s.SERVICE_END_TIME as serviceEndTime,
+        IFNULL(s.FINISH_DESC,'') as  finishDesc,
+        '' AS serviceShowName,
+        s.id as serviceId,
+        (
+        case when r.PARENT_CODE !='0' then r.PARENT_CODE
+        ELSE R.CATEGORY_CODE
+        END
+        ) as firstCategoryCode,
+        (
+            CASE WHEN R.DEMAND_USER_TYPE='ic_resi_user' THEN R.DEMAND_USER_ID
+            ELSE ''
+            END
+        ) as icResiUserId,
+        (
+            CASE WHEN R.DEMAND_USER_TYPE='mini_resi' THEN R.DEMAND_USER_ID
+            ELSE ''
+            END
+        ) as epmetUserId
+        FROM
+        ic_user_demand_rec r
+        left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )
+        left join ic_user_demand_satisfaction sa on(r.id=sa.DEMAND_REC_ID AND sa.DEL_FLAG = '0')
+        WHERE
+        r.DEL_FLAG = '0'
+        AND r.CUSTOMER_ID = #{customerId}
+        <if test="null != orgType and orgType == 'grid' ">
+            and r.GRID_ID=#{orgId}
+        </if>
+        <if test="null != orgType and orgType == 'agency' ">
+            AND r.GRID_PIDS LIKE concat(#{gridPids},'%')
+        </if>
+        <if test="null != categoryCode and categoryCode !='' ">
+            and r.CATEGORY_CODE LIKE CONCAT(#{categoryCode},'%')
+        </if>
+
+        <if test=" null != startDateId and startDateId != '' ">
+            AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{startDateId}
+        </if>
+        <if test="null != endDateId and endDateId != '' ">
+            AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDateId}
+        </if>
+        order by r.WANT_SERVICE_TIME desc,r.REPORT_TIME asc
+    </select>
+
+
+    <resultMap id="CategoryAnalysisDTOMap" type="com.epmet.dto.result.demand.CategoryAnalysisDTO">
+        <result property="categoryCode" column="category_code"/>
+        <result property="categoryName" column="category_name"/>
+        <result property="total" column="TOTAL"/>
+        <collection property="detail" ofType="com.epmet.dto.result.demand.CategoryAnalysisDetail"
+                    column="{categoryCode=category_code, orgType=org_type,orgId=org_id,gridPids=grid_pids,customerId=customer_id,startDateId=start_date_id,endDateId=end_date_id}"
+                    select="com.epmet.dao.IcUserDemandRecDao.selectDetail">
+
+        </collection>
+    </resultMap>
+
+    <select id="selectListCategoryAnalysisDTO" parameterType="map" resultMap="CategoryAnalysisDTOMap">
+        <foreach collection="firstCategoryList" item="category" separator=" UNION ALL ">
+            select
+                #{category.value} as category_code,
+                #{category.label} as category_name,
+                count(m.id) as TOTAL,
+                #{orgType} as org_type,
+                #{orgId} as org_id,
+                #{gridPids} as  grid_pids,
+                #{customerId} as customer_id,
+                #{startDateId} as start_date_id,
+                #{endDateId} as end_date_id
+            from ic_user_demand_rec m
+            where m.DEL_FLAG='0'
+            and m.CUSTOMER_ID=#{customerId}
+            <if test="null != orgType and orgType == 'grid' ">
+                and m.GRID_ID=#{orgId}
+            </if>
+            <if test="null != orgType and orgType == 'agency' ">
+                and m.GRID_PIDS  like concat(#{gridPids},'%')
+            </if>
+            and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &gt;= #{startDateId}
+            and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &lt;= #{endDateId}
+            and m.CATEGORY_CODE like concat(#{category.value},'%')
+            and m.status !='canceled'
+        </foreach>
+    </select>
+
+    <select id="selectDetail" parameterType="map" resultType="com.epmet.dto.result.demand.CategoryAnalysisDetail">
+        select
+            #{categoryCode} as  categoryCode,
+            s.SERVICE_TYPE as  legendCode,
+            (
+            case when s.SERVICE_TYPE='volunteer' then '志愿者'
+            when s.SERVICE_TYPE='social_org' then '社会组织'
+            when s.SERVICE_TYPE='community_org' then '社区自组织'
+            when s.SERVICE_TYPE='party_unit' then '区域化党建单位'
+            end
+            )as legendName,
+            count(s.DEMAND_REC_ID) as serviceDemandTotal,
+            count(distinct s.SERVER_ID) as  totalService
+        from ic_user_demand_service s
+        inner join ic_user_demand_rec m
+        on(s.DEMAND_REC_ID=m.ID)
+        where s.DEL_FLAG='0'
+        and m.DEL_FLAG='0'
+        and m.`STATUS`='finished'
+        and m.CUSTOMER_ID=#{customerId}
+        <if test="null != orgType and orgType == 'grid' ">
+            and m.GRID_ID=#{orgId}
+        </if>
+        <if test="null != orgType and orgType == 'agency' ">
+            and m.GRID_PIDS  like concat(#{gridPids},'%')
+        </if>
+        and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &gt;= #{startDateId}
+        and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &lt;= #{endDateId}
+        and m.CATEGORY_CODE like concat(#{categoryCode},'%')
+        group by s.SERVICE_TYPE
+
+        union all
+
+        select
+            #{categoryCode} as  categoryCode,
+            'unfinished' as legendCode,
+            '未完成' as legendName,
+            count(m.id) as serviceDemandTotal,
+            '0' as  totalService
+        from ic_user_demand_rec m
+        where  m.DEL_FLAG='0'
+        and m.`STATUS`!='finished'
+        and m.STATUS !='canceled'
+        and m.CUSTOMER_ID=#{customerId}
+        <if test="null != orgType and orgType == 'grid' ">
+            and m.GRID_ID=#{orgId}
+        </if>
+        <if test="null != orgType and orgType == 'agency' ">
+            and m.GRID_PIDS  like concat(#{gridPids},'%')
+        </if>
+        and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &gt;= #{startDateId}
+        and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &lt;= #{endDateId}
+        and m.CATEGORY_CODE like concat(#{categoryCode},'%')
+    </select>
+
+
     <select id="selectGroupByPartyUnit" parameterType="map" resultType="com.epmet.dto.result.demand.ServiceStatDTO">
         SELECT
             S.SERVER_ID AS serverId,
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/JobFeignConfig.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/JobFeignConfig.java
new file mode 100644
index 0000000000..d053f347cf
--- /dev/null
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/JobFeignConfig.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.config;
+
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.feign.EpmetBaseRequestInterceptor;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Feign调用，携带header
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Configuration
+public class JobFeignConfig {
+
+    @Bean
+    RequestInterceptor requestInterceptor() {
+        return new JobRequestInterceptor();
+    }
+
+    class JobRequestInterceptor extends EpmetBaseRequestInterceptor {
+        @Override
+        public void apply(RequestTemplate template) {
+            super.apply(template);
+
+            // job服务自己生成流水号
+            template.header(AppClientConstant.TRANSACTION_SERIAL_KEY, generateTransactionSerial());
+        }
+
+        /**
+         * 获取事务流水号
+         *
+         * @return
+         */
+        public String generateTransactionSerial() {
+            String[] letterPool = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n"
+                    , "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"};
+
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < 2; i++) {
+                sb.append(letterPool[(int) (Math.random() * 25)]);
+            }
+
+            sb.append(System.currentTimeMillis());
+            return sb.toString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java
index 199da6b24d..a20624fa18 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java
@@ -46,6 +46,7 @@ public class ScheduleConfig {
         prop.put("org.quartz.jobStore.misfireThreshold", "12000");
         prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
         prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
+        prop.put("org.quartz.jobStore.acquireTriggersWithinLock", "true");
 
         //PostgreSQL数据库，需要打开此注释
         //prop.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate");
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsDemandTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsDemandTask.java
new file mode 100644
index 0000000000..81c0be1c3b
--- /dev/null
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsDemandTask.java
@@ -0,0 +1,23 @@
+package com.epmet.task;
+
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description
+ * @Author wangxianzhang
+ * @Date 2021/12/13 9:40 上午
+ * @Version 1.0
+ */
+@Component("statsDemandTask")
+public class StatsDemandTask implements ITask {
+
+    @Autowired
+    private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+    
+    @Override
+    public void run(String params) {
+        dataStatisticalOpenFeignClient.statsVolunteerDemandServicesDaily(null);
+    }
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
index ca4f862049..92703db76e 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
@@ -153,7 +153,7 @@ public class SystemMessageServiceImpl implements SystemMessageService {
         switch (msgType) {
             case SystemMessageType.INIT_CUSTOMER:
                 topic = TopicConstants.INIT_CUSTOMER;
-            break;
+                break;
             case SystemMessageType.PROJECT_CHANGED:
                 topic = TopicConstants.PROJECT_CHANGED;
                 break;
diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
index db8cda16cf..60697791d7 100644
--- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
+++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
@@ -32,7 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
 @FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallbackFactory =
         OssFeignClientFallbackFactory.class)
 //@FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallbackFactory =
-//        OssFeignClientFallbackFactory.class)
+//        OssFeignClientFallbackFactory.class, url = "localhost:8083")
 public interface OssFeignClient {
     /**
      * 文件上传
@@ -73,4 +73,13 @@ public interface OssFeignClient {
         }
     }
 
+    /**
+     * @Description ribbon测试
+     * @return
+     * @author wxz
+     * @date 2021.08.05 16:28
+     */
+    @PostMapping("/oss/test/test-ribbon-rcv/{sleep}")
+    Result testRibbonRcv(@RequestParam("sleep") Long sleep);
+
 }
diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java
index e55182a73f..dc43ed7467 100644
--- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java
+++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java
@@ -13,6 +13,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.feign.OssFeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -39,6 +40,11 @@ public class OssFeignClientFallback implements OssFeignClient {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "uploadQrCodeV2", file, customerId);
 	}
 
+	@Override
+	public Result testRibbonRcv(@PathVariable Long sleep) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "testRibbonRcv", sleep);
+	}
+
 	@Override
 	public Result<String> getOssFileUrl(String filePath, String privacy) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "download", filePath,privacy);
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java
new file mode 100644
index 0000000000..ab580e8bf0
--- /dev/null
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java
@@ -0,0 +1,68 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.service.OssService;
+import org.apache.commons.io.FileUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+@RestController
+@RequestMapping("test")
+public class TestController {
+
+    @Autowired
+    private OssService ossService;
+
+    @PostMapping("local-upload")
+    public Result localUpload(@RequestPart("file") MultipartFile file, @RequestParam("fileName") String fileName) {
+
+        final File tempFile = new File("/opt/upload_files/" + fileName);
+
+        try(InputStream inputStream = file.getInputStream()) {
+            FileUtils.copyInputStreamToFile(inputStream, tempFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new Result();
+    }
+
+    @PostMapping("upload2aliyun")
+    public Result upload2aliyun(@RequestParam("fileName") String fileName) {
+        try (final FileInputStream fis = new FileInputStream("/opt/upload_files/" + fileName)) {
+            final MockMultipartFile mockMultipartFile = new MockMultipartFile(fileName, fis);
+            return ossService.uploadImg(mockMultipartFile, null);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new Result();
+    }
+
+    /**
+     * @Description ribbon测试
+     * @return
+     * @author wxz
+     * @date 2021.08.05 16:28
+    */
+    @PostMapping("test-ribbon-rcv/{sleep}")
+    public Result testRibbonRcv(@PathVariable("sleep") Long sleep) {
+        InetAddress localHost = null;
+        try {
+            Thread.sleep(sleep);
+            localHost = Inet4Address.getLocalHost();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return new Result().ok(localHost);
+    }
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
index ccf55babfa..b62546ef20 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
@@ -18,13 +18,13 @@ public class GroupPointFormDTO implements Serializable {
 
 	public interface GroupPoint extends CustomerClientShowGroup {}
 	public interface GridRank extends CustomerClientShowGroup {}
-	public interface PointRank extends CustomerClientShowGroup {}
 	public interface GridScopeRank {}
 	public interface CustomerScopeRank {}
 	public interface MyGroupRank {}
+	public interface PointRank extends CustomerClientShowGroup {}
 	@NotBlank(message = "小组Id不能为空", groups = {GroupPoint.class, GridRank.class})
 	private String groupId;
-	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, PointRank.class, GridScopeRank.class, MyGroupRank.class})
+	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, GridScopeRank.class, MyGroupRank.class, PointRank.class})
 	private String gridId;
 	@NotBlank(message = "客户Id不能为空", groups = {CustomerScopeRank.class})
 	private String customerId;
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java
new file mode 100644
index 0000000000..727bf1f558
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class IcResiPointPageFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+    private List<String> epmetUserIdList;
+    @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+    @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+
+}
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointPageResDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointPageResDTO.java
new file mode 100644
index 0000000000..68b73f61ae
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointPageResDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ResiPointPageResDTO implements Serializable {
+    private String title;
+    private String id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date dateTime;
+
+    /**
+     * +100  -25
+     * */
+    private String point;
+}
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java
index 795f557449..0b19244e0a 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java
@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+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;
@@ -115,6 +116,18 @@ public class ResiPointController {
         return new Result<List<ResiPointLogListResultDTO>>().ok(pointActionLogService.getMyPointRecord(pageUserParam));
     }
 
+    /**
+     * 数字赋能平台数据分析-个人档案-分页查询居民的积分记录
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("pageuserpoint")
+    public Result<PageData<ResiPointPageResDTO>> pageUserPoint(@RequestBody IcResiPointPageFormDTO formDTO ){
+        ValidatorUtils.validateEntity(formDTO,IcResiPointPageFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<ResiPointPageResDTO>>().ok(pointActionLogService.pageUserPoint(formDTO));
+    }
+
     /**
      * @Description 查找指定用户的积分兑换记录
      * @param dto
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java
index 1db465d453..ae9cb21307 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java
@@ -18,8 +18,10 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.IcResiPointPageFormDTO;
 import com.epmet.dto.result.MyPointTaskResultDTO;
 import com.epmet.dto.result.ResiPointLogPeriodResultDTO;
+import com.epmet.dto.result.ResiPointPageResDTO;
 import com.epmet.entity.UserPointActionLogEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -69,4 +71,6 @@ public interface UserPointActionLogDao extends BaseDao<UserPointActionLogEntity>
                                                     @Param("userId")String userId,
                                                     @Param("type")String type,
                                                     @Param("dateId")String dateId);
+
+    List<ResiPointPageResDTO> selectPageResiPoin(IcResiPointPageFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java
index 314b9b46db..b156816c80 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java
@@ -22,9 +22,11 @@ import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.UserPointActionLogDTO;
 import com.epmet.dto.form.CommonPageUserFormDTO;
+import com.epmet.dto.form.IcResiPointPageFormDTO;
 import com.epmet.dto.form.MyPointTaskFormDTO;
 import com.epmet.dto.result.MyPointTaskResultDTO;
 import com.epmet.dto.result.ResiPointLogListResultDTO;
+import com.epmet.dto.result.ResiPointPageResDTO;
 import com.epmet.entity.UserPointActionLogEntity;
 import dto.form.SendPointFormDTO;
 
@@ -143,4 +145,12 @@ public interface UserPointActionLogService extends BaseService<UserPointActionLo
      * @return Result<MyPointTaskResultDTO>
      */
     List<MyPointTaskResultDTO> queryMyPointTaskList(MyPointTaskFormDTO formDTO);
+
+    /**
+     * 数字赋能平台数据分析-个人档案-分页查询居民的积分记录
+     *
+     * @param formDTO
+     * @return
+     */
+    PageData<ResiPointPageResDTO> pageUserPoint(IcResiPointPageFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
index 50b854964d..45bbb65790 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
@@ -36,10 +36,12 @@ import com.epmet.dto.BizPointUserTotalDetailDTO;
 import com.epmet.dto.UserPointActionLogDTO;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.CommonPageUserFormDTO;
+import com.epmet.dto.form.IcResiPointPageFormDTO;
 import com.epmet.dto.form.MyPointTaskFormDTO;
 import com.epmet.dto.result.MyPointTaskResultDTO;
 import com.epmet.dto.result.ResiPointLogListResultDTO;
 import com.epmet.dto.result.ResiPointLogPeriodResultDTO;
+import com.epmet.dto.result.ResiPointPageResDTO;
 import com.epmet.entity.PointRuleEntity;
 import com.epmet.entity.UserPointActionLogEntity;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
@@ -50,6 +52,7 @@ import com.epmet.utils.DimIdGenerator;
 import com.epmet.utils.ModuleConstant;
 import com.epmet.utils.RuleCycleEnum;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Maps;
 import dto.form.SendPointFormDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -559,4 +562,20 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         });
         return list;
     }
+
+    /**
+     * 数字赋能平台数据分析-个人档案-分页查询居民的积分记录
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<ResiPointPageResDTO> pageUserPoint(IcResiPointPageFormDTO formDTO) {
+        if(org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
+            return new PageData<ResiPointPageResDTO>(new ArrayList<>(),NumConstant.ZERO);
+        }
+        PageInfo<ResiPointPageResDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectPageResiPoin(formDTO));
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/uv11__point_rule_sort.sql
similarity index 80%
rename from epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql
rename to epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/uv11__point_rule_sort.sql
index 76f4b2addd..e89e9b7f80 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/uv11__point_rule_sort.sql
@@ -2,8 +2,6 @@ alter table point_rule_default add COLUMN SORT INT(11) COMMENT '规则显示顺
 alter table point_rule add COLUMN SORT INT(11) COMMENT '规则显示顺序' AFTER ENABLED_FLAG ;
 alter table point_rule_default add COLUMN LINK_PAGE VARCHAR(32) COMMENT '链接页面' AFTER SORT ;
 alter table point_rule add COLUMN LINK_PAGE VARCHAR(32) COMMENT '链接页面' AFTER SORT ;
-alter table point_rule_default add COLUMN DISPOSABLE varchar(1) not null default '0' comment '一次性任务？1:是;0:不是' AFTER LINK_PAGE;
-alter table point_rule add COLUMN DISPOSABLE varchar(1) not null default '0' comment '一次性任务？1:是;0:不是' AFTER LINK_PAGE;
 
 update point_rule_default set sort='1001',LINK_PAGE='group' where EVENT_CODE='participate_one_topic' and DEL_FLAG='0';
 update point_rule_default set sort='1002',LINK_PAGE='group' where EVENT_CODE='publish_one_topic' and DEL_FLAG='0';
@@ -13,7 +11,7 @@ update point_rule_default set sort='1005',LINK_PAGE='group' where EVENT_CODE='le
 update point_rule_default set sort='1006',LINK_PAGE='group' where EVENT_CODE='shift_topic_to_issue' and DEL_FLAG='0';
 update point_rule_default set sort='1007',LINK_PAGE='group' where EVENT_CODE='topic_to_issue' and DEL_FLAG='0';
 update point_rule_default set sort='1008',LINK_PAGE='group' where EVENT_CODE='topic_to_project' and DEL_FLAG='0';
-update point_rule_default set sort='2001',LINK_PAGE='heart',DISPOSABLE='1' where EVENT_CODE='register_volunteer' and DEL_FLAG='0';
+update point_rule_default set sort='2001',LINK_PAGE='heart' where EVENT_CODE='register_volunteer' and DEL_FLAG='0';
 update point_rule_default set sort='2002',LINK_PAGE='heart' where EVENT_CODE='active_insert_live' and DEL_FLAG='0';
 
 
@@ -25,5 +23,5 @@ update point_rule set sort='1005',LINK_PAGE='group' where EVENT_CODE='leader_res
 update point_rule set sort='1006',LINK_PAGE='group' where EVENT_CODE='shift_topic_to_issue' and DEL_FLAG='0';
 update point_rule set sort='1007',LINK_PAGE='group' where EVENT_CODE='topic_to_issue' and DEL_FLAG='0';
 update point_rule set sort='1008',LINK_PAGE='group' where EVENT_CODE='topic_to_project' and DEL_FLAG='0';
-update point_rule set sort='2001',LINK_PAGE='heart' ,DISPOSABLE='1' where EVENT_CODE='register_volunteer' and DEL_FLAG='0';
+update point_rule set sort='2001',LINK_PAGE='heart' where EVENT_CODE='register_volunteer' and DEL_FLAG='0';
 update point_rule set sort='2002',LINK_PAGE='heart' where EVENT_CODE='active_insert_live' and DEL_FLAG='0';
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
index d2a4f0f212..c6136f2202 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
@@ -42,6 +42,22 @@
             CREATED_TIME DESC
     </select>
 
+    <select id="selectPageResiPoin" parameterType="com.epmet.dto.form.IcResiPointPageFormDTO" resultType="com.epmet.dto.result.ResiPointPageResDTO">
+        SELECT
+            ID,
+            EVENT_NAME AS title,
+            CASE ACTION_FLAG WHEN 'plus' THEN concat('+',POINT)  ELSE POINT END AS point,
+            CREATED_TIME as dateTime
+        FROM
+            USER_POINT_ACTION_LOG
+        WHERE
+            DEL_FLAG = '0'
+        <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
+            USER_ID = #{epmetUserId}
+        </foreach>
+        ORDER BY
+            CREATED_TIME DESC
+    </select>
     <!-- 查询指定用户在某条规则下所得的积分总和 -->
     <select id="selectSumByEvent" resultType="integer">
         SELECT
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java
new file mode 100644
index 0000000000..295c125f69
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainCreateProjectFormDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 区块链：创建项目form dto
+ */
+@Data
+public class BlockChainCreateProjectFormDTO {
+
+    @NotNull(message = "项目信息不能为空")
+    private BlockChainProjectFormDTO project;
+
+    @NotNull(message = "处理进展信息不能为空")
+    private BlockChainProjectProcessFormDTO process;
+
+    @NotNull(message = "指派的人员列表信息不能为空")
+    @NotEmpty(message = "指派的人员列表信息不能为空")
+    private List<BlockChainProjectProcessAssignedStaffFormDTO> assignedStaffs;
+
+}
+
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java
new file mode 100644
index 0000000000..0cf7f1caac
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProcessProjectFormDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 区块链：项目处理进展信息
+ */
+@Data
+public class BlockChainProcessProjectFormDTO {
+
+    @NotNull(message = "处理进展信息不能为空")
+    private BlockChainProjectProcessFormDTO process;
+
+    private List<BlockChainProjectProcessAssignedStaffFormDTO> assignedStaffs;
+
+    // 处理人信息更新
+    private BlockChainProjectProcessAssignedStaffFormDTO handledStaff;
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java
new file mode 100644
index 0000000000..cdfbf27b95
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectFormDTO.java
@@ -0,0 +1,63 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 区块链项目信息formdto
+ */
+@Data
+public class BlockChainProjectFormDTO {
+    @NotBlank(message = "项目ID必填")
+    private String projectId;
+    
+    @NotBlank(message = "客户ID必填")
+    private String customerId;
+    
+    // 客户名称
+    private String customerName;
+    
+    @NotBlank(message = "标题必填")
+    private String title;
+    
+    @NotBlank(message = "组织ID必填")
+    private String agencyId;
+    
+    // 组织名称
+    private String agencyName;
+    
+    @NotBlank(message = "项目来源必填")
+    private String origin;
+    
+    @NotBlank(message = "项目来源ID必填")
+    private String originId;
+    
+    @NotBlank(message = "项目状态必填")
+    private String status;
+
+    @NotBlank(message = "关闭状态必填")
+    private String closeStatus;
+
+    @NotBlank(message = "组织ID PATH必填")
+    private String orgIdPath;
+    
+    @NotBlank(message = "定位必填")
+    private String locateAddress;
+    
+    @NotBlank(message = "经度必填")
+    private String locateLongitude;
+    
+    @NotBlank(message = "维度必填")
+    private String locateDimension;
+    
+    @NotBlank(message = "创建时间必填")
+    private Date createdTime;
+    
+    @NotBlank(message = "创建者ID必填")
+    private String createdBy;
+    
+    // 创建者名字
+    private String createrName;
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java
new file mode 100644
index 0000000000..f0b82e062d
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessAssignedStaffFormDTO.java
@@ -0,0 +1,64 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 区块链：指派的项目处理人员 form dto
+ */
+@Data
+public class BlockChainProjectProcessAssignedStaffFormDTO {
+    @NotBlank(message = "ID必填")
+    private String id;
+
+    @NotBlank(message = "进展ID必填")
+    private String processId;
+
+    @NotBlank(message = "项目ID必填")
+    private String projectId;
+
+    @NotBlank(message = "客户ID必填")
+    private String customerId;
+
+    @NotBlank(message = "组织ID必填")
+    private String orgId;
+    
+    //组织名称
+    private String orgName;
+
+    @NotBlank(message = "部门ID必填")
+    private String departmentId;
+    
+    @NotBlank(message = "网格ID必填")
+    private String gridId;
+    
+    // 网格名称
+    private String gridName;
+
+    @NotBlank(message = "组织ID PATH必填")
+    private String orgIdPath;
+
+    @NotBlank(message = "人员ID必填")
+    private String staffId;
+
+    // 指派的用户名字
+    private String staffName;
+
+    @NotBlank(message = "部门名称必填")
+    private String departmentName;
+
+    @NotBlank(message = "是否处理必填")
+    private String isHandle;
+
+    @NotBlank(message = "创建者ID必填")
+    private String createdBy;
+
+    @NotBlank(message = "创建时间必填")
+    private Date createdTime;
+
+    // 创建者名字
+    private String createrName;
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java
new file mode 100644
index 0000000000..4a21f3e3db
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/BlockChainProjectProcessFormDTO.java
@@ -0,0 +1,85 @@
+package com.epmet.dto.form;
+
+
+import lombok.Data;
+
+
+import javax.validation.constraints.NotBlank;
+
+import javax.validation.constraints.NotNull;
+
+import java.util.Date;
+
+
+/**
+ * 区块链：项目处理form dto
+ */
+@Data
+public class BlockChainProjectProcessFormDTO {
+    @NotBlank(message = "处理ID必填")
+    private String processId;
+    
+    @NotBlank(message = "项目ID必填")
+    private String projectId;
+    
+    @NotBlank(message = "客户ID必填")
+    private String customerId;
+    
+    @NotBlank(message = "部门名称必填")
+    private String departmentName;
+    
+    @NotBlank(message = "组织ID必填")
+    private String agencyId;
+    
+    // 组织的ID
+    private String agencyName;
+    
+    @NotBlank(message = "部门ID必填")
+    private String departmentId;
+    
+    @NotBlank(message = "网格ID必填")
+    private String gridId;
+    
+    // 网格的名称
+    private String gridName;
+    
+    @NotBlank(message = "组织ID PATH必填")
+    private String orgIdPath;
+    
+    @NotBlank(message = "处理人员ID必填")
+    private String staffId;
+    
+    // 工作人员名字
+    private String staffName;
+    
+    @NotBlank(message = "操作类型必填")
+    private String operation;
+    
+    @NotBlank(message = "操作名称必填")
+    private String operationName;
+    
+    @NotBlank(message = "公开答复必填")
+    private String publicReply;
+    
+    @NotBlank(message = "内部备注必填必填")
+    private String internalRemark;
+    
+    @NotNull(message = "结束时间必填")
+    private Date endTime;
+    
+    @NotNull(message = "是否发送到外部系统必填")
+    private Integer isSend;
+    
+    @NotNull(message = "耗费天数必填")
+    private String costWorkDays;
+    
+    @NotBlank(message = "创建者ID必填")
+    private String createdBy;
+
+    // 创建者名字
+    private String createrName;
+    
+    @NotNull(message = "创建时间必填")
+    private Date createdTime;
+    
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
index f71914f828..22a8c36c5a 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdOpenFeignClient.java
@@ -25,8 +25,8 @@ import java.util.List;
  * @author zhaoqifeng
  * @date 2021/3/18 14:18
  */
-// @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class,configuration =
-//		 EpmetThirdOpenFeignClient.MultipartSupportConfig.class,url = "localhost:8110")
+ //@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class,configuration =
+	//	 EpmetThirdOpenFeignClient.MultipartSupportConfig.class,url = "localhost:8110")
 @FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallbackFactory = EpmetThirdOpenFeignClientFallbackFactory.class, configuration =
 		EpmetThirdOpenFeignClient.MultipartSupportConfig.class)
 public interface EpmetThirdOpenFeignClient {
@@ -54,6 +54,23 @@ public interface EpmetThirdOpenFeignClient {
 	Result<UploadFileResultDTO> uploadFile(@RequestPart("file") MultipartFile file, @RequestParam("customerId") String customerId, @RequestParam(
 			"platformId") String platformId);
 
+
+	/**
+	 * 区块链：立项
+	 * @param input
+	 * @return
+	 */
+	@PostMapping("/third/blockchain/project/create")
+	Result blockChainCreateProject(@RequestBody BlockChainCreateProjectFormDTO input);
+
+	/**
+	 * 区块链：处理进展
+	 * @param input
+	 * @return
+	 */
+	@PostMapping("/third/blockchain/project/process")
+	Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input);
+
 	class MultipartSupportConfig {
 		@Bean
 		public Encoder feignFormEncoder() {
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
index e855799478..e257b0347b 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdOpenFeignClientFallback.java
@@ -49,4 +49,14 @@ public class EpmetThirdOpenFeignClientFallback implements EpmetThirdOpenFeignCli
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "uploadFile", customerId);
 	}
 
+	@Override
+	public Result blockChainCreateProject(BlockChainCreateProjectFormDTO input) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "createProject", input);
+	}
+
+	@Override
+	public Result blockChainProcessProject(BlockChainProcessProjectFormDTO input) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "processProject", input);
+	}
+
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index a57a1bcfcf..121cb6460b 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -146,6 +146,18 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- rocketmq -->
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-client</artifactId>
+            <version>4.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-acl</artifactId>
+            <version>4.9.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -208,6 +220,16 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
                 </dingTalk.robot.secret>
+                
+                <!-- epmet-cloud内部用的rocketmq配置 -->
+                <!--<rocketmq.epmet-cloud-inner.enable>true</rocketmq.epmet-cloud-inner.enable>
+                <rocketmq.epmet-cloud-inner.name-server>192.168.1.140:9876;192.168.1.141:9876</rocketmq.epmet-cloud-inner.name-server>-->
+
+                <!-- 区块链用的rocketmq配置 -->
+                <rocketmq.block-chain.enable>true</rocketmq.block-chain.enable>
+                <rocketmq.block-chain.name-server>192.168.1.144:9876</rocketmq.block-chain.name-server>
+                <rocketmq.block-chain.access-key>EpmetCloud</rocketmq.block-chain.access-key>
+                <rocketmq.block-chain.secret-key>12345678</rocketmq.block-chain.secret-key>
             </properties>
         </profile>
         <profile>
@@ -248,6 +270,16 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
                 </dingTalk.robot.secret>
+
+                <!-- epmet-cloud内部用的rocketmq配置 -->
+                <!--<rocketmq.epmet-cloud-inner.enable>true</rocketmq.epmet-cloud-inner.enable>
+                <rocketmq.epmet-cloud-inner.name-server>192.168.1.140:9876;192.168.1.141:9876</rocketmq.epmet-cloud-inner.name-server>-->
+
+                <!-- 区块链用的rocketmq配置 -->
+                <rocketmq.block-chain.enable>true</rocketmq.block-chain.enable>
+                <rocketmq.block-chain.name-server>192.168.1.144:9876</rocketmq.block-chain.name-server>
+                <rocketmq.block-chain.access-key>EpmetCloud</rocketmq.block-chain.access-key>
+                <rocketmq.block-chain.secret-key>12345678</rocketmq.block-chain.secret-key>
             </properties>
         </profile>
         <profile>
@@ -288,6 +320,16 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
                 </dingTalk.robot.secret>
+
+                <!-- epmet-cloud内部用的rocketmq配置 -->
+                <!--<rocketmq.epmet-cloud-inner.enable>false</rocketmq.epmet-cloud-inner.enable>
+                <rocketmq.epmet-cloud-inner.name-server>192.168.10.161:9876</rocketmq.epmet-cloud-inner.name-server>-->
+
+                <!-- 区块链用的rocketmq配置 -->
+                <rocketmq.block-chain.enable>false</rocketmq.block-chain.enable>
+                <rocketmq.block-chain.name-server></rocketmq.block-chain.name-server>
+                <rocketmq.block-chain.access-key></rocketmq.block-chain.access-key>
+                <rocketmq.block-chain.secret-key></rocketmq.block-chain.secret-key>
             </properties>
         </profile>
 
@@ -330,6 +372,16 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
                 </dingTalk.robot.secret>
+
+                <!-- epmet-cloud内部用的rocketmq配置 -->
+                <!--<rocketmq.epmet-cloud-inner.enable>true</rocketmq.epmet-cloud-inner.enable>
+                <rocketmq.epmet-cloud-inner.name-server>192.168.11.187:9876;192.168.11.184:9876</rocketmq.epmet-cloud-inner.name-server>-->
+
+                <!-- 区块链用的rocketmq配置 -->
+                <rocketmq.block-chain.enable>false</rocketmq.block-chain.enable>
+                <rocketmq.block-chain.name-server></rocketmq.block-chain.name-server>
+                <rocketmq.block-chain.access-key></rocketmq.block-chain.access-key>
+                <rocketmq.block-chain.secret-key></rocketmq.block-chain.secret-key>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java
index f2072e4efc..3a7ba889a3 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java
@@ -1,11 +1,14 @@
 package com.epmet;
 
+import com.epmet.mq.properties.RocketMQProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
+@EnableConfigurationProperties(RocketMQProperties.class)
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java
new file mode 100644
index 0000000000..75701ac62a
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java
@@ -0,0 +1,47 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.BlockChainCreateProjectFormDTO;
+import com.epmet.dto.form.BlockChainProcessProjectFormDTO;
+import com.epmet.service.BlockChainProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * 区块链project相关controller
+ */
+@RestController
+@RequestMapping("/blockchain/project")
+public class BlockChainProjectController {
+
+    @Autowired
+    private BlockChainProjectService blockChainProjectService;
+    
+    /**
+     * 立项
+     * @param input
+     * @return
+     */
+    @PostMapping("create")
+    public Result blockChainCreateProject(@RequestBody BlockChainCreateProjectFormDTO input) {
+        //ValidatorUtils.validateEntity(input);
+        //blockChainProjectService.blockChainCreateProject(input);
+        return new Result();
+    }
+
+    /**
+     * 处理进展
+     * @param input
+     * @return
+     */
+    @PostMapping("process")
+    public Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input) {
+        //ValidatorUtils.validateEntity(input);
+        //blockChainProjectService.blockChainProcessProject(input);
+        return new Result();
+    }
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
index 1ddf6cbc40..54c7cc7ca3 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java
@@ -28,7 +28,7 @@ public class ThirdPlatformController {
     private ThirdPlatformService thirdPlatformService;
 
     /**
-     * 根据客户id和动作，列出客户登记可用的第三方平台
+     * 根据客户id和动作，列出客户在指定动作下可用的第三方平台
      * 用途：工作端，运营端配置界面
      *
      * @param input
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java
new file mode 100644
index 0000000000..3ec172b7a6
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/producer/BlockChainProducer.java
@@ -0,0 +1,98 @@
+package com.epmet.mq.producer;
+
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.mq.properties.RocketMQProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.acl.common.AclClientRPCHook;
+import org.apache.rocketmq.acl.common.SessionCredentials;
+import org.apache.rocketmq.client.exception.MQClientException;
+import org.apache.rocketmq.client.producer.DefaultMQProducer;
+import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.rocketmq.client.producer.SendStatus;
+import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.remoting.common.RemotingHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+/**
+ * @Description 描述
+ * @Author wangxianzhang
+ * @Date 2021/11/26 12:33 下午
+ * @Version 1.0
+ */
+@Component
+@Slf4j
+public class BlockChainProducer {
+
+    /**
+     * topic
+     */
+    public static final String TOPIC_PROJECT = "project";
+    public static final String TOPIC_AUTH = "auth";
+
+    /**
+     * tag
+     */
+    public static final String TAG_SEND_PROJECT = "send_project";
+    // 发送处理进展
+    public static final String TAG_SEND_PROCESS = "send_process";
+    // 发送流转过程中被指派的人员
+    public static final String TAG_SEND_ASSIGNED_STAFFS = "send_assigned_staffs";
+    // 发送处理完成的人员
+    public static final String TAG_SEND_HANDLED_STAFF = "send_handled_staff";
+
+    /**
+     * 组
+     */
+    public static final String GROUP_EPMET_CLOUD_PROJECT_SENDER = "epmet_cloud_project_sender";
+
+    private DefaultMQProducer producer;
+
+    @Autowired
+    private RocketMQProperties rocketMQProperties;
+
+    @PostConstruct
+    private void postConstruct() {
+        try {
+            producer = new DefaultMQProducer(GROUP_EPMET_CLOUD_PROJECT_SENDER,
+                    new AclClientRPCHook(new SessionCredentials(rocketMQProperties.getBlockChain().getAccessKey(), rocketMQProperties.getBlockChain().getSecretKey())));
+            producer.setNamesrvAddr(rocketMQProperties.getBlockChain().getNameServer());
+            producer.start();
+        } catch (MQClientException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 销毁producer
+     */
+    @PreDestroy
+    private void preDestroy() {
+        producer.shutdown();
+    }
+
+    /**
+     * 发送消息
+     *
+     * @param topic
+     * @param tag
+     */
+    public void sendMsg(String topic, String tag, String content) {
+        try {
+            Message msg = new Message(topic, tag, content.getBytes(RemotingHelper.DEFAULT_CHARSET));
+            SendResult sendResult = producer.send(msg);
+            if (SendStatus.SEND_OK == sendResult.getSendStatus()
+                    || SendStatus.SLAVE_NOT_AVAILABLE == sendResult.getSendStatus()) {
+                log.info("消息发送区块链MQ成功, topic:{}, tag:{}, content:{}", topic, tag, content);
+            } else {
+                log.error("消息发送区块链MQ失败, topic:{}, tag:{}, content:{}, status: {}", topic, tag, content, sendResult.getSendStatus());
+            }
+        } catch (Exception e) {
+            log.error("消息发送区块链MQ出错, topic:{}, tag:{}, content:{}, 错误信息:{]", topic, tag, content, ExceptionUtils.getErrorStackTrace(e));
+        }
+    }
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/properties/RocketMQProperties.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/properties/RocketMQProperties.java
new file mode 100644
index 0000000000..7c2394ca7d
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/mq/properties/RocketMQProperties.java
@@ -0,0 +1,33 @@
+package com.epmet.mq.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * @Description 描述
+ * @Author wangxianzhang
+ * @Date 2021/11/26 10:03 上午
+ * @Version 1.0
+ */
+@ConfigurationProperties(prefix = "rocketmq")
+@Data
+public class RocketMQProperties {
+
+    // 这里必须new出对象来才能成功封装
+    private EpmetCloudInnerProperties epmetCloudInner = new EpmetCloudInnerProperties();
+    private BlockChainProperties blockChain = new BlockChainProperties();
+
+    @Data
+    public class EpmetCloudInnerProperties {
+        private Boolean enable;
+        private String nameServer;
+    }
+
+    @Data
+    public class BlockChainProperties {
+        private Boolean enable;
+        private String nameServer;
+        private String accessKey;
+        private String secretKey;
+    }
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/BlockChainProjectService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/BlockChainProjectService.java
new file mode 100644
index 0000000000..95f1bfd151
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/BlockChainProjectService.java
@@ -0,0 +1,14 @@
+package com.epmet.service;
+
+import com.epmet.dto.form.BlockChainCreateProjectFormDTO;
+import com.epmet.dto.form.BlockChainProcessProjectFormDTO;
+
+/**
+ * 区块链：项目service
+ */
+public interface BlockChainProjectService {
+    
+    void blockChainCreateProject(BlockChainCreateProjectFormDTO input);
+    void blockChainProcessProject(BlockChainProcessProjectFormDTO input);
+    
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java
new file mode 100644
index 0000000000..36db95499d
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/BlockChainProjectServiceImpl.java
@@ -0,0 +1,204 @@
+package com.epmet.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.form.*;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.feign.OperCrmOpenFeignClient;
+import com.epmet.mq.producer.BlockChainProducer;
+import com.epmet.mq.properties.RocketMQProperties;
+import com.epmet.service.BlockChainProjectService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @Description 描述
+ * @Author wangxianzhang
+ * @Date 2021/11/26 9:59 上午
+ * @Version 1.0
+ */
+@Service
+public class BlockChainProjectServiceImpl implements BlockChainProjectService, ResultDataResolver {
+
+    @Autowired
+    private BlockChainProducer blockChainProducer;
+    
+    @Autowired
+    private OperCrmOpenFeignClient operCrmOpenFeignClient;
+    
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    
+    @Autowired
+    private EpmetUserOpenFeignClient userOpenFeignClient;
+    
+    @Override
+    public void blockChainCreateProject(BlockChainCreateProjectFormDTO input) {
+
+        BlockChainProjectFormDTO project = input.getProject();
+        BlockChainProjectProcessFormDTO process = input.getProcess();
+        List<BlockChainProjectProcessAssignedStaffFormDTO> assignedStaffs = input.getAssignedStaffs();
+
+        fill(project, process, assignedStaffs, null);
+
+        String projectString = JSON.toJSONString(project);
+        String processString = JSON.toJSONString(process);
+        String assignedStaffsString = JSON.toJSONString(assignedStaffs);
+
+        blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROJECT, projectString);
+        blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString);
+        blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString);
+    }
+
+    /**
+     * 填充数据
+     * @param project
+     * @param process
+     */
+    private void fill(BlockChainProjectFormDTO project, BlockChainProjectProcessFormDTO process, 
+                      List<BlockChainProjectProcessAssignedStaffFormDTO> assignedStaffs, BlockChainProjectProcessAssignedStaffFormDTO handledStaff) {
+        
+        // 一.填充project信息
+        
+        if (project != null) {
+            // 客户信息
+            CustomerDTO customerDTO = new CustomerDTO();
+            customerDTO.setId(project.getCustomerId());
+            CustomerDTO customerInfo = getResultDataOrThrowsException(operCrmOpenFeignClient.getCustomerInfo(customerDTO),
+                    ServiceConstant.EPMET_THIRD_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询客户信息失败", null);
+
+            // 组织信息
+            CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(project.getAgencyId()),
+                    ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询Agency信息失败", null);
+
+            // 用户信息
+            CustomerStaffDTO customerStaffDTO = new CustomerStaffDTO();
+            customerStaffDTO.setUserId(project.getCreatedBy());
+            CustomerStaffDTO staffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(customerStaffDTO),
+                    ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询用户信息失败", null);
+
+            project.setCustomerName(customerInfo.getCustomerName());
+            project.setAgencyName(agencyInfo.getOrganizationName());
+            Optional.of(staffInfo).ifPresent((staff) -> project.setCreaterName(staff.getRealName()));
+        }
+        
+        // 二.填充进展信息
+        
+        if (process != null) {
+            
+            if (StringUtils.isNotBlank(process.getAgencyId())) {
+                // 组织信息
+                CustomerAgencyDTO processAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(process.getAgencyId()),
+                        ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点Agency信息失败", null);
+                
+                process.setAgencyName(processAgencyInfo.getOrganizationName());
+            }
+
+            // 网格信息
+            if (StringUtils.isNotBlank(process.getGridId())) {
+                CustomerGridFormDTO processGridFormDTO = new CustomerGridFormDTO();
+                processGridFormDTO.setGridId(process.getGridId());
+                CustomerGridDTO processGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(processGridFormDTO),
+                        ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点网格信息失败", null);
+                
+                Optional.of(processGridInfo).ifPresent((grid) -> process.setGridName(grid.getGridName()));
+            }
+
+            // 用户信息
+            CustomerStaffDTO processCustomerStaffDTO = new CustomerStaffDTO();
+            processCustomerStaffDTO.setUserId(process.getStaffId());
+            CustomerStaffDTO processStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(processCustomerStaffDTO),
+                    ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询处理节点用户信息失败", null);
+
+            process.setStaffName(processStaffInfo.getRealName());
+            process.setCreatedBy(processStaffInfo.getRealName());
+
+        }
+        
+        // 三.填充指派用户信息
+        if (assignedStaffs != null) {
+            for (BlockChainProjectProcessAssignedStaffFormDTO assignedStaff : assignedStaffs) {
+                fillAssignedStaffInfo(assignedStaff);
+            }
+        }
+        
+        // 4.填充当前处理人信息
+        if (handledStaff != null) {
+            fillAssignedStaffInfo(handledStaff);
+        }
+    }
+
+    /**
+     * 填充被指派人的信息
+     * @param assignedStaff
+     */
+    private void fillAssignedStaffInfo(BlockChainProjectProcessAssignedStaffFormDTO assignedStaff) {
+        // 组织信息
+        if (StringUtils.isNotBlank(assignedStaff.getOrgId())) {
+            CustomerAgencyDTO assignedStaffAgencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(assignedStaff.getOrgId()),
+                    ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员组织信息失败", null);
+
+            assignedStaff.setOrgName(assignedStaffAgencyInfo.getOrganizationName());
+        }
+
+        // 网格信息
+        if (StringUtils.isNotBlank(assignedStaff.getGridId())) {
+            CustomerGridFormDTO assignedStaffGridFormDTO = new CustomerGridFormDTO();
+            assignedStaffGridFormDTO.setGridId(assignedStaff.getGridId());
+            CustomerGridDTO assignedStaffProcessGridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(assignedStaffGridFormDTO),
+                    ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派人员网格信息失败", null);
+
+            Optional.of(assignedStaffProcessGridInfo).ifPresent((gridOfStaff) -> assignedStaff.setGridName(gridOfStaff.getGridName()));
+        }
+
+        // 指派用户
+        CustomerStaffDTO assignedStaffDTO = new CustomerStaffDTO();
+        assignedStaffDTO.setUserId(assignedStaff.getStaffId());
+        CustomerStaffDTO assignedStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(assignedStaffDTO),
+                ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败", null);
+
+        assignedStaff.setStaffName(assignedStaffInfo.getRealName());
+
+        // 创建者
+        CustomerStaffDTO createStaffDTO = new CustomerStaffDTO();
+        createStaffDTO.setUserId(assignedStaff.getCreatedBy());
+        CustomerStaffDTO createStaffInfo = getResultDataOrThrowsException(userOpenFeignClient.getCustomerStaffInfoByUserId(createStaffDTO),
+                ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【项目信息上链】查询指派用户信息失败", null);
+
+        Optional.of(createStaffInfo).ifPresent((createStaff) -> assignedStaff.setCreaterName(createStaffInfo.getRealName()));
+    }
+
+    @Override
+    public void blockChainProcessProject(BlockChainProcessProjectFormDTO input) {
+
+        BlockChainProjectProcessFormDTO process = input.getProcess();
+        List<BlockChainProjectProcessAssignedStaffFormDTO> assignedStaffs = input.getAssignedStaffs();
+        BlockChainProjectProcessAssignedStaffFormDTO handledStaff = input.getHandledStaff();
+
+        fill(null, process, assignedStaffs, handledStaff);
+        
+        String processString = JSON.toJSONString(process);
+        blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString);
+        
+        if (assignedStaffs != null && assignedStaffs.size() > 0) {
+            String assignedStaffsString = JSON.toJSONString(assignedStaffs);
+            blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString);
+        }
+
+        if (handledStaff != null) {
+            String handledStaffString = JSON.toJSONString(handledStaff);
+            blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_HANDLED_STAFF, handledStaffString);
+        }
+    }
+}
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
index 0dc793c264..1ad3de55ca 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
@@ -149,3 +149,15 @@ shutdown:
   graceful:
     enable: true #是否开启优雅停机
     waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警
+
+rocketmq:
+  #  epmet-cloud集群内部用的rocketmq
+#  epmet-cloud-inner:
+#    enable: @rocketmq.epmet-cloud-inner.enable@
+#    name-server: @rocketmq.epmet-cloud-inner.name-server@
+  # 区块链对接用的rocketmq
+  block-chain:
+    enable: @rocketmq.block-chain.enable@
+    name-server: @rocketmq.block-chain.name-server@
+    access-key: @rocketmq.block-chain.access-key@
+    secret-key: @rocketmq.block-chain.secret-key@
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java
index 1bd4fc67bc..e6c8ca205c 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java
@@ -21,7 +21,7 @@ public class MenuConfigFormDTO implements Serializable {
 
     /**
      * 客户id 列表
+     *  列表为空，则所有客户都不配置这个菜单了。
      */
-    @NotBlank(message = "客户id 列表不能为空")
     private List<String> customerIds;
 }
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java
index 32cf57e0c7..8d7ef26acc 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java
@@ -106,9 +106,8 @@ public class GovCustomerMenuServiceImpl extends BaseServiceImpl<GovCustomerMenuD
 
     @Override
     public void saveCustomerMenu(MenuConfigFormDTO formDTO) {
+        baseDao.deleteBatchTableIds(formDTO.getTableId());
         if (NumConstant.ZERO < formDTO.getCustomerIds().size()) {
-            baseDao.deleteBatchTableIds(formDTO.getTableId());
-
             List<GovCustomerMenuEntity> entities = new ArrayList<>();
             for (String customerId : formDTO.getCustomerIds()) {
                 GovCustomerMenuEntity entity = new GovCustomerMenuEntity();
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java
index a93a616cbf..83920372a1 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java
@@ -113,4 +113,9 @@ public class IssueProjectCategoryDictDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 颜色
+     */
+    private String colour;
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzFormDTO.java
new file mode 100644
index 0000000000..1ee04f0858
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzFormDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/8 3:29 下午
+ * @DESC
+ */
+@Data
+public class ResiBuzzFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 7477325476668438447L;
+
+    public interface ResiBuzzForm{}
+
+    private String orgId;
+
+    private String orgType;
+
+    /**
+     * 表决中：voting 已转项目：shift_project 已关闭：closed，全部：all
+     */
+    @NotBlank(message = "status不能为空",groups = ResiBuzzForm.class)
+    private String status;
+
+    @NotNull(message = "pageSize不能为空",groups = ResiBuzzForm.class)
+    private Integer pageSize;
+
+    @NotNull(message = "pageNo不能为空",groups = ResiBuzzForm.class)
+    private Integer pageNo;
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzLeftPieChartFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzLeftPieChartFormDTO.java
new file mode 100644
index 0000000000..a8b2cae5dd
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ResiBuzzLeftPieChartFormDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/9 9:53 上午
+ * @DESC
+ */
+@Data
+public class ResiBuzzLeftPieChartFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7312573663758331220L;
+
+    /**
+     * 组织ID
+     */
+    private String orgId;
+
+    /**
+     * 组织类型，agency：组织，grid：网格
+     */
+    private String orgType;
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java
new file mode 100644
index 0000000000..dea3653428
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/7 1:40 下午
+ * @DESC
+ */
+@Data
+public class CategoryListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6788749110947073314L;
+
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+
+    /**
+     * 分类名字
+     */
+    private String categoryName;
+
+    private Integer count;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 1级分类长度
+     */
+    private Integer codeLength;
+
+    public CategoryListResultDTO() {
+        this.categoryCode = "";
+        this.categoryName = "";
+        this.count = NumConstant.ZERO;
+        this.codeLength = NumConstant.ZERO;
+        this.color = "";
+    }
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
index c2dbdb85eb..f63ea2d492 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -49,4 +51,6 @@ public class IssueResultDTO implements Serializable {
      */
     private String gridName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date shiftIssueTime;
 }
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java
new file mode 100644
index 0000000000..c2c0960c0a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzDTO.java
@@ -0,0 +1,100 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/8 3:37 下午
+ * @DESC
+ */
+@Data
+public class ResiBuzzDTO implements Serializable {
+
+    private static final long serialVersionUID = -1844581181580474374L;
+
+    @JsonIgnore
+    private String createdBy;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    /**
+     * 建议
+     */
+    private String suggestion;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    private String createdTime;
+
+    /**
+     * 支持个数
+     */
+    private Integer supportCount;
+
+    /**
+     * 反对个数
+     */
+    private Integer oppositionCount;
+
+    /**
+     * 表决占比
+     */
+    private String voteAccount;
+
+    /**
+     * 议题发起人
+     */
+    private String issueOriginator;
+
+    /**
+     * 分类名字
+     */
+    private List<String> categoryName;
+
+    public ResiBuzzDTO() {
+        this.createdBy = "";
+        this.sort = NumConstant.ZERO;
+        this.issueTitle = "";
+        this.issueId = "";
+        this.suggestion = "";
+        this.status = "";
+        this.createdTime = "";
+        this.supportCount = NumConstant.ZERO;
+        this.oppositionCount = NumConstant.ZERO;
+        this.voteAccount = "";
+        this.issueOriginator = "";
+        this.categoryName = getDefaultCategoryName();
+    }
+
+    @JsonIgnore
+    public List<String> getDefaultCategoryName(){
+        List<String> list = new ArrayList<>();
+        list.add("其他");
+        return list;
+    }
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java
new file mode 100644
index 0000000000..22ae365945
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java
@@ -0,0 +1,46 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/9 9:56 上午
+ * @DESC
+ */
+@Data
+public class ResiBuzzLeftPieChartResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4673540577019002156L;
+
+    /**
+     * 数量
+     */
+    private Integer count;
+
+    /**
+     * 分类编码
+     */
+    @JsonIgnore
+    private String categoryCode;
+
+    /**
+     * 分类名字
+     */
+    private String categoryName;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    public ResiBuzzLeftPieChartResultDTO() {
+        this.count = NumConstant.ZERO;
+        this.categoryCode = "";
+        this.categoryName = "";
+        this.color = "";
+    }
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzResultDTO.java
new file mode 100644
index 0000000000..4f4236d2bb
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzResultDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/8 3:36 下午
+ * @DESC
+ */
+@Data
+public class ResiBuzzResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4914999826185811915L;
+
+    private Integer total;
+
+    private List<ResiBuzzDTO> list;
+
+    public ResiBuzzResultDTO() {
+        this.total = NumConstant.ZERO;
+        this.list = new ArrayList<>();
+    }
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
index 5e57fa2007..93f897586e 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
@@ -1,11 +1,15 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.IssueApplicationDTO;
+import com.epmet.dto.IssueDTO;
+import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack;
 import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBackFactory;
 import com.epmet.project.dto.CustomerCategoryDTO;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
@@ -341,4 +345,31 @@ public interface GovIssueOpenFeignClient {
 
 	@PostMapping("/gov/issue/issue/unresolvedlist")
 	Result<List<UnResolvedResultDTO>> getUnresolvedList(@RequestBody ShiftProjectListFromDTO formDTO);
+
+	/**
+	 * @Description  根据客户查询1级分类
+	 * @param tokenDto
+	 * @author zxc
+	 * @date 2021/12/7 2:05 下午
+	 */
+	@PostMapping(value = "/gov/issue/issueprojectcategorydict/categorylist")
+	Result<List<CategoryListResultDTO>> selectCategoryOneLevelListByCustomerId(@LoginUser TokenDto tokenDto);
+
+	/**
+	 * @Description  查询组织下每个网格的项目数
+	 * @param formDTO
+	 * @author zxc
+	 * @date 2021/12/9 2:59 下午
+	 */
+	@PostMapping(value = "/gov/issue/issue/projectcountbygrid")
+	Result<List<ProjectDistributionAnalysisRightDTO>> getProjectCountByGrid(@RequestBody ProjectDistributionAnalysisFormDTO formDTO);
+
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Description 批量查询分类信息
+	 * @Author yinzuomei
+	 **/
+	@PostMapping(value = "/gov/issue/issueprojectcategorydict/getcategorylist")
+	public Result<List<IssueProjectCategoryDictDTO>> getCategoryList(@RequestBody IssueProjectCategoryDictListFormDTO formDTO);
 }
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
index 8bc43defbc..5e59dc20fe 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
@@ -1,8 +1,12 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.IssueApplicationDTO;
+import com.epmet.dto.IssueDTO;
+import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -19,7 +23,6 @@ import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
 import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO;
 import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;
@@ -281,4 +284,25 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<List<UnResolvedResultDTO>> getUnresolvedList(ShiftProjectListFromDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getUnresolvedList", formDTO);
 	}
+
+    @Override
+    public Result<List<CategoryListResultDTO>> selectCategoryOneLevelListByCustomerId(TokenDto tokenDto) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "selectCategoryOneLevelListByCustomerId", tokenDto);
+    }
+
+    @Override
+    public Result<List<ProjectDistributionAnalysisRightDTO>> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectCountByGrid", formDTO);
+    }
+
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Description 批量查询分类信息
+	 * @Author yinzuomei
+	 **/
+	@Override
+	public Result<List<IssueProjectCategoryDictDTO>> getCategoryList(IssueProjectCategoryDictListFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryList", formDTO);
+	}
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
index cec85e03e5..55f1348b44 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
@@ -1,5 +1,7 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.IssueDTO;
@@ -284,5 +286,41 @@ public class IssueController {
         return new Result<List<UnResolvedResultDTO>>().ok(issueService.getUnResolvedList(formDTO));
     }
 
+    /**
+     * @Description  居民热议列表
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/8 3:50 下午
+     */
+    @PostMapping("resibuzz")
+    public Result<ResiBuzzResultDTO> resiBuzz(@RequestBody ResiBuzzFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, ResiBuzzFormDTO.ResiBuzzForm.class);
+        return new Result<ResiBuzzResultDTO>().ok(issueService.resiBuzz(formDTO,tokenDto));
+    }
+
+    /**
+     * @Description  居民热议左边饼图
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/9 10:03 上午
+     */
+    @PostMapping("resibuzz-leftpiechart")
+    public Result<List<ResiBuzzLeftPieChartResultDTO>> resiBuzzLeftPieChart(@RequestBody ResiBuzzLeftPieChartFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        return new Result<List<ResiBuzzLeftPieChartResultDTO>>().ok(issueService.resiBuzzLeftPieChart(formDTO,tokenDto));
+    }
+
+    /**
+     * @Description  查询组织下每个网格的项目数
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/9 2:59 下午
+     */
+    @PostMapping("projectcountbygrid")
+    public Result<List<ProjectDistributionAnalysisRightDTO>> getProjectCountByGrid(@RequestBody ProjectDistributionAnalysisFormDTO formDTO){
+        return new Result<List<ProjectDistributionAnalysisRightDTO>>().ok(issueService.getProjectCountByGrid(formDTO));
+    }
+
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
index 4a684d8ef2..f77f9ce9d9 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
@@ -277,5 +277,16 @@ public class IssueProjectCategoryDictController {
         return new Result<List<ProjectCategoryDisPoseResultDTO>>().ok(issueProjectCategoryDictService.getProjectCategory(list));
     }
 
+    /**
+     * @Description  根据客户ID查询一级分类列表
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/7 1:45 下午
+     */
+    @PostMapping("categorylist")
+    public Result<List<CategoryListResultDTO>> selectCategoryOneLevelListByCustomerId(@LoginUser TokenDto tokenDto){
+        return new Result<List<CategoryListResultDTO>>().ok(issueProjectCategoryDictService.selectCategoryOneLevelListByCustomerId(tokenDto.getCustomerId()));
+    }
+
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
index be1c4ee25b..a853364839 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
@@ -225,4 +225,41 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @return java.util.List<com.epmet.dto.result.UnResolvedResultDTO>
      */
     List<UnResolvedResultDTO> selectUnResolvedList(@Param("gridId") String gridId);
+
+    /**
+     * @Description  查询表决前50名
+     * @param orgId
+     * @param orgType
+     * @param status
+     * @author zxc
+     * @date 2021/12/8 4:08 下午
+     */
+    List<ResiBuzzDTO> selectIssueLimit50(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("status")String status,@Param("length")Integer length);
+
+    /**
+     * @Description  查询客户下1级分类的长度
+     * @param customerId
+     * @author zxc
+     * @date 2021/12/9 10:28 上午
+     */
+    Integer selectOneLevelCategoryLength(@Param("customerId")String customerId);
+
+    /**
+     * @Description  查询居民热议左侧饼图
+     * @param orgId
+     * @param orgType
+     * @param length
+     * @author zxc
+     * @date 2021/12/9 10:57 上午
+     */
+    List<ResiBuzzLeftPieChartResultDTO> resiBuzzLeftPieChart(@Param("orgId")String orgId,@Param("orgType")String orgType,@Param("length")Integer length,@Param("customerId")String customerId);
+
+    /**
+     * @Description  查询组织下每个网格的项目数
+     * @param orgId
+     * @author zxc
+     * @date 2021/12/9 2:59 下午
+     */
+    List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(@Param("orgId")String orgId,@Param("startDate")String startDate,@Param("endDate")String endDate);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
index 6d2ad46fa8..50a93b4bef 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
@@ -22,6 +22,7 @@ import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.IsDisableCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
+import com.epmet.dto.result.CategoryListResultDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.CustomerCategoryResultDTO;
 import com.epmet.dto.result.ProjectCategoryDisPoseResultDTO;
@@ -183,4 +184,12 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      */
     List<ProjectCategoryDisPoseResultDTO> getProjectCategory(@Param("list") List<ProjectCategoryDisPoseResultDTO> list,@Param("customerId") String customerId);
 
+    /**
+     * @Description  根据客户ID查询一级分类列表
+     * @param customerId
+     * @author zxc
+     * @date 2021/12/7 1:45 下午
+     */
+    List<CategoryListResultDTO> selectCategoryOneLevelListByCustomerId(@Param("customerId")String customerId);
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java
index b99f37a2bf..0a05d29091 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java
@@ -83,4 +83,9 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity {
 	 */
 	private String isDisable;
 
+	/**
+	 * 颜色
+	 */
+	private String color;
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index f1b7e8f04f..adc4a8935b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -102,6 +102,7 @@ public class IssueProjectTagDictRedis {
 
         //查询客户的“其他"分类的Id
         IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null);
+        //是否传入的类别Id中只包含"其他"分类，因为自定义分类和默认分类排序规则不一样
         //判断入参是否是只有一个分类Id并且是"其他"的Id
         boolean ifOtherOnly = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false);
 
@@ -409,6 +410,18 @@ public class IssueProjectTagDictRedis {
         redisUtils.zSetAdd(key,o);
     }
 
+    /**
+     * @Description 给客户下的分类/标签批量增加/减少热度
+     * param   :
+     *              key     : 0  代表减一     1 代表加一
+     *              value   :
+     *                          key     : 某一客户下分类/标签的redisKey
+     *                          value  :  需要修改的分类/标签
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2021.03.20 01:04
+    */
     public void batchIncrScore(Map<String,Map<String,List<IssueCategoryTagResultDTO>>> param){
         if(CollectionUtils.isEmpty(param)) return;
         redisTemplate.executePipelined((RedisCallback) connection -> {
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
index abd4e63d38..292e6449d8 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
@@ -221,4 +221,13 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @date 2021/5/17 1:51 下午
      */
     List<ProjectCategoryDisPoseResultDTO> getProjectCategory(List<ProjectCategoryDisPoseResultDTO> list);
+
+    /**
+     * @Description  根据客户ID查询一级分类列表
+     * @param customerId
+     * @author zxc
+     * @date 2021/12/7 1:45 下午
+     */
+    List<CategoryListResultDTO> selectCategoryOneLevelListByCustomerId(String customerId);
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
index af7ec1b7a5..4eca209b95 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
@@ -350,4 +350,31 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @return java.util.List<com.epmet.dto.result.UnResolvedResultDTO>
      */
     List<UnResolvedResultDTO> getUnResolvedList(ShiftProjectListFromDTO fromDTO);
+
+    /**
+     * @Description  居民热议列表
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/8 3:50 下午
+     */
+    ResiBuzzResultDTO resiBuzz(ResiBuzzFormDTO formDTO , TokenDto tokenDto);
+
+    /**
+     * @Description  居民热议左边饼图
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/9 10:03 上午
+     */
+    List<ResiBuzzLeftPieChartResultDTO> resiBuzzLeftPieChart(ResiBuzzLeftPieChartFormDTO formDTO,TokenDto tokenDto);
+
+    /**
+     * @Description  查询组织下每个网格的项目数
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/9 2:59 下午
+     */
+    List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO);
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
index 9236ff80a5..28a7192afb 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
@@ -496,6 +496,17 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         return result;
     }
 
+    /**
+     * @Description  根据客户ID查询一级分类列表
+     * @param customerId
+     * @author zxc
+     * @date 2021/12/7 1:45 下午
+     */
+    @Override
+    public List<CategoryListResultDTO> selectCategoryOneLevelListByCustomerId(String customerId) {
+        return baseDao.selectCategoryOneLevelListByCustomerId(customerId);
+    }
+
     /**
      * @Description  项目分类处理
      * @Param list
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index ca52276790..f433bd60ed 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -9,10 +9,13 @@ import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
@@ -67,6 +70,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -1564,12 +1568,95 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return resultList;
     }
 
-    public static void main(String[] args) {
-        List<String> list = new ArrayList<>();
-        list.add("1");
-        list.add("2");
-        list.add("3");
-        System.out.println(list.subList(0, 3));
+    /**
+     * @Description  居民热议列表
+     * 如果议题没有分类，默认显示其他，产品说的
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/8 3:50 下午
+     */
+    @Override
+    public ResiBuzzResultDTO resiBuzz(ResiBuzzFormDTO formDTO, TokenDto tokenDto) {
+        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(IssueConstant.ISSUE_AGENCY);
+        }
+        // 分类编码长度
+        Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId());
+        List<ResiBuzzDTO> allList = baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(), length);
+        if (CollectionUtils.isEmpty(allList)){
+            return new ResiBuzzResultDTO();
+        }
+        List<ResiBuzzDTO> list = allList.stream().skip(formDTO.getPageSize() * (formDTO.getPageNo() - NumConstant.ONE))
+                .limit(formDTO.getPageSize()).collect(Collectors.toList());
+        AtomicReference<Integer> no = new AtomicReference<>((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE);
+        ResiBuzzResultDTO result = new ResiBuzzResultDTO();
+        UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
+        userResiInfoListFormDTO.setUserIdList(list.stream().map(ResiBuzzDTO::getCreatedBy).collect(Collectors.toList()));
+        Result<List<UserResiInfoResultDTO>> usersResult = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO);
+        if (!usersResult.success()){
+            throw new EpmetException("查询人员姓名失败...");
+        }
+        // 默认最多50 产品要求
+        result.setTotal(allList.size());
+        // 赋值展示名字
+        list.forEach(l -> {
+            l.setSort(no.getAndSet(no.get() + NumConstant.ONE));
+            usersResult.getData().forEach(u -> {
+                if (l.getCreatedBy().equals(u.getUserId())){
+                    l.setIssueOriginator(u.getShowName());
+                }
+            });
+        });
+        result.setList(list);
+        return result;
     }
 
+    /**
+     * @Description  居民热议左边饼图
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/9 10:03 上午
+     */
+    @Override
+    public List<ResiBuzzLeftPieChartResultDTO> resiBuzzLeftPieChart(ResiBuzzLeftPieChartFormDTO formDTO, TokenDto tokenDto) {
+        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(IssueConstant.ISSUE_AGENCY);
+        }
+        // 分类编码长度
+        Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId());
+        List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length, tokenDto.getCustomerId());
+        if(CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        return result;
+    }
+
+    /**
+     * @Description  查询组织下每个网格的项目数
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/9 2:59 下午
+     */
+    @Override
+    public List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) {
+        List<ProjectDistributionAnalysisRightDTO> result    = baseDao.getProjectCountByGrid(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate());
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        return result;
+    }
+
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
index 48fe4ecdd2..b78896b90c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -618,4 +618,4 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         return collect;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
index b69f6ceec2..93a00cd354 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
@@ -28,6 +28,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+      #监控页面
+      stat-view-servlet:
+        enabled: true
+        #loginUsername: admin
+        #loginPassword: admin
+        allow:
+      web-stat-filter:
+        enabled: true
+      filters: stat,log4j2
   cloud:
     nacos:
       discovery:
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.17__add_color.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.17__add_color.sql
new file mode 100644
index 0000000000..0ed1ab2b24
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.17__add_color.sql
@@ -0,0 +1,88 @@
+alter table issue_project_category_dict add column `COLOR` VARCHAR(20) COMMENT '颜色' AFTER `SORT`;
+
+
+
+UPDATE issue_project_category_dict
+SET color = '#ffba00'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '市场监管';
+
+UPDATE issue_project_category_dict
+SET color = '#ffd074'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '卫生计生监督执法';
+
+UPDATE issue_project_category_dict
+SET color = '#42cd05'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '建设管理';
+
+UPDATE issue_project_category_dict
+SET color = '#16d783'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '文化执法';
+
+UPDATE issue_project_category_dict
+SET color = '#00e5ed'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '民政';
+
+UPDATE issue_project_category_dict
+SET color = '#0091ed'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '其他';
+
+UPDATE issue_project_category_dict
+SET color = '#1b51ff'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '城市管理';
+
+UPDATE issue_project_category_dict
+SET color = '#1641cc'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '公安交通管理';
+
+UPDATE issue_project_category_dict
+SET color = '#2a00ff'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '消防安全';
+
+UPDATE issue_project_category_dict
+SET color = '#7800ff'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '创卫复审类';
+
+UPDATE issue_project_category_dict
+SET color = '#c600ff'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '环境保护';
+
+UPDATE issue_project_category_dict
+SET color = '#ff00d2'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '安全监管';
+
+UPDATE issue_project_category_dict
+SET color = '#ff2a00'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '社会治安综治';
+
+UPDATE issue_project_category_dict
+SET color = '#ff7800'
+WHERE DEL_FLAG = '0'
+  AND CATEGORY_TYPE = '1'
+  AND CATEGORY_NAME = '食品药品监管';
+
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
index f12b363cc7..55648edcad 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
@@ -36,7 +36,8 @@
             issue_status AS issueStatus,
             suggestion AS issueSuggestion,
             grid_id AS gridId,
-            created_by AS userId
+            created_by AS userId,
+            CREATED_TIME as shiftIssueTime
         FROM
             issue
         WHERE
@@ -577,4 +578,98 @@
           AND ISSUE_STATUS = 'closed'
           AND RESOLVE_TYPE = 'unresolved'
     </select>
+
+    <!-- 查询表决前50名 -->
+    <resultMap id="selectIssueLimit50" type="com.epmet.dto.result.ResiBuzzDTO">
+        <result column="issueId" property="issueId"/>
+        <result column="issueTitle" property="issueTitle"/>
+        <result column="suggestion" property="suggestion"/>
+        <result column="createdBy" property="createdBy"/>
+        <result column="status" property="status"/>
+        <result column="createdTime" property="createdTime"/>
+        <result column="supportCount" property="supportCount"/>
+        <result column="oppositionCount" property="oppositionCount"/>
+        <result column="voteAccount" property="voteAccount"/>
+        <collection property="categoryName" ofType="java.lang.String">
+            <result column="cn"/>
+        </collection>
+    </resultMap>
+    <select id="selectIssueLimit50" resultMap="selectIssueLimit50">
+        SELECT
+            i.ID AS issueId,
+            i.ISSUE_TITLE AS issueTitle,
+            i.SUGGESTION AS suggestion,
+            i.CREATED_BY AS createdBy,
+            (CASE WHEN i.ISSUE_STATUS = 'shift_project' THEN '已转项目'
+                  WHEN i.ISSUE_STATUS = 'voting' THEN '表决中'
+                  WHEN i.ISSUE_STATUS = 'closed' THEN '已关闭'
+                  ELSE '表决中' END ) AS `status`,
+            i.CREATED_TIME AS createdTime,
+            s.SUPPORT_COUNT AS supportCount,
+            s.OPPOSITION_COUNT AS oppositionCount,
+            CONCAT(s.SUPPORT_COUNT + s.OPPOSITION_COUNT,'/',s.VOTABLE_COUNT) AS voteAccount,
+            cd.CATEGORY_NAME as cn
+        FROM issue i
+        LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
+        LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID)
+        LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID)
+        WHERE i.DEL_FLAG = '0'
+            <if test='status != "all" '>
+                AND i.ISSUE_STATUS = #{status}
+            </if>
+            <if test='orgType == "grid" '>
+                AND i.GRID_ID = #{orgId}
+            </if>
+            <if test='orgType == "agency" '>
+                AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+            </if>
+        ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50
+    </select>
+
+    <!-- 查询客户下1级分类的长度 -->
+    <select id="selectOneLevelCategoryLength" resultType="java.lang.Integer">
+        SELECT LENGTH(CATEGORY_CODE) FROM issue_project_category_dict
+        WHERE DEL_FLAG = '0'
+            AND CUSTOMER_ID = #{customerId}
+            AND IS_DISABLE = 'enable'
+            AND CATEGORY_TYPE = '1'
+            LIMIT 1
+    </select>
+
+    <!-- 查询居民热议左侧饼图 -->
+    <select id="resiBuzzLeftPieChart" resultType="com.epmet.dto.result.ResiBuzzLeftPieChartResultDTO">
+        SELECT COUNT(issueId) AS count,categoryCode,categoryName,color FROM
+            (SELECT
+                i.ID AS issueId,
+                IFNULL(LEFT(ic.CATEGORY_CODE,#{length}),'') AS categoryCode,
+                IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName,
+                IFNULL(cd.color,'#0091ed') AS color
+            FROM issue i
+            LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
+            LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID)
+            LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID)
+            WHERE i.DEL_FLAG = '0'
+                <if test='orgType == "grid" '>
+                    AND i.GRID_ID = #{orgId}
+                </if>
+                <if test='orgType == "agency" '>
+                    AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+                </if>
+            ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50)temp
+        GROUP BY categoryName
+    </select>
+
+    <!-- 查询组织下每个网格的项目数 -->
+    <select id="getProjectCountByGrid" resultType="com.epmet.dto.result.ProjectDistributionAnalysisRightDTO">
+        SELECT
+            GRID_ID,
+            COUNT(ID) AS count
+        FROM issue
+        WHERE DEL_FLAG = '0'
+            AND ISSUE_STATUS = 'shift_project'
+            AND ORG_ID = #{orgId}
+            AND DATE_FORMAT(SHIFTED_TIME,'%Y-%m-%d') >= #{startDate}
+            AND DATE_FORMAT(SHIFTED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
+        GROUP BY GRID_ID
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
index dca01a63f5..06c1fc0000 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
@@ -245,6 +245,21 @@
         </foreach>
     </select>
 
+    <!-- 根据客户ID查询一级分类列表 -->
+    <select id="selectCategoryOneLevelListByCustomerId" resultType="com.epmet.dto.result.CategoryListResultDTO">
+        SELECT
+            CATEGORY_CODE,
+            CATEGORY_NAME,
+            LENGTH(CATEGORY_CODE) AS codeLength,
+            IFNULL(color,'') AS color
+        FROM issue_project_category_dict
+        WHERE DEL_FLAG = 0
+          AND CUSTOMER_ID = #{customerId}
+          AND CATEGORY_TYPE = 1
+          AND IS_DISABLE = 'enable'
+        ORDER BY SORT
+    </select>
+
     <update id="updateIssueProjectCategoryDict">
         UPDATE issue_project_category_dict
         SET
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java
index ad2c907fd5..ce787e045d 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java
@@ -40,5 +40,17 @@ public class AgencyGridList implements Serializable {
      * 机关-网格名称
      */
     private String agencyGridName = "";
+    /**
+     * 网格名称
+     */
+    private String gridName = "";
+    /**
+     * 网格经度【网格没有经纬度时获取客户根组织下的】
+     */
+    private String longitude = "";
+    /**
+     * 网格维度【网格没有经纬度时获取客户根组织下的】
+     */
+    private String latitude = "";
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
index 808e25d791..a7aec4fa28 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
@@ -30,23 +30,22 @@ import java.io.Serializable;
  */
 @Data
 public class AgencyResultDTO implements Serializable {
-
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 机关组织Id
-     */
+    //机关组织Id
     private String agencyId = "";
-    /**
-     * 机关组织名称
-     */
+    //机关组织名称
     private String agencyName = "";
-
+    //上级组织id
     private String pid;
+    //组织级别
     private String level;
-    /**
-     * 所有上级组织机构ID(以英文:隔开)
-     */
+    //所有上级组织机构ID(以英文:隔开)
     @JsonIgnore
     private String pids = "";
+    //经度【没值则取跟客户的值】
+    private String longitude;
+    //维度【没值则取跟客户的值】
+    private String latitude;
+
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java
index 117976dee8..08bd0683b1 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java
@@ -49,4 +49,16 @@ public class AgencySubResultDTO implements Serializable {
      * 当前组织的所有上级组织Id
      */
     private String pids = "";
+    /**
+     * 组织级别
+     */
+    private String level = "";
+    /**
+     * 组织经度【没值取根组织的值】
+     */
+    private String longitude = "";
+    /**
+     * 组织维度【没值取根组织的值】
+     */
+    private String latitude = "";
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java
index 3afae3011a..4d48b54960 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java
@@ -26,6 +26,15 @@ public class AgencyTreeResultDTO implements Serializable {
     private String pid;
 
     private String level;
+    //经度【没值则取跟客户的值】
+    private String longitude;
+    //维度【没值则取跟客户的值】
+    private String latitude;
+
+    /**
+     * orgId-orgLevel
+     */
+    private String orgLevel;
     /**
      * 下级机关组织
      */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java
index 90641f29d4..5040a89fde 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java
@@ -28,4 +28,8 @@ public class ExtGridResultDTO implements Serializable {
      * 当前gridId所属的客户id add02.03
      * */
     private String customerId;
+    //经度【没值则取跟客户的值】
+    private String longitude;
+    //维度【没值则取跟客户的值】
+    private String latitude;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java
index fbaf784c25..1621261359 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java
@@ -50,4 +50,8 @@ public class ExtStaffPermissionResultDTO implements Serializable {
      * 当前agencyId所属的客户id add02.03
      * */
     private String customerId;
+    //经度【没值则取跟客户的值】
+    private String longitude;
+    //维度【没值则取跟客户的值】
+    private String latitude;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index 6c438becaf..f09e1f6ccf 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -531,4 +531,31 @@ public interface GovOrgOpenFeignClient {
 
     @GetMapping("/gov/org/customergrid/getGridIListByAgency/{agencyId}")
     Result<List<CustomerGridDTO>> getGridIListByAgency(@PathVariable("agencyId") String agencyId);
+
+    /**
+     * @Description  查询下级agencyId
+     * @param orgId
+     * @author zxc
+     * @date 2021/12/9 4:42 下午
+     */
+    @PostMapping("/gov/org/agency/getsonagencyid")
+    Result<List<String>> getSonAgencyId(@RequestParam("orgId")String orgId);
+    
+//    /icbuilding/{id}?id=demoData
+
+    /**
+     * 根据ID查询楼栋信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/gov/org/icbuilding/{id}")
+    Result<IcBuildingDTO> getBuildingById(@PathVariable("id") String id);
+
+    /**
+     * 通过ID查询小区信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/gov/org/icneighborhood/{id}")
+    Result<IcNeighborHoodDTO> getIcNeighbordhoodById(@PathVariable("id") String id);
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 58847819eb..f85e3471e6 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -334,9 +334,23 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridIListByAgency", agencyId);
     }
 
+    @Override
+    public Result<List<String>> getSonAgencyId(String orgId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getSonAgencyId", orgId);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);
     }
 
+    @Override
+    public Result<IcBuildingDTO> getBuildingById(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getBuildingById", id);
+    }
+
+    @Override
+    public Result<IcNeighborHoodDTO> getIcNeighbordhoodById(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getIcNeighbordhoodById", id);
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index c2c2273036..5651110c57 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -349,4 +349,15 @@ public class AgencyController {
         return new Result<List<BaseInfoFamilyBuildingResultDTO>>().ok(agencyService.baseInfoFamilyBuilding(formDTO));
     }
 
+    /**
+     * @Description  查询下级agencyId
+     * @param orgId
+     * @author zxc
+     * @date 2021/12/9 4:42 下午
+     */
+    @PostMapping("getsonagencyid")
+    public Result<List<String>> getSonAgencyId(@RequestParam("orgId")String orgId){
+        return new Result<List<String>>().ok(agencyService.getSonAgencyId(orgId));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index a91016a5f9..183b6f81f5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -339,18 +339,6 @@ public class CustomerAgencyController {
         return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getAgencyList(formDTO));
     }
 
-    /**
-     * @Description 获取当前登陆人的 所属组织及下级组织/网格（含直属网格）树
-     * @Param tokenDTO
-     * @Return {@link Result<  AgencyTreeResultDTO >}
-     * @Author zhaoqifeng
-     * @Date 2021/9/8 15:20
-     */
-    @PostMapping("agencygridtree")
-    public Result<AgencyTreeResultDTO> getOrgTreeData(@LoginUser TokenDto tokenDTO) {
-        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId()));
-    }
-
     /**
      * @description 通过staffId查询跟组织列表
      *
@@ -369,4 +357,16 @@ public class CustomerAgencyController {
         return new Result<List<StaffOrgsResultDTO>>().ok(orgList);
     }
 
-}
\ No newline at end of file
+    /**
+     * @Description 获取当前登陆人的 所属组织及下级组织/网格（含直属网格）树
+     * @Param tokenDTO
+     * @Return {@link Result<  AgencyTreeResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/9/8 15:20
+     */
+    @PostMapping("agencygridtree")
+    public Result<AgencyTreeResultDTO> getOrgTreeData(@LoginUser TokenDto tokenDTO) {
+        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId()));
+    }
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
index 0b58b4d6f0..8422de2c41 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
@@ -309,4 +309,14 @@ public class CustomerGridController {
         List<CustomerGridDTO> resultDTOS = customerGridService.getGridIListByAgency(agencyId);
         return new Result<List<CustomerGridDTO>>().ok(resultDTOS);
     }
+
+    /**
+     * @Author sun
+     * @Description 查询组织直属网格列表
+     **/
+    @PostMapping("getgridilistbyagency/{agencyId}")
+    public Result<List<AgencyGridList>> gridListByAgencyId(@PathVariable("agencyId") String agencyId) {
+        return new Result<List<AgencyGridList>>().ok(customerGridService.gridListByAgencyId(agencyId));
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 24a007311e..d1a49f7ba3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -273,4 +273,14 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @date 2021/10/25 2:30 下午
      */
     List<MapSonOrgResultDTO> selectSonOrg(@Param("pid")String pid,@Param("type")String type);
+
+    /**
+     * @Description  查询下级agencyId
+     * @param orgId
+     * @author zxc
+     * @date 2021/12/9 4:42 下午
+     */
+    List<String> getSonAgencyId(@Param("orgId") String orgId);
+
 }
+
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
index 9a2fd83d82..d85f2d8b68 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
@@ -148,4 +148,12 @@ public interface AgencyService {
      */
     List<BaseInfoFamilyBuildingResultDTO> baseInfoFamilyBuilding(BaseInfoFamilyBuildingFormDTO formDTO);
 
+    /**
+     * @Description  查询下级agencyId
+     * @param orgId
+     * @author zxc
+     * @date 2021/12/9 4:42 下午
+     */
+    List<String> getSonAgencyId(String orgId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index b9292396d8..4cacf505ef 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -255,12 +255,12 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      */
     AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO);
 
+    List<StaffOrgsResultDTO> getStaffOrgListByStaffId(String staffId);
+
     /**
      * desc:获取用户所属组织的组织及网格树
      * @param staffId
      * @return
      */
     AgencyTreeResultDTO getOrgTreeData(String staffId);
-
-    List<StaffOrgsResultDTO> getStaffOrgListByStaffId(String staffId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index d6ac66d201..2b2624ac54 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -348,4 +348,10 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @Date 2021/11/29 17:00
      */
     List<CustomerGridDTO> getGridIListByAgency(String agencyId);
+
+    /**
+     * @Author sun
+     * @Description 查询组织直属网格列表
+     **/
+    List<AgencyGridList> gridListByAgencyId(String agencyId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index eec2d13074..4bfc4487d3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -631,6 +631,21 @@ public class AgencyServiceImpl implements AgencyService {
         return result;
     }
 
+    /**
+     * @Description  查询下级agencyId
+     * @param orgId
+     * @author zxc
+     * @date 2021/12/9 4:42 下午
+     */
+    @Override
+    public List<String> getSonAgencyId(String orgId) {
+        List<String> result = customerAgencyDao.getSonAgencyId(orgId);
+        if (CollectionUtils.isNotEmpty(result)){
+            return result;
+        }
+        return new ArrayList<>();
+    }
+
     private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) {
         CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
         insertEntity.setOrganizationName(formDTO.getAgencyName());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
index f1c5d28379..24fe5e520a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
@@ -88,7 +88,7 @@ public class BuildingServiceImpl implements BuildingService {
             IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
             icBuildingUnit.setCustomerId(customerId);
             icBuildingUnit.setBuildingId(entity.getId());
-            icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元");
+            icBuildingUnit.setUnitName((i + 1) +"单元");
             icBuildingUnit.setUnitNum(String.valueOf(i+1));
             unitList.add(icBuildingUnit);
         }
@@ -103,7 +103,7 @@ public class BuildingServiceImpl implements BuildingService {
             log.error("com.epmet.service.impl.BuildingServiceImpl.treeList，没有找到工作人员所属的机关信息，用户Id：{}",staffId);
             return new ArrayList<>();
         }
-        
+
 //        agency = new CustomerStaffAgencyDTO();
 //        agency.setAgencyId("77f6bc7f07064bf4c09ef848139a344c");
         //1.获取所在组织及下级组织
@@ -275,7 +275,7 @@ public class BuildingServiceImpl implements BuildingService {
                 IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
                 icBuildingUnit.setBuildingId(uuid);
                 icBuildingUnit.setCustomerId(customerId);
-                icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元");
+                icBuildingUnit.setUnitName((i + 1) +"单元");
                 icBuildingUnit.setUnitNum(String.valueOf(i+1));
                 unitList.add(icBuildingUnit);
             }
@@ -464,7 +464,7 @@ public class BuildingServiceImpl implements BuildingService {
                 IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
                 icBuildingUnit.setBuildingId(icBuilding.getId());
                 icBuildingUnit.setCustomerId(customerId);
-                icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元");
+                icBuildingUnit.setUnitName((i + 1) +"单元");
                 icBuildingUnit.setUnitNum(String.valueOf(i+1));
                 unitList.add(icBuildingUnit);
             }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index de90539444..f70fdd035a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -1119,6 +1119,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         result.setAgencyName(rootAgency.getAgencyName());
         result.setAgencyId(rootAgency.getAgencyId());
         result.setLevel(rootAgency.getLevel());
+        result.setOrgLevel(rootAgency.getAgencyId().concat("-").concat(rootAgency.getLevel()));
+        result.setLongitude(rootAgency.getLongitude());
+        result.setLatitude(rootAgency.getLatitude());
         ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(rootAgency.getAgencyId());
         convert2AgencyTreeResult(result,res.getSubAgencyList(),res.getGridList());
         return result;
@@ -1137,6 +1140,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 resultDTO.setAgencyName(agency.getAgencyName());
                 resultDTO.setPid(root.getAgencyId());
                 resultDTO.setLevel(agency.getLevel());
+                resultDTO.setLongitude(agency.getLongitude());
+                resultDTO.setLatitude(agency.getLatitude());
+                resultDTO.setOrgLevel(agency.getAgencyId().concat("-").concat(agency.getLevel()));
 
                 if (root.getSubAgencyList() == null) {
                     root.setSubAgencyList(new ArrayList<>());
@@ -1152,7 +1158,10 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 grid.setAgencyName(o.getGridName());
                 grid.setPid(root.getAgencyId());
                 grid.setLevel("grid");
+                grid.setOrgLevel(o.getGridId().concat("-").concat("grid"));
                 grid.setSubAgencyList(null);
+                grid.setLongitude(o.getLongitude());
+                grid.setLatitude(o.getLatitude());
                 if (root.getSubAgencyList() == null) {
                     root.setSubAgencyList(new ArrayList<>());
                 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 2c0834f2d2..5c48305577 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -864,4 +864,14 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         return ConvertUtils.sourceToTarget(list, CustomerGridDTO.class);
     }
 
+    /**
+     * @Author sun
+     * @Description 查询组织直属网格列表
+     **/
+    @Override
+    public List<AgencyGridList> gridListByAgencyId(String agencyId) {
+        List<AgencyGridList> result = baseDao.selectAgencyGridMsgList(agencyId);
+        return result;
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
index 2b205e9ae6..5535988941 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
@@ -139,7 +139,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
             }
         }
         //分队成员
-        StringBuffer inspectorsNames = new StringBuffer("");
+        StringBuffer inspectorsNames = new StringBuffer();
         for (String str : resultDTO.getInspectors().split(",")) {
             teamDTOList.forEach(r -> {
                 if (str.equals(r.getId())) {
@@ -188,7 +188,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
                 }
             });
             //分队成员
-            StringBuffer inspectorsNames = new StringBuffer("");
+            StringBuffer inspectorsNames = new StringBuffer();
             for (String str : dto.getInspectors().split(",")) {
                 teamDTOList.forEach(r -> {
                     if (str.equals(r.getId())) {
@@ -202,4 +202,4 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
         resultDTO.setList(result.getList());
         return resultDTO;
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
index 24eb3ebd2b..8019f867c7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
@@ -159,7 +159,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
         //2.查询所有分队下人员名单
         List<IcPlacePatrolTeamStaffDTO> teamDTOList = icPlacePatrolTeamStaffDao.getByTeamId(resultDTO.getPlacePatrolTeamId());
         //3.封装九小场所数据
-        StringBuffer inspectorsNames = new StringBuffer("");
+        StringBuffer inspectorsNames = new StringBuffer();
         for (String str : resultDTO.getInspectors().split(",")) {
             teamDTOList.forEach(r -> {
                 if (str.equals(r.getId())) {
@@ -195,7 +195,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
         //3.封装各分队人员数据
         for (PlacePatrolReviewRecordDetailResultDTO dto : result.getList()) {
             //分队成员
-            StringBuffer inspectorsNames = new StringBuffer("");
+            StringBuffer inspectorsNames = new StringBuffer();
             for (String str : dto.getInspectors().split(",")) {
                 teamDTOList.forEach(r -> {
                     if (str.equals(r.getId())) {
@@ -218,4 +218,4 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
     public int delByPatrolRecordId(String staffId, String placePatrolRecordId) {
         return baseDao.delByPatrolRecordId(staffId, placePatrolRecordId);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java
index c16b575230..afc354b9b2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java
@@ -190,7 +190,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
 
         //4.分别封装网格。九小场所数据
         //网格
-        StringBuffer gridNames = new StringBuffer("");
+        StringBuffer gridNames = new StringBuffer();
         for (String str : resultDTO.getGridIds().split(",")) {
             gridList.forEach(r -> {
                 if (str.equals(r.getId())) {
@@ -200,7 +200,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
         }
         resultDTO.setGridNames(gridNames.toString());
         //九小场所
-        StringBuffer ninePlaceNames = new StringBuffer("");
+        StringBuffer ninePlaceNames = new StringBuffer();
         for (String str : resultDTO.getNinePlaceVals().split(",")) {
             nineList.getData().forEach(r -> {
                 if (str.equals(r.getValue())) {
@@ -248,7 +248,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
 
         //4.封装网格、九小场所数据
         for (PlacePatrolTeamDetailResultDTO dto : result.getList()) {
-            StringBuffer gridNames = new StringBuffer("");
+            StringBuffer gridNames = new StringBuffer();
             for (String str : dto.getGridIds().split(",")) {
                 gridList.forEach(r -> {
                     if (str.equals(r.getId())) {
@@ -257,7 +257,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
                 });
             }
             dto.setGridNames(gridNames.toString());
-            StringBuffer ninePlaceNames = new StringBuffer("");
+            StringBuffer ninePlaceNames = new StringBuffer();
             for (String str : dto.getNinePlaceVals().split(",")) {
                 nineList.getData().forEach(r -> {
                     if (str.equals(r.getValue())) {
@@ -272,4 +272,4 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
         return resultDTO;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index f0d6065116..eeca702112 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -178,13 +178,30 @@
 
     <select id="selectSubAgencyList" resultType="com.epmet.dto.result.AgencySubResultDTO">
         SELECT
-            id AS "agencyId",
-            organization_name AS "agencyName",
-            pids AS "pids"
-        FROM customer_agency
-        WHERE del_flag = '0'
-        AND pids = #{subAgencyPids}
-        ORDER BY created_time DESC
+            ca.id AS "agencyId",
+            ca.organization_name AS "agencyName",
+            ca.pids AS "pids",
+            ca.level level,
+	        ( CASE WHEN ca.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.longitude
+                END
+            ) longitude,
+            ( CASE WHEN ca.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.latitude
+                END
+            ) latitude
+        FROM customer_agency ca
+        WHERE ca.del_flag = '0'
+        AND ca.pids = #{subAgencyPids}
+        ORDER BY ca.created_time DESC
     </select>
 
     <select id="getCustomerRootAgency" resultType="com.epmet.dto.CustomerAgencyDTO">
@@ -258,11 +275,15 @@
         <id column="agencyId" property="agencyId" />
         <result column="agencyName" property="agencyName"/>
         <result column="level" property="level" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
         <result column="customerId" property="customerId"/>
         <collection property="gridList" column="agencyId" ofType="com.epmet.dto.result.ExtGridResultDTO" select="selectGridList">
             <id column="gridId" property="gridId" />
             <result column="gridName" property="gridName" />
             <result column="customerId" property="customerId"/>
+            <result column="longitude" property="longitude" />
+            <result column="latitude" property="latitude" />
         </collection>
 
         <collection property="departmentList" column="agencyId" ofType="com.epmet.dto.result.ExtDeptResultDTO" select="selectDeptList">
@@ -293,7 +314,23 @@
             agency.ID AS agencyId,
             agency.ORGANIZATION_NAME AS agencyName,
             agency.LEVEL AS level,
-            agency.CUSTOMER_ID as customerId
+            agency.CUSTOMER_ID as customerId,
+            ( CASE WHEN agency.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.longitude
+                END
+            ) longitude,
+            ( CASE WHEN agency.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.latitude
+                END
+            ) latitude
         FROM
             CUSTOMER_AGENCY agency
         WHERE
@@ -317,9 +354,26 @@
         SELECT
             cg.id AS gridId,
             cg.GRID_NAME AS gridName,
-            cg.CUSTOMER_ID AS customerId
+            cg.CUSTOMER_ID AS customerId,
+            ( CASE WHEN ca.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.longitude
+                END
+            ) longitude,
+            ( CASE WHEN ca.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.latitude
+                END
+            ) latitude
         FROM
             customer_grid cg
+        INNER JOIN customer_agency ca ON cg.PID = ca.ID
         WHERE
             cg.DEL_FLAG = '0'
             AND cg.PID =#{agencyId}
@@ -330,7 +384,23 @@
             agency.ID AS agencyId,
             agency.ORGANIZATION_NAME AS agencyName,
             agency.LEVEL AS level,
-            agency.CUSTOMER_ID as customerId
+            agency.CUSTOMER_ID as customerId,
+            ( CASE WHEN agency.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.longitude
+                END
+            ) longitude,
+            ( CASE WHEN agency.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.latitude
+                END
+            ) latitude
         FROM
             CUSTOMER_AGENCY agency
         WHERE
@@ -340,11 +410,27 @@
 
     <select id="selectAgencyByStaffId" resultType="com.epmet.dto.result.AgencyResultDTO">
         SELECT
-            ca.id AS "agencyId",
-            ca.organization_name AS "agencyName",
-	        ca.pids AS "pids",
-	        ca.PID AS  pid,
-	        ca.LEVEL
+            ca.id agencyId,
+            ca.organization_name agencyName,
+	        ca.pids pids,
+	        ca.pid pid,
+	        ca.level level,
+	        ( CASE WHEN ca.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.longitude
+                END
+            ) longitude,
+            ( CASE WHEN ca.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.latitude
+                END
+            ) latitude
         FROM
             customer_agency ca
         INNER JOIN customer_staff_agency csa ON ca.id = csa.agency_id
@@ -638,4 +724,14 @@
             order by created_time desc
     </select>
 
+    <!-- 查询下级agencyId -->
+    <select id="getSonAgencyId" resultType="java.lang.String">
+        SELECT
+            ID
+        FROM customer_agency
+        WHERE
+            DEL_FLAG = '0'
+          AND PID = #{orgId}
+    </select>
+
 </mapper>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 94ca7a4587..0ddf90f008 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -389,12 +389,30 @@
 
     <select id="selectAgencyGridMsgList" resultType="com.epmet.dto.result.AgencyGridList">
         SELECT
-            cg.id AS "gridId",
+            cg.id gridId,
             CONCAT(
                 ca.organization_name,
                 "-",
                 cg.grid_name
-            ) "agencyGridName"
+            ) agencyGridName,
+            cg.grid_name gridName,
+            <!-- 网格没有经纬度时获取客户根组织下的 -->
+            ( CASE WHEN cg.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE cg.longitude
+                END
+            ) longitude,
+            ( CASE WHEN cg.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE cg.latitude
+                END
+            ) latitude
         FROM
             customer_grid cg
         INNER JOIN customer_agency ca ON cg.pid = ca.id
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java
new file mode 100644
index 0000000000..0a7b966a62
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 数据分析-个人档案-上报事件列表入参
+ */
+@Data
+public class PageUserReportEventFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+    //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class)
+    private List<String> epmetUserIdList;
+    @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+    @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java
new file mode 100644
index 0000000000..d4413eb75f
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectDistributionAnalysisFormDTO.java
@@ -0,0 +1,30 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/7 9:55 上午
+ * @DESC
+ */
+@Data
+public class ProjectDistributionAnalysisFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 4911448213428751186L;
+
+    public interface ProjectDistributionAnalysisForm{}
+
+    @NotBlank(message = "startDate不能为空",groups = ProjectDistributionAnalysisForm.class)
+    private String startDate;
+
+    @NotBlank(message = "endDate不能为空",groups = ProjectDistributionAnalysisForm.class)
+    private String endDate;
+
+    private String orgId;
+
+    private String orgType;
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java
new file mode 100644
index 0000000000..37049a3ef8
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 数字赋能平台-个人档案-上报事件-事件详情
+ */
+@Data
+public class ResiEventDetailFormDTO implements Serializable {
+    private static final long serialVersionUID = 4449275163195979994L;
+    public interface AddUserInternalGroup {
+    }
+    @NotBlank(message = "resiEventId不能为空",groups =AddUserInternalGroup.class )
+    private String resiEventId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java
new file mode 100644
index 0000000000..26950059b5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java
@@ -0,0 +1,50 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 数据分析-个人档案-上报事件详情-研判分析，查看项目通分类+来源于当前上报人上报的所有事件
+ *
+ */
+@Data
+public class ResiEventResearchAnalysisFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 当前选中的事件id
+     */
+    @NotBlank(message = "resiEventId不能为空",groups = AddUserInternalGroup.class)
+    private String resiEventId;
+
+    /**
+     * 当前选中的事件转为的项目id
+     */
+    @NotBlank(message = "projectId不能为空",groups = AddUserInternalGroup.class)
+    private String projectId;
+
+    /**
+     * 个人档案的这个人
+     */
+    @NotBlank(message = "icResiUserId不能为空",groups = AddUserInternalGroup.class)
+    private String icResiUserId;
+
+    /**
+     * 个人档案的这个人，对应小程序的人的用户id
+     */
+    private List<String> epmetUserIdList;
+
+
+
+
+    @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TopicResearchAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TopicResearchAnalysisFormDTO.java
new file mode 100644
index 0000000000..b3c2ffe827
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TopicResearchAnalysisFormDTO.java
@@ -0,0 +1,44 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 话题详情-研判分析
+ */
+@Data
+public class TopicResearchAnalysisFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 当前选中的事件转为的项目id
+     */
+    @NotBlank(message = "projectId不能为空",groups = AddUserInternalGroup.class)
+    private String projectId;
+
+    /**
+     * 个人档案的这个人
+     */
+    @NotBlank(message = "icResiUserId不能为空",groups = AddUserInternalGroup.class)
+    private String icResiUserId;
+
+    /**
+     * 个人档案的这个人，对应小程序的人的用户id
+     */
+    private List<String> epmetUserIdList;
+
+
+
+
+    @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java
new file mode 100644
index 0000000000..8003cdfd0b
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java
@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/7 9:40 上午
+ * @DESC
+ */
+@Data
+public class CategoryListDTO implements Serializable {
+
+    private static final long serialVersionUID = 2782140672250580404L;
+
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+
+    /**
+     * 分类名字
+     */
+    private String categoryName;
+
+    private String color;
+
+    /**
+     * 个数
+     */
+    private Integer count;
+
+    public CategoryListDTO() {
+        this.categoryCode = "";
+        this.categoryName = "";
+        this.count = NumConstant.ZERO;
+    }
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
index 18295391c5..0b6bb8ccb2 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * @Author zxc
  * @DateTime 2021/8/3 1:30 下午
- * @DESC
+ * @DESC 两端通用时间详情接口+个人档案-数据分析-事件详情
  */
 @Data
 public class EventDetailResultDTO implements Serializable {
@@ -87,10 +87,10 @@ public class EventDetailResultDTO implements Serializable {
     @JsonIgnore
     private List<String> orgNameList;
 
-    @JsonIgnore
+    //@JsonIgnore
     private String projectId;
 
-    @JsonIgnore
+    //@JsonIgnore
     private Boolean isProject;
 
     public EventDetailResultDTO() {
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java
new file mode 100644
index 0000000000..4ade8603df
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java
@@ -0,0 +1,11 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class HouseUserDTO implements Serializable {
+    private String icResiUserId;
+    private String icUserName;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java
new file mode 100644
index 0000000000..d562132e12
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PageUserReportEventResDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 数据分析-个人档案-上报事件列表入参
+ */
+@Data
+public class PageUserReportEventResDTO implements Serializable {
+    private String resiEventId;
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 事件上报事件
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date reportTime;
+
+    /**
+     * true 已转项目；false:未转项目
+     */
+    private Boolean shiftProject;
+
+    /**
+     * 项目id
+     */
+    private String projectId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryByDateDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryByDateDTO.java
new file mode 100644
index 0000000000..b31ca841b5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryByDateDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/7 11:18 上午
+ * @DESC
+ */
+@Data
+public class ProjectCategoryByDateDTO implements Serializable {
+
+    private static final long serialVersionUID = -6620068264792270703L;
+
+    /**
+     * 项目创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDataDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDataDTO.java
new file mode 100644
index 0000000000..0f4721dbec
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDataDTO.java
@@ -0,0 +1,16 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 数据分析-个人档案-上报事件详情-研判分析，查看项目通分类+来源于当前上报人上报的所有事件
+ */
+@Data
+public class ProjectDataDTO implements Serializable {
+    private String firstCategoryCode;
+    private String firstCategoryName;
+    private List<ProjectInfoIcData> projectList;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisLeftResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisLeftResultDTO.java
new file mode 100644
index 0000000000..0e991a98e0
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisLeftResultDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/7 9:38 上午
+ * @DESC
+ */
+@Data
+public class ProjectDistributionAnalysisLeftResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -5694808164804517466L;
+
+    /**
+     * 时间段
+     */
+    private String time;
+
+    /**
+     * 分类集合
+     */
+    private List<CategoryListDTO> categoryList;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java
new file mode 100644
index 0000000000..d48a225007
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightDTO.java
@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/8 10:14 上午
+ * @DESC
+ */
+@Data
+public class ProjectDistributionAnalysisRightDTO implements Serializable {
+
+    private static final long serialVersionUID = 7233782006110358477L;
+
+    /**
+     * 组织ID
+     */
+    private String orgId;
+
+    /**
+     * 组织类型，组织：agency，网格：grid
+     */
+    @JsonIgnore
+    private String orgType;
+
+    /**
+     * 热力值
+     */
+    private Integer count;
+
+    public ProjectDistributionAnalysisRightDTO() {
+        this.orgId = "";
+        this.orgType = "";
+        this.count = NumConstant.ZERO;
+    }
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java
new file mode 100644
index 0000000000..fb56a9f178
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDistributionAnalysisRightResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/8 10:11 上午
+ * @DESC
+ */
+@Data
+public class ProjectDistributionAnalysisRightResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8359144215262197796L;
+
+    /**
+     * ..以上
+     */
+    private Integer under;
+
+    /**
+     * ..以下
+     */
+    private Integer above;
+
+    private List<ProjectDistributionAnalysisRightDTO> list;
+
+    public ProjectDistributionAnalysisRightResultDTO() {
+        this.under = null;
+        this.above = null;
+        this.list = new ArrayList<>();
+    }
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java
new file mode 100644
index 0000000000..3129e6fccc
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInfoIcData.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 数据分析-个人档案-上报事件详情-研判分析，查看项目通分类+来源于当前上报人上报的所有事件
+ */
+@Data
+public class ProjectInfoIcData implements Serializable {
+    private static final long serialVersionUID = -1937915930811634827L;
+    private String projectId;
+    private String projectTitle;
+    private String resiEventId;
+    private String projectStatus;
+
+    /**
+     * 以下这两个参数是给话题详情-研判分析用的
+     */
+    private String issueId;
+    private String topicId;
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventResearchAnalysisResDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventResearchAnalysisResDTO.java
new file mode 100644
index 0000000000..e432179589
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventResearchAnalysisResDTO.java
@@ -0,0 +1,30 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 数据分析-个人档案-上报事件详情-研判分析，查看项目通分类+来源于当前上报人上报的所有事件
+ *
+ */
+@Data
+public class ResiEventResearchAnalysisResDTO implements Serializable {
+
+    /**
+     * 居民信息及家属列表
+     */
+    private String icResiUserId;
+    private String icUserName;
+    private String houseId;
+    private List<HouseUserDTO> houseUserList;
+
+
+    /**
+     * 入参中给的，再返回去
+     */
+    private List<String> epmetUserIdList;
+    private List<ProjectDataDTO> projectData;
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/TopicResearchAnalysisResDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/TopicResearchAnalysisResDTO.java
new file mode 100644
index 0000000000..37648617ed
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/TopicResearchAnalysisResDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TopicResearchAnalysisResDTO {
+    /**
+     * 居民信息及家属列表
+     */
+    private String icResiUserId;
+    private String icUserName;
+    private String houseId;
+    private List<HouseUserDTO> houseUserList;
+
+
+    /**
+     * 入参中给的，再返回去
+     */
+    private List<String> epmetUserIdList;
+    private List<ProjectDataDTO> projectData;
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
index b5acf5b2e7..612debd512 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -195,4 +195,8 @@ public interface ProjectConstant {
 	String SORT_ASC = "asc";
 	String SORT_DESC = "desc";
 
+	String ORG_TYPE_GRID = "grid";
+
+	String ORG_LEVEL_COMMUNITY = "community";
+
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
index de479f7344..5ff9b4428c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
@@ -37,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Map;
 
@@ -154,6 +153,12 @@ public class CustomerProjectParameterController {
         return new Result();
     }
 
+    /**
+     * @Description 保存项目第三方平台的配置
+     * @return
+     * @author wxz
+     * @date 2021.03.19 17:10
+    */
     @PostMapping("save-thirdplatform-config")
     public Result saveThirdplatformConfig(@RequestBody ThirdPlatformConfigFormDTO input) {
         ValidatorUtils.validateEntity(input, ThirdPlatformConfigFormDTO.SaveThirdplatformConfig.class);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
index 46de571a19..070fc8bba0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -271,4 +273,43 @@ public class ProjectController {
         return new Result<List<UnResolvedResultDTO>>().ok(projectService.getUnResolvedListByGrid(formDTO));
     }
 
+    /**
+     * @Description 【社区治理】项目分布分析-左边
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/7 10:02 上午
+     */
+    @PostMapping("projectdistributionanalysisleft")
+    public Result<List<ProjectDistributionAnalysisLeftResultDTO>> projectDistributionAnalysisLeft(@RequestBody ProjectDistributionAnalysisFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, ProjectDistributionAnalysisFormDTO.ProjectDistributionAnalysisForm.class);
+        return new Result<List<ProjectDistributionAnalysisLeftResultDTO>>().ok(projectService.projectDistributionAnalysisLeft(formDTO,tokenDto));
+    }
+
+    /**
+     * @Description 【社区治理】项目分布分析-右边
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/8 10:21 上午
+     */
+    @PostMapping("projectdistributionanalysisright")
+    public Result<ProjectDistributionAnalysisRightResultDTO> projectDistributionAnalysisRight(@RequestBody ProjectDistributionAnalysisFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, ProjectDistributionAnalysisFormDTO.ProjectDistributionAnalysisForm.class);
+        return new Result<ProjectDistributionAnalysisRightResultDTO>().ok(projectService.projectDistributionAnalysisRight(formDTO,tokenDto));
+    }
+
+    /**
+     * 个人档案-话题详情-研判分析
+     * 只看来源于议题的项目
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("topic-research-analysis")
+    public Result<TopicResearchAnalysisResDTO> topicResearchAnalysis(@LoginUser TokenDto tokenDto,@RequestBody TopicResearchAnalysisFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,TopicResearchAnalysisFormDTO.AddUserInternalGroup.class);
+        return new Result<TopicResearchAnalysisResDTO>().ok(projectService.topicResearchAnalysis(formDTO));
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
index 84d965f2d0..fc8efe3337 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
@@ -64,6 +64,14 @@ public class ProjectTagsController {
         return new Result<ProjectTagsDTO>().ok(data);
     }
 
+    /**
+     * @Description 保存项目与标签的关联并更新标签热度
+     * @param dto
+     * @param token
+     * @return com.epmet.commons.tools.utils.Result
+     * @author wangc
+     * @date 2021.03.20 02:34
+    */
     @NoRepeatSubmit
     @PostMapping("save")
     public Result save(@RequestBody ProjectTagHookFormDTO dto, @LoginUser TokenDto token){
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
index 1b69e0b039..ca48b13304 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -56,6 +57,18 @@ public class ResiEventController {
         return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO, tokenDto));
     }
 
+    /**
+     * 数字赋能平台-个人档案-事件详情
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("eventdetail-icdata")
+    public Result<EventDetailResultDTO> eventDetailForIcData(@RequestBody ResiEventDetailFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO,ResiEventDetailFormDTO.AddUserInternalGroup.class);
+        return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetailForIcData(formDTO));
+    }
+
     /**
      * 我要报事-提交（尹）
      *
@@ -213,4 +226,32 @@ public class ResiEventController {
     Result<ResiEventManageRedDotRes> queryResiEventManageRedDot(@PathVariable("agencyId") String agencyId) {
         return new Result<ResiEventManageRedDotRes>().ok(resiEventService.queryResiEventManageRedDot(agencyId));
     }
+
+    /**
+     * 数据分析-个人档案-上报事件列表
+     * 根据epmetUserIdList查询
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyReportedResultDTO>>
+     * @author yinzuomei
+     * @date 2021/8/3 14:27
+     */
+    @PostMapping("pageuserreported")
+    public Result<PageData<PageUserReportEventResDTO>> pageUserReported(@RequestBody PageUserReportEventFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PageUserReportEventFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<PageUserReportEventResDTO>>().ok(resiEventService.pageUserReported(formDTO));
+    }
+
+    /**
+     * 数据分析-个人档案-上报事件列表-事件详情研判分析
+     * 只看来源于需求上报的项目
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("research-analysis")
+    public Result<ResiEventResearchAnalysisResDTO> queryResiEventResearchAnalysis(@LoginUser TokenDto tokenDto,@RequestBody ResiEventResearchAnalysisFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,ResiEventResearchAnalysisFormDTO.AddUserInternalGroup.class);
+        return new Result<ResiEventResearchAnalysisResDTO>().ok(resiEventService.queryResiEventResearchAnalysis(formDTO));
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
index cc2d336344..1127a7a099 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
@@ -61,4 +61,11 @@ public interface ProjectCategoryDao extends BaseDao<ProjectCategoryEntity> {
      * @date 2021/5/17 10:47 上午
      */
     List<ProjectCategoryDisPoseResultDTO> selectCategoryByIds(@Param("projectIds")List<String> projectIds);
+
+    /**
+     *
+     * @param projectId
+     * @return
+     */
+    List<ProjectCategoryDTO> selectListByProjectId(String projectId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
index 0040584f81..d0d71cab98 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
@@ -217,4 +217,54 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	EventProjectInfoDTO selectEventProjectInfo(@Param("projectId")String projectId);
 
     List<ProjectEntity> selectByOriginId(String originId);
+
+    /**
+     * @Description  根据日期查询项目分类
+     * @param startDate
+     * @param endDate
+     * @param codeLength 1级分类编码长度
+     * @param orgId
+     * @author zxc
+     * @date 2021/12/8 1:37 下午
+     */
+    List<ProjectCategoryByDateDTO> selectProjectCategoryByDate(@Param("startDate")String startDate,@Param("endDate")String endDate,
+															   @Param("orgId")String orgId,@Param("codeLength")Integer codeLength);
+
+	/**
+	 * 数据分析-个人档案-事件详情页面的研判分析项目列表
+	 * @param customerId
+	 * @param categoryCode
+	 * @param excludeProjectId
+	 * @param epmetUserIds
+	 * @return
+	 */
+	List<ProjectInfoIcData> selectCommonCategoryEventProject(@Param("customerId")String customerId,
+															 @Param("categoryCode")String categoryCode,
+															 @Param("excludeProjectId") String excludeProjectId,
+															 @Param("epmetUserIds")List<String> epmetUserIds);
+
+	/**
+	 * 数据分析-个人档案-话题详情页面的研判分析项目列表
+	 *
+	 * @param customerId
+	 * @param categoryCode
+	 * @param excludeProjectId
+	 * @param epmetUserIds
+	 * @return
+	 */
+	List<ProjectInfoIcData> selectCommonCategoryIssueProject(@Param("customerId")String customerId,
+															 @Param("categoryCode")String categoryCode,
+															 @Param("excludeProjectId") String excludeProjectId,
+															 @Param("epmetUserIds")List<String> epmetUserIds);
+
+	/**
+	 * @Description  查询组织下的项目数
+	 * @param orgIds
+	 * @param startDate
+	 * @param endDate
+	 * @author zxc
+	 * @date 2021/12/10 10:31 上午
+	 */
+	List<ProjectDistributionAnalysisRightDTO> selectProjectCountByOrg(@Param("orgIds")List<String> orgIds,@Param("startDate")String startDate,@Param("endDate")String endDate);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
index 6275a0d821..a39c72aa76 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java
@@ -18,10 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.result.EventDetailResultDTO;
-import com.epmet.dto.result.EventListResultDTO;
-import com.epmet.dto.result.MyReportedResultDTO;
-import com.epmet.dto.result.NewEventsResultDTO;
+import com.epmet.dto.form.PageUserReportEventFormDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.ResiEventEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -88,4 +86,13 @@ public interface ResiEventDao extends BaseDao<ResiEventEntity> {
      * @date 2021/8/5 10:42 上午
      */
     List<NewEventsResultDTO> newEvents(@Param("orgIds")List<String> orgIds);
+
+    /**
+     * 数据分析-个人档案-上报事件列表
+     * 根据epmetUserIdList查询
+     *
+     * @param formDTO
+     * @return
+     */
+    List<PageUserReportEventResDTO> selectUserReported(PageUserReportEventFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java
new file mode 100644
index 0000000000..233f4d5feb
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/BlockChainUploadService.java
@@ -0,0 +1,20 @@
+package com.epmet.service;
+
+import com.epmet.entity.ProjectEntity;
+import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.entity.ProjectStaffEntity;
+
+import java.util.List;
+
+/**
+ * 上链service接口
+ */
+public interface BlockChainUploadService {
+
+    /**
+     * 数据上链
+     * @param processEntity 处理进展entity
+     * @param assignedStaffEntities 指派给的工作人员entity
+     */
+    void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List<ProjectStaffEntity> assignedStaffEntities, String projectStaffId);
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
index 37fb5fa984..4d66d39dd0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
@@ -119,4 +119,11 @@ public interface ProjectCategoryService extends BaseService<ProjectCategoryEntit
      * @Author sun
      **/
     List<ProjectCategoryDTO> getProjectCategoryList(DelCategoryFormDTO formDTO);
+
+    /**
+     * 根据项目id，查询所有分类
+     * @param projectId
+     * @return
+     */
+    List<ProjectCategoryDTO> getProjectCategoryService(String projectId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
index 1f0fd17a0d..dff8e9d30e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
@@ -19,6 +19,7 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -331,4 +332,29 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	List<UnResolvedResultDTO> getUnResolvedListByGrid(ShiftProjectListFromDTO fromDTO);
 
     List<ProjectEntity> getByOriginId(String eventId);
+
+	/**
+	 * @Description 【社区治理】项目分布分析-左边
+	 * @param formDTO
+	 * @param tokenDto
+	 * @author zxc
+	 * @date 2021/12/7 10:02 上午
+	 */
+	List<ProjectDistributionAnalysisLeftResultDTO> projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto);
+
+	/**
+	 * @Description 【社区治理】项目分布分析-右边
+	 * @param formDTO
+	 * @param tokenDto
+	 * @author zxc
+	 * @date 2021/12/8 10:21 上午
+	 */
+	ProjectDistributionAnalysisRightResultDTO projectDistributionAnalysisRight(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto);
+
+	/**
+	 * 个人档案-话题详情-研判分析
+	 * @param formDTO
+	 * @return
+	 */
+    TopicResearchAnalysisResDTO topicResearchAnalysis(TopicResearchAnalysisFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
index 38d4916acc..c6e52d4cc3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
@@ -1,6 +1,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -40,6 +41,14 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      */
     EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO, TokenDto tokenDto);
 
+    /**
+     * 数字赋能平台-个人档案-事件详情
+     *
+     * @param formDTO
+     * @return
+     */
+    EventDetailResultDTO eventDetailForIcData(ResiEventDetailFormDTO formDTO);
+
     /**
      * 我要报事-提交（尹）
      *
@@ -129,4 +138,21 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      * @date 2021/8/6 13:57
      */
     ResiEventManageRedDotRes queryResiEventManageRedDot(String agencyId);
+
+    /**
+     * 数据分析-个人档案-上报事件列表
+     * 根据epmetUserIdList查询
+     *
+     * @param formDTO
+     * @return
+     */
+    PageData<PageUserReportEventResDTO> pageUserReported(PageUserReportEventFormDTO formDTO);
+
+    /**
+     * 数据分析-个人档案-上报事件列表-事件详情研判分析
+     *
+     * @param formDTO
+     * @return
+     */
+    ResiEventResearchAnalysisResDTO queryResiEventResearchAnalysis(ResiEventResearchAnalysisFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
new file mode 100644
index 0000000000..9a8837f120
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
@@ -0,0 +1,151 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.dao.ProjectStaffDao;
+import com.epmet.dto.form.*;
+import com.epmet.entity.ProjectEntity;
+import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.entity.ProjectStaffEntity;
+import com.epmet.feign.EpmetThirdOpenFeignClient;
+import com.epmet.service.BlockChainUploadService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 区块链上链service实现
+ */
+@Service
+public class BlockChainUploadServiceImpl implements BlockChainUploadService {
+
+    @Autowired
+    private EpmetThirdOpenFeignClient thirdOpenFeignClient;
+
+    @Autowired
+    private ProjectStaffDao projectStaffDao;
+
+    /**
+     * 数据上链
+     * @param processEntity 处理进展entity
+     * @param assignedStaffEntities 指派给的工作人员entity
+     */
+    public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List<ProjectStaffEntity> assignedStaffEntities, String projectStaffId) {
+
+        if (true) {
+            return;
+        }
+        
+        // 1.项目主信息
+        BlockChainProjectFormDTO project = null;
+
+        if (projectEntity != null) {
+            project = new BlockChainProjectFormDTO();
+            project.setAgencyId(projectEntity.getAgencyId());
+            project.setProjectId(projectEntity.getId());
+            project.setCustomerId(projectEntity.getCustomerId());
+            project.setCreatedBy(projectEntity.getCreatedBy());
+            project.setCreatedTime(projectEntity.getCreatedTime());
+            project.setCloseStatus(projectEntity.getClosedStatus());
+            project.setLocateAddress(projectEntity.getLocateAddress());
+            project.setLocateDimension(projectEntity.getLocateDimension());
+            project.setLocateLongitude(projectEntity.getLocateLongitude());
+            project.setOrgIdPath(projectEntity.getOrgIdPath());
+            project.setOrigin(projectEntity.getOrigin());
+            project.setOriginId(projectEntity.getOriginId());
+            project.setStatus(projectEntity.getStatus());
+            project.setTitle(projectEntity.getTitle());
+        }
+
+        // 2.项目处理进展
+        BlockChainProjectProcessFormDTO process = new BlockChainProjectProcessFormDTO();
+        process.setProcessId(processEntity.getId());
+        process.setCreatedBy(processEntity.getCreatedBy());
+        process.setCreatedTime(processEntity.getCreatedTime());
+        process.setCostWorkDays(processEntity.getCostWorkdays());
+        process.setAgencyId(processEntity.getAgencyId());
+        process.setCustomerId(processEntity.getCustomerId());
+        process.setDepartmentId(processEntity.getDepartmentId());
+        process.setDepartmentName(processEntity.getDepartmentName());
+        process.setEndTime(processEntity.getEndTime());
+        process.setGridId(processEntity.getGridId());
+        process.setInternalRemark(processEntity.getInternalRemark());
+        process.setIsSend(processEntity.getIsSend());
+        process.setOperation(processEntity.getOperation());
+        process.setOperationName(processEntity.getOperationName());
+        process.setOrgIdPath(processEntity.getOrgIdPath());
+        process.setProjectId(processEntity.getProjectId());
+        process.setPublicReply(processEntity.getPublicReply());
+        process.setStaffId(processEntity.getStaffId());
+
+        if (assignedStaffEntities == null) {
+            LambdaQueryWrapper<ProjectStaffEntity> query = new LambdaQueryWrapper<>();
+            query.eq(ProjectStaffEntity::getProcessId, process.getProjectId());
+            assignedStaffEntities = projectStaffDao.selectList(query);
+        }
+
+        if (CollectionUtils.isEmpty(assignedStaffEntities)) {
+            assignedStaffEntities = new ArrayList<>();
+        }
+
+        // 3.指派人员列表
+        List<BlockChainProjectProcessAssignedStaffFormDTO> assignedStaffs = assignedStaffEntities.stream().map(e -> {
+            BlockChainProjectProcessAssignedStaffFormDTO assignedStaff = new BlockChainProjectProcessAssignedStaffFormDTO();
+            assignedStaff.setStaffId(e.getStaffId());
+            assignedStaff.setCreatedBy(e.getCreatedBy());
+            assignedStaff.setCustomerId(e.getCustomerId());
+            assignedStaff.setCreatedTime(e.getCreatedTime());
+            assignedStaff.setProcessId(e.getProcessId());
+            assignedStaff.setDepartmentId(e.getDepartmentId());
+            assignedStaff.setDepartmentName(e.getDepartmentName());
+            assignedStaff.setGridId(e.getGridId());
+            assignedStaff.setId(e.getId());
+            assignedStaff.setIsHandle(e.getIsHandle());
+            assignedStaff.setOrgId(e.getOrgId());
+            assignedStaff.setOrgIdPath(e.getOrgIdPath());
+            assignedStaff.setProjectId(e.getProjectId());
+            return assignedStaff;
+        }).collect(Collectors.toList());
+
+        // 4.当前处理人
+        BlockChainProjectProcessAssignedStaffFormDTO handledStaff = null;
+        if (StringUtils.isNotBlank(projectStaffId)) {
+            ProjectStaffEntity handledStaffEntity = projectStaffDao.selectById(projectStaffId);
+
+            handledStaff = new BlockChainProjectProcessAssignedStaffFormDTO();
+            handledStaff.setStaffId(handledStaffEntity.getStaffId());
+            handledStaff.setCreatedBy(handledStaffEntity.getCreatedBy());
+            handledStaff.setCustomerId(handledStaffEntity.getCustomerId());
+            handledStaff.setCreatedTime(handledStaffEntity.getCreatedTime());
+            handledStaff.setProcessId(handledStaffEntity.getProcessId());
+            handledStaff.setDepartmentId(handledStaffEntity.getDepartmentId());
+            handledStaff.setDepartmentName(handledStaffEntity.getDepartmentName());
+            handledStaff.setGridId(handledStaffEntity.getGridId());
+            handledStaff.setId(handledStaffEntity.getId());
+            handledStaff.setIsHandle(handledStaffEntity.getIsHandle());
+            handledStaff.setOrgId(handledStaffEntity.getOrgId());
+            handledStaff.setOrgIdPath(handledStaffEntity.getOrgIdPath());
+            handledStaff.setProjectId(handledStaffEntity.getProjectId());
+        }
+        
+        if (project == null) {
+            // 处理
+            BlockChainProcessProjectFormDTO processForm = new BlockChainProcessProjectFormDTO();
+            processForm.setProcess(process);
+            processForm.setAssignedStaffs(assignedStaffs);
+            processForm.setHandledStaff(handledStaff);
+            thirdOpenFeignClient.blockChainProcessProject(processForm);
+        } else {
+            // 立项
+            BlockChainCreateProjectFormDTO createForm = new BlockChainCreateProjectFormDTO();
+            createForm.setProject(project);
+            createForm.setProcess(process);
+            createForm.setAssignedStaffs(assignedStaffs);
+            thirdOpenFeignClient.blockChainCreateProject(createForm);
+        }
+    }
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
index 85a2d6cc7e..ac0a279fb9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
@@ -214,4 +214,15 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
         return baseDao.selectProjectCategoryList(formDTO);
     }
 
+    /**
+     * 根据项目id，查询所有分类
+     *
+     * @param projectId
+     * @return
+     */
+    @Override
+    public List<ProjectCategoryDTO> getProjectCategoryService(String projectId) {
+        return baseDao.selectListByProjectId(projectId);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index de0a8347f4..e7932e3303 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@@ -37,8 +38,12 @@ import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.*;
-import com.epmet.dao.ProjectOrgRelationDao;
+import com.epmet.constant.ProjectConstant;
+import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.SmsTemplateConstant;
+import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.ProjectDao;
+import com.epmet.dao.ProjectOrgRelationDao;
 import com.epmet.dao.ProjectProcessDao;
 import com.epmet.dao.ProjectStaffDao;
 import com.epmet.dto.CustomerStaffDTO;
@@ -51,6 +56,7 @@ import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectOrgRelationEntity;
 import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectStaffEntity;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserFeignClient;
@@ -58,6 +64,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.ProjectProcessRedis;
 import com.epmet.send.SendMqMsgUtil;
+import com.epmet.service.BlockChainUploadService;
 import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectService;
 import com.epmet.service.ProjectStaffService;
@@ -120,6 +127,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
     @Autowired
     private LoginUserUtil loginUserUtil;
+    @Autowired
+    private BlockChainUploadService blockChainUploadService;
 
     @Override
     public PageData<ProjectProcessDTO> page(Map<String, Object> params) {
@@ -407,6 +416,13 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
             log.error("项目实时统计消息发送失败");
         }
 
+        // 数据上链
+        try {
+            blockChainUploadService.send2BlockChain(null, processEntity, entityList, formDTO.getProjectStaffId());
+        } catch (Exception e) {
+            String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+            log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+        }
     }
 
     /**
@@ -789,6 +805,14 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         if (!msgResult) {
             log.error("项目实时统计消息发送失败");
         }
+
+        // 数据上链
+        try {
+            blockChainUploadService.send2BlockChain(null, processEntity, entityList, formDTO.getProjectStaffId());
+        } catch (Exception e) {
+            String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+            log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+        }
     }
 
     /**
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 435f4838f8..6cafe080f3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -23,12 +23,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
 import com.epmet.commons.tools.constant.*;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 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.AgencyInfoCache;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.*;
@@ -71,8 +78,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -138,7 +147,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	private ProjectSatisfactionStatisticsDao statisticsDao;
 	@Autowired
 	private LoginUserUtil loginUserUtil;
-
+	@Autowired
+	private BlockChainUploadService blockChainUploadService;
 
 	private final static String ONE_DAY = "<1";
 
@@ -578,6 +588,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		if (!msgResult) {
 			log.error("项目实时统计消息发送失败");
 		}
+
+		// 数据上链
+		try {
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, null, fromDTO.getProjectStaffId());
+		} catch (Exception e) {
+			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+		}
 	}
 
 	/**
@@ -789,6 +807,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			// 新添一条记录
 			statisticsDao.insert(entity1);
 		}
+
+		// 数据上链
+		try {
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, null, fromDTO.getProjectStaffId());
+		} catch (Exception e) {
+			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+		}
 	}
 
 	@Override
@@ -957,6 +983,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		if (!msgResult) {
 			log.error("项目实时统计消息发送失败");
 		}
+
+		// 数据上链
+		try {
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, Arrays.asList(projectStaff), fromDTO.getProjectStaffId());
+		} catch (Exception e) {
+			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+		}
 	}
 
 	/**
@@ -1267,6 +1301,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			log.error("项目实时统计消息发送失败");
 		}
 
+		// 数据上链
+		try {
+			blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList, null);
+		} catch (Exception e) {
+			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+		}
+
 		return issueProjectResultDTO;
 	}
 
@@ -1355,7 +1397,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			log.error("项目实时统计消息发送失败");
 		}
 
-
+	// 数据上链
+		try {
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, new ArrayList<>(), null);
+		} catch (Exception e) {
+			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+		}
 	}
 
 	/**
@@ -2140,6 +2188,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		if (!msgResult) {
 			log.error("项目实时统计消息发送失败");
 		}
+
+		// 数据上链
+		try {
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, Arrays.asList(projectStaff), fromDTO.getProjectStaffId());
+		} catch (Exception e) {
+			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+		}
 	}
 
 	/**
@@ -2238,6 +2294,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			log.error("项目实时统计消息发送失败");
 		}
 
+		// 数据上链
+		try {
+			blockChainUploadService.send2BlockChain(null, projectProcessEntity, new ArrayList<>(), null);
+		} catch (Exception e) {
+			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+		}
 	}
 
 	/**
@@ -2789,4 +2852,301 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return baseDao.selectByOriginId(originId);
 	}
 
+	/**
+	 * @Description 【社区治理】项目分布分析-左边
+	 * @param formDTO
+	 * @param tokenDto
+	 * @author zxc
+	 * @date 2021/12/7 10:02 上午
+	 */
+	@Override
+	public List<ProjectDistributionAnalysisLeftResultDTO> projectDistributionAnalysisLeft(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto) {
+		if (StringUtils.isBlank(formDTO.getOrgId())){
+			CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+			if (null == staffInfo){
+				throw new EpmetException("未查询到此工作人员的所属组织信息...");
+			}
+			formDTO.setOrgId(staffInfo.getAgencyId());
+		}
+		Result<List<CategoryListResultDTO>> listResult = govIssueOpenFeignClient.selectCategoryOneLevelListByCustomerId(tokenDto);
+		if (!listResult.success()){
+			throw new EpmetException("查询1级分类列表失败...");
+		}
+		List<ProjectCategoryByDateDTO> projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getStartDate(),formDTO.getEndDate(), formDTO.getOrgId(), listResult.getData().get(NumConstant.ZERO).getCodeLength());
+		if (CollectionUtils.isEmpty(projectCategoryByDateDTOS)){
+			return new ArrayList<>();
+		}
+		return disposeTimeInterval(projectCategoryByDateDTOS, formDTO.getStartDate(), listResult.getData());
+	}
+
+	/**
+	 * @Description 【社区治理】项目分布分析-右边
+	 * 因项目数是随时间和组织变化，很难设定一个固定的数值段，因此根据分段规则将数据分成三段
+	 * 分段规则
+	 * 组织内所有网格项目数，网格内最低项目数向下十位取整数，网格内最高项目数向上取整数，获得取值范围，
+	 *
+	 * 根据： 采用这个公式
+	 * 最小取值+（最大取值-最小取值）/3
+	 * 最小取值+（最大取值-最小取值）*2/3
+	 * 获得两个数值，用两个数值确定三个取值范围，
+	 *
+	 * 代码公式：
+	 * 左区间=(最少项目个数/10)*10
+	 * 右区间=(最多项目个数/10+1)*10
+	 * 比如：阜新路街道内共10个网格，最低项目数的是124个项目（十位向下取整数），最高项目数的是241个项目（十位向上取整数），那就取值120~250区间，120到250分成3段，数值一：120+（250-120）/3≈163.3 , 数值二：120+（250-120）*2/3≈206.6  ,
+	 * 所以热力图三个数值应该是160以下（十位向下取整数），160-210（十位向上取整数），210以上
+	 * @param formDTO
+	 * @param tokenDto
+	 * @author zxc
+	 * @date 2021/12/8 10:21 上午
+	 */
+	@Override
+	public ProjectDistributionAnalysisRightResultDTO projectDistributionAnalysisRight(ProjectDistributionAnalysisFormDTO formDTO, TokenDto tokenDto) {
+		if (StringUtils.isBlank(formDTO.getOrgId())){
+			CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+			if (null == staffInfo){
+				throw new EpmetException("未查询到此工作人员的所属组织信息...");
+			}
+			formDTO.setOrgId(staffInfo.getAgencyId());
+		}
+		AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getOrgId());
+		if (null == agencyInfo){
+			throw new EpmetException(String.format("未查询到此组织信息{%s}",formDTO.getOrgId()));
+		}
+		ProjectDistributionAnalysisRightResultDTO result = new ProjectDistributionAnalysisRightResultDTO();
+		List<ProjectDistributionAnalysisRightDTO> orgList = new ArrayList<>();
+		if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){
+			Result<List<String>> sonAgencyIdResult = govOrgOpenFeignClient.getSonAgencyId(formDTO.getOrgId());
+			if (!sonAgencyIdResult.success()){
+				throw new EpmetException(String.format("查询组织{%s}的下级组织失败...",formDTO.getOrgId()));
+			}
+			List<String> agencyIds = sonAgencyIdResult.getData();
+			if (CollectionUtils.isNotEmpty(agencyIds)){
+				orgList = baseDao.selectProjectCountByOrg(agencyIds,formDTO.getStartDate(),formDTO.getEndDate());
+			}
+		}else {
+			Result<List<ProjectDistributionAnalysisRightDTO>> projectCountByGrid = govIssueOpenFeignClient.getProjectCountByGrid(formDTO);
+			if (!projectCountByGrid.success()){
+				throw new EpmetException("查询网格项目数失败...");
+			}
+			if (CollectionUtils.isNotEmpty(projectCountByGrid.getData())){
+				orgList = projectCountByGrid.getData();
+			}
+		}
+		if (CollectionUtils.isEmpty(orgList)){
+			return result;
+		}
+		result.setList(orgList);
+		List<Integer> allCount = orgList.stream().map(m -> m.getCount()).collect(Collectors.toList());
+		Integer max = Collections.max(allCount);
+		Integer min = Collections.min(allCount);
+		if (orgList.size() == NumConstant.ONE || max.compareTo(min) == NumConstant.ZERO){
+			result.setUnder(orgList.get(NumConstant.ZERO).getCount());
+			return result;
+		}
+		result.setUnder(min + ((max - min) / NumConstant.THREE));
+		result.setAbove(min + ((max - min) * NumConstant.TWO / NumConstant.THREE));
+		return result;
+	}
+
+	/**
+	 * 个人档案-话题详情-研判分析
+	 *
+	 * @param formDTO
+	 * @return
+	 */
+	@Override
+	public TopicResearchAnalysisResDTO topicResearchAnalysis(TopicResearchAnalysisFormDTO formDTO) {
+		//获取案件居民和及家属列表
+		//因为是从个人档案来，所以icResiUserId不会为空
+		Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId());
+		if (!userRes.success() || null == userRes.getData()) {
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常");
+		}
+		IcResiUserBriefDTO icResiUserDTO = userRes.getData();
+		TopicResearchAnalysisResDTO resultDTO = ConvertUtils.sourceToTarget(icResiUserDTO, TopicResearchAnalysisResDTO.class);
+		resultDTO.setProjectData(new ArrayList<>());
+		if(org.springframework.util.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
+			//灭有找到小程序里的用户id, 所以不用查询接下来的项目了.....
+			return resultDTO;
+		}
+		resultDTO.setEpmetUserIdList(formDTO.getEpmetUserIdList());
+
+		// 先判断这个项目是否有分类没有直接返回
+		List<ProjectCategoryDTO> projectCategoryDTOList=projectCategoryService.getProjectCategoryService(formDTO.getProjectId());
+		if(org.springframework.util.CollectionUtils.isEmpty(projectCategoryDTOList)){
+			return resultDTO;
+		}
+		//筛选出所有的一级分类
+		Set<String> firstCategoryIds=new HashSet<>();
+		for(ProjectCategoryDTO categoryDTO:projectCategoryDTOList){
+			if(StringUtils.isNotBlank(categoryDTO.getCategoryPids())){
+				if(NumConstant.ZERO_STR.equals(categoryDTO.getCategoryPids())){
+					//当前分类就是一级分类
+					firstCategoryIds.add(categoryDTO.getCategoryId());
+					continue;
+				}
+				//当前分类为二级分类
+				if(!categoryDTO.getCategoryPids().contains(StrConstant.COMMA)&&!categoryDTO.getCategoryPids().contains(StrConstant.COLON)){
+					firstCategoryIds.add(categoryDTO.getCategoryPids());
+					continue;
+				}
+				//英文逗号
+				if(categoryDTO.getCategoryPids().contains(StrConstant.COMMA)){
+					String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COMMA);
+					firstCategoryIds.add(categoryAtt[NumConstant.ZERO]);
+					continue;
+				}
+				//可能也是英文冒号吧。。不知道是啥，所以都判断下吧
+				if(categoryDTO.getCategoryPids().contains(StrConstant.COLON)){
+					String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COLON);
+					firstCategoryIds.add(categoryAtt[NumConstant.ZERO]);
+					continue;
+				}
+			}
+		}
+		//没有一级分类直接退出
+		if(org.springframework.util.CollectionUtils.isEmpty(firstCategoryIds)){
+			return resultDTO;
+		}
+		log.info(String.format("当前项目id:%s,所有一级分类id:%s",formDTO.getProjectId(), JSON.toJSONString(firstCategoryIds)));
+		//查询这些分类的名称
+		//查询出当前人，在居民端小程序里上报的需求且转了项目的，并且还得排除当前的这个项目
+		IssueProjectCategoryDictListFormDTO dictFormDto=new IssueProjectCategoryDictListFormDTO();
+		dictFormDto.setCustomerId(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId());
+		dictFormDto.setCstegoryIdList(new ArrayList<String>(firstCategoryIds));
+		Result<List<IssueProjectCategoryDictDTO>> categoryRes=govIssueOpenFeignClient.getCategoryList(dictFormDto);
+		if(!categoryRes.success()|| org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())){
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常");
+		}
+		List<ProjectDataDTO> projectData=new ArrayList<>();
+		for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){
+			//当前项目分类一致，排除当前项目，相同分类编码
+			List<ProjectInfoIcData> projectList=baseDao.selectCommonCategoryIssueProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(),
+					categoryDictDTO.getCategoryCode(),formDTO.getProjectId(),formDTO.getEpmetUserIdList());
+			if(!org.springframework.util.CollectionUtils.isEmpty(projectList)){
+				ProjectDataDTO projectDataDTO=new ProjectDataDTO();
+				projectDataDTO.setFirstCategoryCode(categoryDictDTO.getCategoryCode());
+				projectDataDTO.setFirstCategoryName(categoryDictDTO.getCategoryName());
+				projectDataDTO.setProjectList(projectList);
+				projectData.add(projectDataDTO);
+			}
+		}
+		resultDTO.setProjectData(projectData);
+		return resultDTO;
+	}
+
+	/**
+	 * @Description  区间项目分类数量处理
+	 * 查询的是时间段内的分类项目数，查询的时间 是传入一个日期，拼上时间，在进行比较大小
+	 * @param categories
+	 * @param date
+	 * @param listResult
+	 * @author zxc
+	 * @date 2021/12/8 9:45 上午
+	 */
+	public List<ProjectDistributionAnalysisLeftResultDTO> disposeTimeInterval(List<ProjectCategoryByDateDTO> categories, String date,List<CategoryListResultDTO> listResult){
+		// 把一天分成6段
+		List<String> intervalTimeList = getIntervalTimeList("00:00", "24:00", 240);
+		List<ProjectDistributionAnalysisLeftResultDTO> result = new ArrayList<>();
+		Map<String, List<ProjectCategoryByDateDTO>> groupByCode = categories.stream().collect(Collectors.groupingBy(ProjectCategoryByDateDTO::getCategoryCode));
+		for (int i = 0; i < intervalTimeList.size(); i++) {
+			ProjectDistributionAnalysisLeftResultDTO dto = new ProjectDistributionAnalysisLeftResultDTO();
+			dto.setTime(intervalTimeList.get(i));
+			dto.setCategoryList(ConvertUtils.sourceToTarget(listResult,CategoryListDTO.class));
+			if (i == NumConstant.ZERO){
+				String concat = date.concat(" ").concat(intervalTimeList.get(i)).concat(":00");
+				long end = DateUtils.stringToDate(concat,DateUtils.DATE_TIME_PATTERN).getTime();
+				dto.getCategoryList().forEach(cate -> {
+					AtomicReference<Integer> count = new AtomicReference<>(cate.getCount());
+					groupByCode.forEach((k,v) -> {
+						if (cate.getCategoryCode().equals(k)){
+							v.forEach(l -> {
+								if (l.getCreatedTime().getTime() < end){
+									cate.setCount(count.getAndSet(count.get() + NumConstant.ONE));
+								}
+							});
+						}
+					});
+				});
+			}else {
+				String concat = date.concat(" ").concat(intervalTimeList.get(i)).concat(":00");
+				long end = NumConstant.ZERO_L;
+				if (intervalTimeList.get(i).equals("00:00")){
+					Calendar c = new GregorianCalendar();
+					Date endDate = DateUtils.stringToDate(concat,DateUtils.DATE_TIME_PATTERN);
+					c.setTime(endDate);
+					c.add(Calendar.DATE,NumConstant.ONE);
+					end = c.getTime().getTime();
+				}else {
+					end = DateUtils.stringToDate(concat,DateUtils.DATE_TIME_PATTERN).getTime();
+				}
+				String startStr = date.concat(" ").concat(intervalTimeList.get(i - NumConstant.ONE)).concat(":00");
+				long start = DateUtils.stringToDate(startStr,DateUtils.DATE_TIME_PATTERN).getTime();
+				long finalEnd = end;
+				dto.getCategoryList().forEach(cate -> {
+					AtomicReference<Integer> count = new AtomicReference<>(cate.getCount());
+					groupByCode.forEach((k,v) -> {
+						if (cate.getCategoryCode().equals(k)){
+							v.forEach(l -> {
+								if (l.getCreatedTime().getTime() < finalEnd && l.getCreatedTime().getTime() >= start){
+									cate.setCount(count.getAndSet(count.get() + NumConstant.ONE));
+								}
+							});
+						}
+					});
+				});
+			}
+			result.add(dto);
+		}
+		return result;
+	}
+
+	/**
+	 * @Description  获取固定时间段之间固定时间的集合
+	 * @param start 开始时间
+	 * @param end 结束时间
+	 * @param interval 间隔时间
+	 * @author zxc
+	 * @date 2021/11/22 3:48 下午
+	 */
+	public List<String> getIntervalTimeList(String start,String end,Integer interval) {
+		Date startDate = convertStringToDate("HH:mm", start);
+		Date endDate = convertStringToDate("HH:mm", end);
+		List<String> list = new ArrayList<>();
+		while (startDate.getTime() <= endDate.getTime()) {
+			list.add(convertDateToString("HH:mm", startDate));
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(startDate);
+			calendar.add(Calendar.MINUTE, interval);
+			if (calendar.getTime().getTime() > endDate.getTime()) {
+				if (!startDate.equals(endDate)) {
+					list.add(convertDateToString("HH:mm", endDate));
+				}
+				startDate = calendar.getTime();
+			} else {
+				startDate = calendar.getTime();
+			}
+
+		}
+		list.remove(NumConstant.ZERO);
+		return list;
+	}
+
+
+	public Date convertStringToDate(String format, String dateStr) {
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
+		try {
+			Date date = simpleDateFormat.parse(dateStr);
+			return date;
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public String convertDateToString(String format, Date date) {
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
+		return simpleDateFormat.format(date);
+	}
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
index 1acbb42f43..1150ecc9f5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
@@ -7,6 +7,7 @@ import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
@@ -96,6 +97,8 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 	private ResiEventService resiEventService;
 	@Autowired
 	private ResiEventReportOrgDao resiEventReportOrgDao;
+	@Autowired
+	private BlockChainUploadService blockChainUploadService;
 
 	@Override
 	public List<PendProjectListResultDTO> getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
@@ -534,6 +537,13 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 			log.error("项目实时统计消息发送失败");
 		}
 
+		// 数据上链
+		try {
+			blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList, null);
+		} catch (Exception e) {
+			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+		}
 	}
 
 	/**
@@ -860,6 +870,15 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		resiEventService.shiftProject(eventShiftProjectDTO);
 		EventToProjectResultDTO resultDTO=new EventToProjectResultDTO();
 		resultDTO.setProjectId(projectEntity.getId());
+
+		// 数据上链
+		try {
+			blockChainUploadService.send2BlockChain(projectEntity, processEntity, entityList, null);
+		} catch (Exception e) {
+			String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
+			log.error("【项目流转】上链失败，错误信息:{}", errorMsg);
+		}
+
 		return resultDTO;
 	}
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 3adca24761..ab54bfd340 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -23,7 +23,9 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.FileCommonDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@@ -37,11 +39,15 @@ import com.epmet.constant.EventConstant;
 import com.epmet.constant.ResiEventAction;
 import com.epmet.dao.*;
 import com.epmet.dto.EventProjectInfoDTO;
+import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.service.ProjectCategoryService;
 import com.epmet.service.ResiEventService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -53,10 +59,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * 居民报事表
@@ -89,6 +92,11 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     private ProjectDao projectDao;
     @Autowired
     private ResiEventReplyDao resiEventReplyDao;
+    @Autowired
+    private ProjectCategoryService projectCategoryService;
+    @Autowired
+    private GovIssueOpenFeignClient govIssueOpenFeignClient;
+
 
     /**
      * @Description  群众直报（待处理、处理中、已办结）列表
@@ -162,7 +170,20 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     @Override
     @Transactional(rollbackFor = Exception.class)
     public EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO, TokenDto tokenDto) {
-        EventDetailResultDTO dto = baseDao.selectEventDetail(formDTO.getEventId());
+        //单独抽出来一个方法，因为数据分析中，个人档案-事件详情也许要调用
+        EventDetailResultDTO dto =getEventDetailResultDTO(formDTO.getEventId());
+        // 更改已读状态 报事人的红点：resi_event,艾特人的：resi_event_mention,所代表的组织的：resi_event_report_org
+        if (tokenDto.getApp().equals(EventConstant.TYPE_RESI)){
+            baseDao.updateResiEvent(tokenDto.getUserId(),formDTO.getEventId());
+            baseDao.updateEventMention(tokenDto.getUserId(),formDTO.getEventId());
+        }else if (tokenDto.getApp().equals(EventConstant.TYPE_GOV)){
+            resiEventReportOrgDao.updateEventOrg(formDTO.getEventId(), formDTO.getOrgId());
+        }
+        return dto;
+    }
+
+    public EventDetailResultDTO getEventDetailResultDTO(String resiEventId){
+        EventDetailResultDTO dto = baseDao.selectEventDetail(resiEventId);
         if (null == dto){
             return new EventDetailResultDTO();
         }
@@ -204,15 +225,17 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         }
         List<String> data = orgResult.getData();
         dto.setEventOrg(data);
-        // 更改已读状态 报事人的红点：resi_event,艾特人的：resi_event_mention,所代表的组织的：resi_event_report_org
-        if (tokenDto.getApp().equals(EventConstant.TYPE_RESI)){
-            baseDao.updateResiEvent(tokenDto.getUserId(),formDTO.getEventId());
-            baseDao.updateEventMention(tokenDto.getUserId(),formDTO.getEventId());
-        }else if (tokenDto.getApp().equals(EventConstant.TYPE_GOV)){
-            resiEventReportOrgDao.updateEventOrg(formDTO.getEventId(), formDTO.getOrgId());
-        }
         return dto;
     }
+    /**
+     * 数字赋能平台-个人档案-事件详情
+     *
+     * @param formDTO
+     * @return
+     */
+    public EventDetailResultDTO eventDetailForIcData(ResiEventDetailFormDTO formDTO){
+        return getEventDetailResultDTO(formDTO.getResiEventId());
+    }
 
     /**
      * 我要报事-提交（尹）
@@ -639,5 +662,109 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         return res;
     }
 
+    /**
+     * 数据分析-个人档案-上报事件列表
+     * 根据epmetUserIdList查询
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<PageUserReportEventResDTO> pageUserReported(PageUserReportEventFormDTO formDTO) {
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) {
+            return new PageData<PageUserReportEventResDTO>(new ArrayList<>(), NumConstant.ZERO);
+        }
+        PageInfo<PageUserReportEventResDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO));
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
+    }
+
+    /**
+     * 数据分析-个人档案-上报事件列表-事件详情研判分析
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public ResiEventResearchAnalysisResDTO queryResiEventResearchAnalysis(ResiEventResearchAnalysisFormDTO formDTO) {
+        //获取案件居民和及家属列表
+        //因为是从个人档案来，所以icResiUserId不会为空
+        Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId());
+        if (!userRes.success() || null == userRes.getData()) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常");
+        }
+        IcResiUserBriefDTO icResiUserDTO = userRes.getData();
+        ResiEventResearchAnalysisResDTO resultDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiEventResearchAnalysisResDTO.class);
+        resultDTO.setProjectData(new ArrayList<>());
+        if(CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
+            //灭有找到小程序里的用户id, 所以不用查询接下来的项目了.....
+            return resultDTO;
+        }
+        resultDTO.setEpmetUserIdList(formDTO.getEpmetUserIdList());
+
+        // 先判断这个项目是否有分类没有直接返回
+        List<ProjectCategoryDTO> projectCategoryDTOList=projectCategoryService.getProjectCategoryService(formDTO.getProjectId());
+        if(CollectionUtils.isEmpty(projectCategoryDTOList)){
+            return resultDTO;
+        }
+        //筛选出所有的一级分类
+        Set<String> firstCategoryIds=new HashSet<>();
+        for(ProjectCategoryDTO categoryDTO:projectCategoryDTOList){
+            if(StringUtils.isNotBlank(categoryDTO.getCategoryPids())){
+                if(NumConstant.ZERO_STR.equals(categoryDTO.getCategoryPids())){
+                    //当前分类就是一级分类
+                    firstCategoryIds.add(categoryDTO.getCategoryId());
+                    continue;
+                }
+                //当前分类为二级分类
+                if(!categoryDTO.getCategoryPids().contains(StrConstant.COMMA)&&!categoryDTO.getCategoryPids().contains(StrConstant.COLON)){
+                    firstCategoryIds.add(categoryDTO.getCategoryPids());
+                    continue;
+                }
+                //英文逗号
+                if(categoryDTO.getCategoryPids().contains(StrConstant.COMMA)){
+                    String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COMMA);
+                    firstCategoryIds.add(categoryAtt[NumConstant.ZERO]);
+                    continue;
+                }
+                //可能也是英文冒号吧。。不知道是啥，所以都判断下吧
+                if(categoryDTO.getCategoryPids().contains(StrConstant.COLON)){
+                    String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COLON);
+                    firstCategoryIds.add(categoryAtt[NumConstant.ZERO]);
+                    continue;
+                }
+            }
+        }
+        //没有一级分类直接退出
+        if(CollectionUtils.isEmpty(firstCategoryIds)){
+            return resultDTO;
+        }
+        log.info(String.format("当前项目id:%s,所有一级分类id:%s",formDTO.getProjectId(), JSON.toJSONString(firstCategoryIds)));
+        //查询这些分类的名称
+        //查询出当前人，在居民端小程序里上报的需求且转了项目的，并且还得排除当前的这个项目
+        IssueProjectCategoryDictListFormDTO dictFormDto=new IssueProjectCategoryDictListFormDTO();
+        dictFormDto.setCustomerId(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId());
+        dictFormDto.setCstegoryIdList(new ArrayList<String>(firstCategoryIds));
+        Result<List<IssueProjectCategoryDictDTO>> categoryRes=govIssueOpenFeignClient.getCategoryList(dictFormDto);
+        if(!categoryRes.success()||CollectionUtils.isEmpty(categoryRes.getData())){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常");
+        }
+        List<ProjectDataDTO> projectData=new ArrayList<>();
+        for(IssueProjectCategoryDictDTO categoryDictDTO:categoryRes.getData()){
+            //当前项目分类一致，排除当前项目，相同分类编码
+            List<ProjectInfoIcData> projectList=projectDao.selectCommonCategoryEventProject(projectCategoryDTOList.get(NumConstant.ZERO).getCustomerId(),
+                    categoryDictDTO.getCategoryCode(),formDTO.getProjectId(),formDTO.getEpmetUserIdList());
+            if(!CollectionUtils.isEmpty(projectList)){
+                ProjectDataDTO projectDataDTO=new ProjectDataDTO();
+                projectDataDTO.setFirstCategoryCode(categoryDictDTO.getCategoryCode());
+                projectDataDTO.setFirstCategoryName(categoryDictDTO.getCategoryName());
+                projectDataDTO.setProjectList(projectList);
+                projectData.add(projectDataDTO);
+            }
+        }
+        resultDTO.setProjectData(projectData);
+        return resultDTO;
+    }
+
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
index 0e8f0ca47c..2800f5ad1c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
@@ -28,6 +28,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+      #监控页面
+      stat-view-servlet:
+        enabled: true
+        #loginUsername: admin
+        #loginPassword: admin
+        allow:
+      web-stat-filter:
+        enabled: true
+      filters: stat,wall,log4j2
   # 数据迁移工具flyway
   flyway:
     enabled: @spring.flyway.enabled@
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
index 49942cdca3..24acbb220f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
@@ -50,4 +50,11 @@
             )
     </select>
 
+    <select id="selectListByProjectId" parameterType="java.lang.String" resultType="com.epmet.dto.ProjectCategoryDTO">
+        SELECT
+            *
+        FROM project_category
+        WHERE DEL_FLAG = '0'
+        and  PROJECT_ID = #{projectId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index ab6c65c8a7..2e5d52b4ca 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -397,4 +397,90 @@
         where p.DEL_FLAG = '0'
           AND p.ORIGIN_ID = #{originId}
     </select>
+
+    <!-- 根据日期查询项目分类 -->
+    <select id="selectProjectCategoryByDate" resultType="com.epmet.dto.result.ProjectCategoryByDateDTO">
+        SELECT
+            DISTINCT p.ID AS projectId,
+            CONCAT(#{startDate},' ', DATE_FORMAT(p.CREATED_TIME,'%H:%i:%s')) AS createdTime,
+            LEFT(pc.CATEGORY_CODE,#{codeLength}) AS categoryCode
+        FROM project p
+        INNER JOIN project_category pc ON (pc.PROJECT_ID = p.ID AND pc.DEL_FLAG = 0)
+        WHERE p.DEL_FLAG = 0
+          AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+          AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') >= #{startDate}
+          AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
+        ORDER BY projectId
+    </select>
+
+    <!--    数据分析-个人档案-事件详情页面的研判分析项目列表 -->
+    <select id="selectCommonCategoryEventProject" parameterType="map" resultType="com.epmet.dto.result.ProjectInfoIcData">
+        select
+            distinct pc.PROJECT_ID as projectId,
+            p.TITLE as projectTitle,
+            p.ORIGIN_ID as resiEventId,
+            p.`STATUS` as projectStatus,
+            '' as issueId,
+            '' as topicId
+        from project_category pc
+        inner join project p
+        on(pc.PROJECT_ID=p.id)
+        inner join resi_event re
+        on(p.ORIGIN_ID=re.id)
+        where pc.DEL_FLAG='0'
+        and p.DEL_FLAG='0'
+        and re.DEL_FLAG='0'
+        and pc.CUSTOMER_ID=#{customerId}
+        and p.ORIGIN='resi_event'
+        and pc.PROJECT_ID !=#{excludeProjectId}
+        <foreach collection="epmetUserIds" item="epmetUserId" open="AND(  " separator=" OR " index="index" close=")">
+            re.REPORT_USER_ID = #{epmetUserId}
+        </foreach>
+        and pc.CATEGORY_CODE like concat(#{categoryCode},'%')
+        order by p.CREATED_TIME desc
+    </select>
+
+    <!--    数据分析-个人档案-话题详情页面的研判分析项目列表 -->
+    <select id="selectCommonCategoryIssueProject" parameterType="map" resultType="com.epmet.dto.result.ProjectInfoIcData">
+        SELECT
+         DISTINCT
+            pc.PROJECT_ID AS projectId,
+            p.TITLE AS projectTitle,
+            p.ORIGIN_ID AS issueId,
+            per.SOURCE_ID as topicId,
+            p.`STATUS` AS projectStatus,
+            '' as resiEventId
+        FROM
+            project_category pc
+            INNER JOIN project_related_personnel per ON ( pc.PROJECT_ID = per.PROJECT_ID )
+            INNER JOIN project p on(pc.project_id=p.id)
+        WHERE
+            pc.DEL_FLAG = '0'
+            AND per.DEL_FLAG = '0'
+            AND p.DEL_FLAG = '0'
+            AND pc.CUSTOMER_ID = #{customerId}
+            AND p.ORIGIN = 'issue'
+            and per.SOURCE_TYPE='topic'
+            AND pc.PROJECT_ID != #{excludeProjectId}
+            AND pc.CATEGORY_CODE LIKE concat( #{categoryCode}, '%' )
+            <foreach collection="epmetUserIds" item="epmetUserId" open="AND(  " separator=" OR " index="index" close=")">
+                 per.USER_ID = #{epmetUserId}
+            </foreach>
+        ORDER BY
+            p.CREATED_TIME DESC
+    </select>
+
+    <!-- 查询组织下的项目数 -->
+    <select id="selectProjectCountByOrg" resultType="com.epmet.dto.result.ProjectDistributionAnalysisRightDTO">
+        <foreach collection="orgIds" item="orgId" separator=" UNION ALL ">
+            SELECT
+                #{orgId} AS orgId,
+                COUNT(ID) AS count
+            FROM project
+            WHERE DEL_FLAG = '0'
+                AND ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+                AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate}
+                AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 3284be99e6..d88575dbab 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -201,4 +201,20 @@
         </foreach>)
         ORDER BY ro.CREATED_TIME DESC
     </select>
+
+    <select id="selectUserReported" parameterType="com.epmet.dto.form.PageUserReportEventFormDTO" resultType="com.epmet.dto.result.PageUserReportEventResDTO">
+        SELECT
+            re.id AS resiEventId,
+            re.EVENT_CONTENT AS eventContent,
+            re.SHIFT_PROJECT AS shiftProject,
+            IFNULL(re.PROJECT_ID,'') AS projectId,
+            re.CREATED_TIME AS  reportTime
+        FROM
+            resi_event re
+        WHERE
+            re.DEL_FLAG = '0'
+        <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
+            re.REPORT_USER_ID = #{epmetUserId}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java
index b5d7919388..630690be40 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java
@@ -8,7 +8,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
- *
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
@@ -18,7 +17,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableAsync
 @ServletComponentScan
 public class GovVoiceApplication {
-	public static void main(String[] args) {
-		SpringApplication.run(GovVoiceApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(GovVoiceApplication.class, args);
+    }
 }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/LbController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/LbController.java
new file mode 100644
index 0000000000..718d10929e
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/LbController.java
@@ -0,0 +1,23 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.commons.util.InetUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("lb")
+public class LbController {
+
+    @Autowired
+    private InetUtils inetUtils;
+
+    @PostMapping("get-host")
+    public Result getHost() {
+        String ipAddress = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+        return new Result().ok(ipAddress);
+    }
+
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java
new file mode 100644
index 0000000000..f7fa5bb1da
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description ic 表单options查询通用dto
+ * @Author wangxianzhang
+ * @Date 2021/12/12 1:07 下午
+ * @Version 1.0
+ */
+@Data
+public class IcFormOptionsQueryFormDTO {
+    
+    public interface QueryByLabelAndCustomerIdForForm {}
+    
+    @NotBlank(message = "客户ID必填", groups = { QueryByLabelAndCustomerIdForForm.class })
+    private String customerId;
+
+    @NotBlank(message = "FormCode必填", groups = { QueryByLabelAndCustomerIdForForm.class })
+    private String formCode;
+
+    @NotBlank(message = "OptionsLabel必填", groups = { QueryByLabelAndCustomerIdForForm.class })
+    private String label;
+    
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
index 2882f9977f..9cda858533 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java
@@ -3,6 +3,7 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerFootBarDTO;
+import com.epmet.dto.IcFormItemOptionsDTO;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiCategoryWarnConfigDTO;
 import com.epmet.dto.form.*;
@@ -120,4 +121,12 @@ public interface OperCustomizeOpenFeignClient {
     @PostMapping("/oper/customize/icformitemoptions/volunteerlabelbyvalues")
     Result<List<String>> volunteerLabelByValues(@RequestBody List<String> volunteers,@RequestParam("customerId") String customerId);
 
+    /**
+     * 使用item相关条件查询关联的options
+     * @param input
+     * @return
+     */
+    @PostMapping("/oper/customize/icformitemoptions/list-by-item-conditions")
+    Result<List<IcFormItemOptionsDTO>> listOptionsByItemConditions(@RequestBody IcFormOptionsQueryFormDTO input);
+
 }
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java
index a75999eb0e..da282124bb 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java
@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerFootBarDTO;
+import com.epmet.dto.IcFormItemOptionsDTO;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiCategoryWarnConfigDTO;
 import com.epmet.dto.form.*;
@@ -103,4 +104,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
     public Result<List<String>> volunteerLabelByValues(List<String> volunteers,String customerId) {
         return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "volunteerLabelByValues",volunteers,customerId);
     }
+
+	@Override
+	public Result<List<IcFormItemOptionsDTO>> listOptionsByItemConditions(IcFormOptionsQueryFormDTO input) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "listOptionsByItemConditions", input);
+	}
 }
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index dd07e01331..295631391f 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.64</version>
+    <version>0.3.70</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java
index 262255826a..ed22604272 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java
@@ -26,14 +26,17 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcFormItemOptionsDTO;
+import com.epmet.dto.form.IcFormOptionsQueryFormDTO;
 import com.epmet.excel.IcFormItemOptionsExcel;
 import com.epmet.service.IcFormItemOptionsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.tags.form.InputTag;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.function.IntUnaryOperator;
 
 
 /**
@@ -102,4 +105,21 @@ public class IcFormItemOptionsController {
         return new Result<List<String>>().ok(icFormItemOptionsService.volunteerLabelByValues(volunteers,customerId));
     }
 
+    /**
+     * 使用item相关条件查询关联的options
+     * @param input
+     * @return
+     */
+    @PostMapping("list-by-item-conditions")
+    public Result<List<IcFormItemOptionsDTO>> listOptionsByItemConditions(@RequestBody IcFormOptionsQueryFormDTO input) {
+        ValidatorUtils.validateEntity(input, IcFormOptionsQueryFormDTO.QueryByLabelAndCustomerIdForForm.class);
+        String customerId = input.getCustomerId();
+        String formCode = input.getFormCode();
+        String label = input.getLabel();
+
+        List<IcFormItemOptionsDTO> r = icFormItemOptionsService.getOptionsByItemConditions(customerId, formCode, label);
+        return new Result<List<IcFormItemOptionsDTO>>().ok(r);
+    }
+    
+
 }
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java
index 387cc05412..7423f85289 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java
@@ -100,4 +100,13 @@ public interface IcFormItemOptionsService extends BaseService<IcFormItemOptionsE
      * @date 2021/11/8 10:02 上午
      */
     List<String> volunteerLabelByValues(List<String> volunteers, String customerId);
+
+    /**
+     * 使用item相关条件查询options
+     * @param customerId
+     * @param formCode
+     * @param label
+     * @return
+     */
+    List<IcFormItemOptionsDTO> getOptionsByItemConditions(String customerId, String formCode, String label);
 }
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java
index 144e56e568..970845cbee 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java
@@ -17,23 +17,30 @@
 
 package com.epmet.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcFormItemDao;
 import com.epmet.dao.IcFormItemOptionsDao;
 import com.epmet.dto.IcFormItemOptionsDTO;
+import com.epmet.entity.IcFormItemEntity;
 import com.epmet.entity.IcFormItemOptionsEntity;
 import com.epmet.service.IcFormItemOptionsService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 表单项的选项
@@ -44,7 +51,9 @@ import java.util.Map;
 @Service
 public class IcFormItemOptionsServiceImpl extends BaseServiceImpl<IcFormItemOptionsDao, IcFormItemOptionsEntity> implements IcFormItemOptionsService {
 
-
+    @Autowired
+    private IcFormItemDao icFormItemDao;
+    
     @Override
     public PageData<IcFormItemOptionsDTO> page(Map<String, Object> params) {
         IPage<IcFormItemOptionsEntity> page = baseDao.selectPage(
@@ -61,8 +70,8 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl<IcFormItemOpti
         return ConvertUtils.sourceToTarget(entityList, IcFormItemOptionsDTO.class);
     }
 
-    private QueryWrapper<IcFormItemOptionsEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<IcFormItemOptionsEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<IcFormItemOptionsEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -98,14 +107,40 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl<IcFormItemOpti
     }
 
     /**
-     * @Description  查询志愿者类型
      * @param volunteers
+     * @Description 查询志愿者类型
      * @author zxc
      * @date 2021/11/8 10:02 上午
      */
     @Override
-    public List<String> volunteerLabelByValues(List<String> volunteers,String customerId) {
-        return baseDao.volunteerLabelByValues(volunteers,customerId);
+    public List<String> volunteerLabelByValues(List<String> volunteers, String customerId) {
+        return baseDao.volunteerLabelByValues(volunteers, customerId);
     }
 
+    @Override
+    public List<IcFormItemOptionsDTO> getOptionsByItemConditions(String customerId, String formCode, String label) {
+
+        // 查询item
+        LambdaQueryWrapper<IcFormItemEntity> formItemQuery = new LambdaQueryWrapper<>();
+        formItemQuery.eq(IcFormItemEntity::getCustomerId, customerId);
+        formItemQuery.eq(IcFormItemEntity::getFormCode, formCode);
+        formItemQuery.eq(IcFormItemEntity::getLabel, label);
+        IcFormItemEntity item = icFormItemDao.selectOne(formItemQuery);
+
+        if (item == null) {
+            return new ArrayList<>();
+        }
+        
+        // 通过item查询options
+        LambdaQueryWrapper<IcFormItemOptionsEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcFormItemOptionsEntity::getItemId, item.getId());
+        query.orderByAsc(IcFormItemOptionsEntity::getSort);
+
+        // 属性拷贝
+        return baseDao.selectList(query).stream().map(o -> {
+            IcFormItemOptionsDTO oDTO = new IcFormItemOptionsDTO();
+            BeanUtil.copyProperties(o, oDTO);
+            return oDTO;
+        }).collect(Collectors.toList());
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
index 9ed8c34510..7994bf7d8d 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
@@ -126,7 +126,7 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
      * 更新时间
      */
 	private Date updatedTime;
-	
+
 	private List<ResiGroupMemberDTO> memberList;
 
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
index 2bce88383f..9af69706cd 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.topic.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -90,4 +91,6 @@ public class ResiTopicIncludeIssueDetailResultDTO implements Serializable {
      * 话题被屏蔽详情
      */
     private TopicHiddenDetailDTO hiddenDetail;
+
+    private String gridName;
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
index 1762b35d97..c95abb1044 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
@@ -271,15 +271,6 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("/resi/group/topic/topiccreateduserbatch")
     Result<List<TopicCreatedUserBatchResultDTO>> topicCreatedUserBatch(@RequestParam("topicIds")List<String> topicIds);
 
-    /**
-     * @Description 通过话题id批量查询话题详情列表
-     * @return
-     * @author wxz
-     * @date 2021.05.18 16:24
-    */
-    @PostMapping("/resi/group/topic/get-topicdetail-byid/batch")
-    Result<List<ResiTopicDetailResultDTO>> listTopicDetailsByIds(TopicDetailBatchFormDTO input);
-
     /**
      * @Description  查询话题信息
      * @Param issueIds
@@ -289,6 +280,15 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("resi/group/topic/gettopicinfos")
     Result<List<TopicInfoResultDTO>> getTopicInfos(@RequestBody List<String> issueIds);
 
+
+    /**
+     * @Description 通过话题id批量查询话题详情列表
+     * @return
+     * @author wxz
+     * @date 2021.05.18 16:24
+    */
+    @PostMapping("/resi/group/topic/get-topicdetail-byid/batch")
+    Result<List<ResiTopicDetailResultDTO>> listTopicDetailsByIds(TopicDetailBatchFormDTO input);
     /**
      * @description 根据组id列表批量查询组信息列表
      *
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
index 8c2f5303ee..11d0514d5e 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
@@ -3,13 +3,24 @@ package com.epmet.resi.group.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.form.*;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
+import com.epmet.resi.group.dto.group.ResiGroupDTO;
+import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
+import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
+import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
+import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
+import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
+import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
+import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
+import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
+import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
@@ -131,6 +142,7 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "sendEvent",param);
     }
 
+
     @Override
     public Result<ResiTopicDTO> queryTopicInfoByIssueId(String issueId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryTopicInfoByIssueId", issueId);
@@ -157,11 +169,6 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicAttachmentList", formDTO);
     }
 
-    @Override
-    public Result<List<AllMessagesResultDTO>> allMessages(AllMessagesFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "allMessages", formDTO);
-    }
-
     /**
      * 获取小组详情
      *
@@ -201,6 +208,11 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupPointDetail", formDTO);
     }
 
+    @Override
+    public Result<List<AllMessagesResultDTO>> allMessages(AllMessagesFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "allMessages", formDTO);
+    }
+
     @Override
     public Result<String> topicCreatedUser(String topicId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicCreatedUser", topicId);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
index e90adf8c14..6195fbf2e9 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
@@ -455,7 +455,6 @@ public class ResiGroupController {
         return new Result();
     }
 
-
     /**
      * @param formDTO
      * @author yinzuomei
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 0b6ecd84b0..194c927f37 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -47,6 +47,7 @@ import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.group.constant.GroupConstant;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
index 08b62c9d1c..daf4e23248 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
@@ -169,16 +169,16 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 */
 	String selectUserRole(@Param("groupId")String groupId, @Param("userId")String userId);
 
-	int exitGroupById(@Param("id") String id, @Param("updatedBy") String updatedBy);
-
-	/**
-	 * desc: 仅统计除组长之外的成员数
-	 *
-	 * @param customerId
-	 * @param groupId
-	 * @return int
-	 * @author LiuJanJun
-	 * @date 2021/4/23 3:14 下午
-	 */
+    /**
+     * desc: 仅统计除组长之外的成员数
+     *
+     * @param customerId
+ 	 * @param groupId
+     * @return int
+     * @author LiuJanJun
+     * @date 2021/4/23 3:14 下午
+     */
 	int countAllMembers(@Param("customerId") String customerId, @Param("groupId") String groupId);
+
+	int exitGroupById(@Param("id") String id, @Param("updatedBy") String updatedBy);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java
index c86286bfc5..d57eba9d90 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java
@@ -2,6 +2,8 @@ package com.epmet.modules.test;
 
 import com.epmet.commons.tools.utils.HttpContextUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.OssFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -12,6 +14,9 @@ import javax.servlet.http.HttpServletRequest;
 @RequestMapping("test")
 public class TestController {
 
+    @Autowired
+    private OssFeignClient ossFeignClient;
+
     @PostMapping("get-req-info")
     public Result testDomain(HttpServletRequest request) {
         String requestServerNameAndPort = HttpContextUtils.getRequestServerNameAndPort();
@@ -27,4 +32,5 @@ public class TestController {
         return new Result();
     }
 
+
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index 9353e6549f..1695aaba09 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
@@ -510,6 +510,17 @@ public class ResiTopicController {
         return new Result<List<TopicCreatedUserBatchResultDTO>>().ok(topicService.topicCreatedUserBatch(topicIds));
     }
 
+
+    /**
+     * @Description  查询话题信息
+     * @Param issueIds
+     * @author zxc
+     * @date 2021/5/17 4:19 下午
+     */
+    @PostMapping("gettopicinfos")
+    public Result<List<TopicInfoResultDTO>> getTopicInfos(@RequestBody List<String> issueIds){
+        return new Result<List<TopicInfoResultDTO>>().ok(topicService.getTopicInfos(issueIds));
+    }
     /**
      * @Description 根据话题id，批量查询话题详情
      * @return
@@ -523,16 +534,4 @@ public class ResiTopicController {
         return new Result<List<ResiTopicDetailResultDTO>>().ok(topicDetails);
     }
 
-
-
-    /**
-     * @Description  查询话题信息
-     * @Param issueIds
-     * @author zxc
-     * @date 2021/5/17 4:19 下午
-     */
-    @PostMapping("gettopicinfos")
-    public Result<List<TopicInfoResultDTO>> getTopicInfos(@RequestBody List<String> issueIds){
-        return new Result<List<TopicInfoResultDTO>>().ok(topicService.getTopicInfos(issueIds));
-    }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
index 9a552f2baa..9960add54e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
@@ -332,6 +332,16 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @Description 获取话题附件信息
      **/
     TopicAttachmentResultDTO topicAttachmentList(TopicAttachmentFormDTO formDTO);
+
+    /**
+     * @Description 根据事件枚举发送积分事件
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2021.01.04 16:41
+    */
+    void sendTopicPointEventByEventType(TopicEventFormDTO param);
+    /**
     /**
      * @Description 向关注话题的人发送微信订阅
      * @param tokenDto
@@ -343,14 +353,6 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      */
     void sendWxmpUpdateSubscribe(TokenDto tokenDto, String id, String type);
 
-    /**
-     * @Description 根据事件枚举发送积分事件
-     * @param param
-     * @return void
-     * @author wangc
-     * @date 2021.01.04 16:41
-    */
-    void sendTopicPointEventByEventType(TopicEventFormDTO param);
 
     ResiTopicDTO queryTopicInfoByIssueId(String issueId);
 
@@ -406,14 +408,6 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      */
     List<TopicCreatedUserBatchResultDTO> topicCreatedUserBatch(List<String> topicIds);
 
-    /**
-     * @Description 根据话题id批量查询话题详情
-     * @return
-     * @author wxz
-     * @date 2021.05.18 15:42
-    */
-    List<ResiTopicDetailResultDTO> listTopicDetailsByIds(List<String> topicIdList);
-
     /**
      * @Description  查询话题信息
      * @Param issueIds
@@ -421,4 +415,12 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @date 2021/5/17 4:19 下午
      */
     List<TopicInfoResultDTO> getTopicInfos(List<String> issueIds);
+
+    /**
+     * @Description 根据话题id批量查询话题详情
+     * @return
+     * @author wxz
+     * @date 2021.05.18 15:42
+    */
+    List<ResiTopicDetailResultDTO> listTopicDetailsByIds(List<String> topicIdList);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index 523f81dc49..018e491409 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -310,7 +310,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                                     (content.substring(NumConstant.ZERO,NumConstant.TEN) + "…") :
                                     content);
                     builder.append("\"");
-                } else {
+                }else {
                     builder.append("语音话题");
                 }
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 9e67dcd909..e462289cb7 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -796,14 +796,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         operation.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         resiTopicOperationDao.insertOne(operation);
 
-        //2021.4.22 start  sun  因业务调整，新增组内消息记录表，话题状态变化时相应的修改数据状态
-        GroupMessageEntity groupMessage = groupMessageDao.selectByMessageId(closeFormDTO.getTopicId());
-        if(null != groupMessage){
-            groupMessage.setStatus(TopicConstant.CLOSED);
-            groupMessageDao.updateById(groupMessage);
-        }
-        //2021.4.22 end sun
-
         //2021.04.19组长解决话题积分
         if (TopicConstant.RESOLVED.equals(closeFormDTO.getClosedStatus())) {
             ResiGroupInfoRedisDTO groupCache = resiGroupRedis.get(topic.getGroupId());
@@ -845,14 +837,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                                     content
                                             .substring(NumConstant.ZERO, content.length() < NumConstant.TEN ? content.length() : NumConstant.TEN)
                                     + (NumConstant.TEN > content.length() ? "\"" : "…\"")) +
-                    "已被解决");
+                            "已被解决");
             pointEventMsgList.add(pointEventMsg);
 
             mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));
-            if(!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()){
-                log.error("组长解决话题事件发送失败，参数：{}",JSON.toJSONString(closeFormDTO));
+            if (!SendMqMsgUtils.sendMsg(mqBaseMsgDTO).success()) {
+                log.error("组长解决话题事件发送失败，参数：{}", JSON.toJSONString(closeFormDTO));
             }
         }
+        //2021.4.22 start  sun  因业务调整，新增组内消息记录表，话题状态变化时相应的修改数据状态
+        GroupMessageEntity groupMessage = groupMessageDao.selectByMessageId(closeFormDTO.getTopicId());
+        if (null != groupMessage) {
+            groupMessage.setStatus(TopicConstant.CLOSED);
+            groupMessageDao.updateById(groupMessage);
+        }
+        //2021.4.22 end sun
         //发送小组成就消息
         boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient)
                 .sendGroupAchievementMqMsg(new GroupAchievementMQMsg(topic.getCustomerId(), topic.getGroupId(), AchievementTypeEnum.RESOVLE_TOPIC.getCode()));
@@ -886,6 +885,15 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         resultDTO.setReleaseAddress(topicDetail.getAddress());
         resultDTO.setTopicStatus(topicDetail.getStatus());
         resultDTO.setShiftIssueFlag(topicDetail.getShiftIssue());
+        ResiGroupEntity resiGroupEntity=resiGroupDao.selectById(topicDetail.getGroupId());
+        if(null!=resiGroupEntity){
+            CustomerGridFormDTO customerGridFormDTO=new CustomerGridFormDTO();
+            customerGridFormDTO.setGridId(resiGroupEntity.getGridId());
+            Result<CustomerGridDTO> gridInfoRes=govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
+            if(gridInfoRes.success()&&null!=gridInfoRes.getData()){
+                resultDTO.setGridName(gridInfoRes.getData().getGridNamePath());
+            }
+        }
         //2.查询话题附件
         QueryWrapper<ResiTopicAttachmentEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);
@@ -1011,7 +1019,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                             Collections.EMPTY_LIST:
                             badgeR.getData().get(topicDetail.getCreatedBy()).stream().map(UserBadgeUnitFormDTO :: getBadgeIcon).collect(Collectors.toList())
             );
-        } else {
+        }else {
             resultDTO.setBadgeList(Collections.EMPTY_LIST);
         }
         return new Result<ResiTopicIncludeIssueDetailResultDTO>().ok(resultDTO);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 022a9cfcae..9a60f060b2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -43,11 +43,13 @@ import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.CommonDataFilterResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.GroupMessageDao;
 import com.epmet.modules.feign.GovOrgFeignClient;
+import com.epmet.modules.group.dao.GroupMessageDao;
 import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.dao.ResiGroupStatisticalDao;
 import com.epmet.modules.group.entity.GroupMessageEntity;
@@ -811,6 +813,16 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             }else {
                 breviary.append("语音话题");
             }
+            CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
+            dataFilterParam.setGridId(draft.getGridId());
+            dataFilterParam.setUserId(draft.getCreatedBy());
+            Result<CommonDataFilterResultDTO> dataFilterResult = govOrgFeignClient.gridDataFilter(dataFilterParam);
+            if (!dataFilterResult.success() || null == dataFilterResult.getData()) {
+                throw new RenException(dataFilterResult.getMsg());
+            }
+
+            sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(), draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),
+                    breviary.toString(), dataFilterResult.getData().getAgencyId(), draft.getGridId(), draft.getGroupId(), resiTopic.getId());
 
             //2021.4.22 start  sun  因业务调整，新增组内消息记录表，新增话题时相应的初始数据
             GroupMessageEntity messageEntity = new GroupMessageEntity();
@@ -824,16 +836,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             messageEntity.setOperateTime(null == resiTopic.getCreatedTime() ? new Date() : resiTopic.getCreatedTime());
             groupMessageDao.insert(messageEntity);
             //2021.4.22 end sun
-            CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
-            dataFilterParam.setGridId(draft.getGridId());
-            dataFilterParam.setUserId(draft.getCreatedBy());
-            Result<CommonDataFilterResultDTO> dataFilterResult = govOrgFeignClient.gridDataFilter(dataFilterParam);
-            if (!dataFilterResult.success() || null == dataFilterResult.getData()) {
-                throw new RenException(dataFilterResult.getMsg());
-            }
 
-            sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(), draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),
-                    breviary.toString(), dataFilterResult.getData().getAgencyId(), draft.getGridId(), draft.getGroupId(), resiTopic.getId());
         }
         //记录操作记录
         entity = baseDao.selectById(formDTO.getTopicDraftId());
@@ -962,6 +965,15 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         } else {
             breviary.append("语音话题");
         }
+        CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
+        dataFilterParam.setGridId(formDTO.getGridId());
+        dataFilterParam.setUserId(tokenDto.getUserId());
+        Result<CommonDataFilterResultDTO> dataFilterResult = govOrgFeignClient.gridDataFilter(dataFilterParam);
+        if (!dataFilterResult.success() || null == dataFilterResult.getData()) {
+            throw new RenException(dataFilterResult.getMsg());
+        }
+        sendMqMsg(tokenDto.getUserId(), formDTO.getCustomerId(), draft.getCreatedTime(), resiGroupRedis.get(draft.getGroupId()).getGroupName(),
+                breviary.toString(), dataFilterResult.getData().getAgencyId(), formDTO.getGridId(), formDTO.getGroupId(), topic.getId());
 
         //2021.4.22 start  sun  因业务调整，新增组内消息记录表，新增话题时相应的初始数据
         GroupMessageEntity messageEntity = new GroupMessageEntity();
@@ -976,17 +988,6 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         groupMessageDao.insert(messageEntity);
         //2021.4.22 end sun
 
-        CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
-        dataFilterParam.setGridId(formDTO.getGridId());
-        dataFilterParam.setUserId(tokenDto.getUserId());
-        Result<CommonDataFilterResultDTO> dataFilterResult = govOrgFeignClient.gridDataFilter(dataFilterParam);
-        if (!dataFilterResult.success() || null == dataFilterResult.getData()) {
-            throw new RenException(dataFilterResult.getMsg());
-        }
-        sendMqMsg(tokenDto.getUserId(), formDTO.getCustomerId(), draft.getCreatedTime(), resiGroupRedis.get(draft.getGroupId()).getGroupName(),
-                breviary.toString(), dataFilterResult.getData().getAgencyId(), formDTO.getGridId(), formDTO.getGroupId(), topic.getId());
-
-
     }
 
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java
index d686cfc825..41164d925f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java
@@ -234,7 +234,7 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl<TopicShareL
                 }
             }
         }
-        if(StringUtils.isBlank(group)) throw new RenException("根据分享链接Id没有找到对应的组Id");
+        if(StringUtils.isBlank(group)) throw new RenException("无效的分享链接");
         String userId = param.getUserId();
 
         GroupMemeberOperationDTO applyRecord = groupMemeberOperationDao.selectLatestRecord(group, userId);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
index d5bdbb2300..3e553a5364 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
@@ -31,6 +31,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+      #监控页面
+      stat-view-servlet:
+        enabled: true
+        #loginUsername: admin
+        #loginPassword: admin
+        allow:
+      web-stat-filter:
+        enabled: true
+      filters: stat,wall,log4j2
   # 数据迁移工具flyway
   flyway:
     enabled: @spring.flyway.enabled@
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 97f45b4369..a9a11ac36f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -610,23 +610,6 @@
         GROUP BY
             temp.gridId
     </select>
-    <select id="selectRecentGroupAchievements" resultType="com.epmet.resi.group.dto.member.result.GroupAchievementDTO">
-        SELECT
-            rgas.GROUP_ID,
-            rg.GROUP_NAME,
-            rgas.ACHIEVEMENT_NAME
-        FROM
-            resi_group_achievement_stats rgas
-                INNER JOIN resi_group rg ON rgas.GROUP_ID = rg.ID AND rg.GRID_ID = #{gridId}
-                INNER JOIN resi_group_member rgm ON rgas.GROUP_ID = rgm.RESI_GROUP_ID
-                AND rgm.CUSTOMER_USER_ID = #{userId} AND rgm.DEL_FLAG = '0'
-
-        WHERE
-            rgas.IS_ARRIVE = 1
-            AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(rgas.ARRIVE_TIME)
-        ORDER BY
-            rgas.ARRIVE_TIME DESC
-    </select>
 
     <select id="selectAllGroupList" resultType="com.epmet.resi.group.dto.group.result.AllGroupListResultDTO">
         SELECT
@@ -874,6 +857,23 @@
             )temp
     </select>
 
+    <select id="selectRecentGroupAchievements" resultType="com.epmet.resi.group.dto.member.result.GroupAchievementDTO">
+        SELECT
+            rgas.GROUP_ID,
+            rg.GROUP_NAME,
+            rgas.ACHIEVEMENT_NAME
+        FROM
+            resi_group_achievement_stats rgas
+                INNER JOIN resi_group rg ON rgas.GROUP_ID = rg.ID AND rg.GRID_ID = #{gridId}
+                INNER JOIN resi_group_member rgm ON rgas.GROUP_ID = rgm.RESI_GROUP_ID
+                AND rgm.CUSTOMER_USER_ID = #{userId} AND rgm.DEL_FLAG = '0'
+
+        WHERE
+            rgas.IS_ARRIVE = 1
+            AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(rgas.ARRIVE_TIME)
+        ORDER BY
+            rgas.ARRIVE_TIME DESC
+    </select>
     <!-- 根据IDs查询 topic，act，notice信息 -->
     <select id="getPastTopicListV2ByIds" resultType="com.epmet.resi.group.dto.topic.result.GetPastTopicListV2ResultDTO">
         SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat,isChanged,firstPhoto FROM
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index 9fcc9983e6..ff7060f839 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -194,7 +194,6 @@
         ORDER BY
             rgm.CREATED_TIME DESC
     </select>
-    <!--因为查的是组员人数 所以历史被删除的也是算的 组员状态只有审核通过 被禁言 被移除 退组-->
     <select id="countAllMembers" resultType="int">
         SELECT
             count(*)
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
index 295522ae79..69ebc4476c 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
@@ -1,9 +1,11 @@
 package com.epmet.dto.result;
 
 import com.epmet.dto.TopicInfoDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -74,4 +76,7 @@ public class IssueDetailResultDTO implements Serializable {
      * 态度 - opposition（反对）support（赞成）
      */
     private String attitude;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date shiftIssueTime;
 }
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
index b278b9f585..e1360eb01b 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -44,5 +46,7 @@ public class IssueResultDTO implements Serializable {
      */
     private String topicId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date shiftIssueTime;
 
 }
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java
index 75c60668c6..6ee30a91e4 100644
--- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java
@@ -40,4 +40,9 @@ public class InitInfoResultDTO implements Serializable {
 	 * 昵称
 	 */
 	private String nickname;
+
+	/**
+	 * 身份证号
+	 */
+	private String idNum;
 }
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java
index d9c1b86e9a..d3ba9d2b22 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java
@@ -40,6 +40,7 @@ public class PersonalCenterServiceImpl implements PersonalCenterService {
 		resultDTO.setDistrict(baseInfoResult.getData().getDistrict());
 		resultDTO.setBuildingAddress(baseInfoResult.getData().getBuildingAddress());
 		resultDTO.setNickname(baseInfoResult.getData().getNickname());
+		resultDTO.setIdNum(baseInfoResult.getData().getIdNum());
 		return resultDTO;
 	}
 
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/util/RSASignature.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/util/RSASignature.java
new file mode 100644
index 0000000000..4b45f8ce2e
--- /dev/null
+++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/common/util/RSASignature.java
@@ -0,0 +1,152 @@
+package com.epmet.openapi.scan.common.util;
+
+import org.apache.commons.codec.binary.Base64;
+import org.bouncycastle.util.encoders.UrlBase64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.crypto.Cipher;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+
+/**
+ * @author jianjun liu
+ * @date 2020-06-05 16:48
+ **/
+
+public class RSASignature {
+    private static final Logger LOGGER = LoggerFactory.getLogger(RSASignature.class);
+    public static final String KEY_ALGORITHM = "RSA";
+    public static final String SIGNATURE_ALGORITHM = "SHA1WithRSA";
+    public static final String ENCODING = "utf-8";
+    public static final String X509 = "X.509";
+
+    /**
+     * 获取私钥
+     *
+     * @param key
+     * @return
+     * @throws Exception
+     */
+    public static PrivateKey getPrivateKey(String key) throws Exception {
+        byte[] keyBytes = Base64.decodeBase64(key.getBytes(ENCODING));
+        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+        PrivateKey privateKey = keyFactory.generatePrivate(keySpec);
+        return privateKey;
+    }
+
+    /**
+     * 获取公钥
+     *
+     * @param key
+     * @return
+     * @throws Exception
+     */
+    public static PublicKey getPublicKey(String key) throws Exception {
+        byte[] keyBytes = Base64.decodeBase64(key.getBytes(ENCODING));
+        CertificateFactory certificateFactory = CertificateFactory.getInstance(X509);
+        InputStream in = new ByteArrayInputStream(keyBytes);
+        Certificate certificate = certificateFactory.generateCertificate(in);
+        PublicKey publicKey = certificate.getPublicKey();
+        return publicKey;
+    }
+
+    /**
+     * 使用公钥对明文进行加密，返回BASE64编码的字符串
+     *
+     * @param publicKey
+     * @param plainText
+     * @return
+     */
+    public static String encrypt(String publicKey, String plainText) {
+        try {
+            KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+            byte[] encodedKey = Base64.decodeBase64(publicKey.getBytes(ENCODING));
+            PublicKey pubKey = keyFactory.generatePublic(new X509EncodedKeySpec(encodedKey));
+            Cipher cipher = Cipher.getInstance(KEY_ALGORITHM);
+            cipher.init(Cipher.ENCRYPT_MODE, pubKey);
+            byte[] enBytes = cipher.doFinal(plainText.getBytes());
+            return new String(Base64.encodeBase64(enBytes));
+        } catch (Exception e) {
+            LOGGER.error("rsa encrypt exception: {}", e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 使用私钥对明文密文进行解密
+     *
+     * @param privateKey
+     * @param enStr
+     * @return
+     */
+    public static String decrypt(String privateKey, String enStr) {
+        try {
+            PrivateKey priKey = getPrivateKey(privateKey);
+            Cipher cipher = Cipher.getInstance(KEY_ALGORITHM);
+            cipher.init(Cipher.DECRYPT_MODE, priKey);
+            byte[] deBytes = cipher.doFinal(Base64.decodeBase64(enStr));
+            return new String(deBytes);
+        } catch (Exception e) {
+            LOGGER.error("rsa decrypt exception: {}", e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * RSA私钥签名
+     *
+     * @param content    待签名数据
+     * @param privateKey 私钥
+     * @return 签名值
+     */
+    public static String signByPrivateKey(String content, String privateKey) {
+        try {
+            PrivateKey priKey = getPrivateKey(privateKey);
+            Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM);
+            signature.initSign(priKey);
+            signature.update(content.getBytes(ENCODING));
+            byte[] signed = signature.sign();
+            return new String(UrlBase64.encode(signed), ENCODING);
+        } catch (Exception e) {
+            LOGGER.error("sign error, content: {}", content, e);
+        }
+        return null;
+    }
+
+    /**
+     * 公钥验签
+     *
+     * @param content
+     * @param sign
+     * @param publicKey
+     * @return
+     */
+    public static boolean verifySignByPublicKey(String content, String sign, String publicKey) {
+        try {
+            KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+            byte[] encodedKey = Base64.decodeBase64(publicKey.getBytes(ENCODING));
+            PublicKey pubKey = keyFactory.generatePublic(new X509EncodedKeySpec(encodedKey));
+
+            Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM);
+            signature.initVerify(pubKey);
+            signature.update(content.getBytes(ENCODING));
+
+            return signature.verify(UrlBase64.decode(sign.getBytes(ENCODING)));
+
+        } catch (Exception e) {
+            LOGGER.error("verify sign error, content: {}, sign: {}", content, sign, e);
+        }
+        return false;
+    }
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java
new file mode 100644
index 0000000000..c42fdeac01
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/FindIcUserFormDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+@Data
+public class FindIcUserFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "epmetUserId不能为空", groups = AddUserInternalGroup.class)
+    private String epmetUserId;
+
+    @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java
new file mode 100644
index 0000000000..a6ffad6477
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/10 15:49
+ */
+@Data
+public class PartyMemberListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6085134769034337175L;
+    @NotBlank(message = "组织类型不能为空")
+    private String orgType;
+    @NotBlank(message = "组织ID不能为空")
+    private String orgId;
+    private String code;
+    private Integer pageNo = 1;
+    private Integer pageSize = 20;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberStatisticsFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberStatisticsFormDTO.java
new file mode 100644
index 0000000000..a5bb86915f
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberStatisticsFormDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/10 15:46
+ */
+@Data
+public class PartyMemberStatisticsFormDTO implements Serializable {
+    private static final long serialVersionUID = 1027174449735636944L;
+    @NotBlank(message = "组织类型不能为空")
+    private String orgType;
+    @NotBlank(message = "组织ID不能为空")
+    private String orgId;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java
new file mode 100644
index 0000000000..a2c8dff5a1
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerCommonFormDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.Value;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description
+ * @Author wangxianzhang
+ * @Date 2021/12/10 5:47 下午
+ * @Version 1.0
+ */
+@Data
+public class VolunteerCommonFormDTO {
+
+    /**
+     * 查询志愿者分布
+     */
+    public interface GetVolunteerDistribution {
+    }
+
+    @NotBlank(message = "客户ID不能为空", groups = {GetVolunteerDistribution.class})
+    private String customerId;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
index 37d59e0472..2877fc47ed 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
@@ -9,13 +9,12 @@ import java.io.Serializable;
  * @author sun
  * @dscription
  */
-@NoArgsConstructor
 @Data
 public class BasicInfoResultDTO implements Serializable {
 
 	private static final long serialVersionUID = 8987281818368677411L;
 	/**
-	 * 工作人员id,后台userId
+	 * 工作人员id
 	 */
 	private String staffId;
 	/**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java
new file mode 100644
index 0000000000..9b80c69701
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpmetUserFamilyDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+@Data
+public class EpmetUserFamilyDTO implements Serializable {
+    /**
+     * 当前客户下，与自己相同身份证号的所有账号
+     */
+    private List<String> epmetUserIdList;
+
+    /**
+     * 同身份证号对应的ic里的居民
+     */
+    private String icResiUserId;
+    /**
+     * ic里的姓名
+     */
+    private String icUserName;
+
+    /**
+     * ic里的房子id
+     */
+    private String houseId;
+
+    /**
+     * 同屋的其他人
+     */
+    private List<HouseUserDTO> houseUserList;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java
new file mode 100644
index 0000000000..7bf9978b48
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HouseUserDTO.java
@@ -0,0 +1,15 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 家属
+ */
+@Data
+public class HouseUserDTO implements Serializable {
+    private static final long serialVersionUID = -5307147522738642535L;
+    private String icResiUserId;
+    private String icUserName;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
new file mode 100644
index 0000000000..9d5f1453d3
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
@@ -0,0 +1,80 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 案件居民、家属列表
+ * 只有名称这些简要信息
+ */
+@Data
+public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
+    private String houseId;
+    
+    private String gridId;
+    
+    private String gridName;
+
+    /**
+     * 小区id
+     */
+    private String villageId;
+
+    /**
+     * 小区名
+     */
+    private String villageName;
+
+    /**
+     * 是否本地户籍
+     */
+    private String isBdhj;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系人电话
+     */
+    private String contactsMobile;
+
+    /**
+     * 志愿者类别
+     *  key:志愿者类型英文
+     *  value:志愿者类型中文
+     */
+    private Map<String, String> volunteerCategories = new HashMap<>();
+
+    /**
+     * 同屋的其他人
+     */
+    private List<HouseUserDTO> houseUserList;
+    
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java
new file mode 100644
index 0000000000..85b0ced524
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/10 17:05
+ */
+@Data
+public class PartyMemberAgeResultDTO implements Serializable {
+    private static final long serialVersionUID = 3421162784157903637L;
+    private String userId;
+    private String name;
+    private String age;
+    private String mobile;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java
new file mode 100644
index 0000000000..421d0139a3
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/10 17:07
+ */
+@Data
+public class PartyMemberEducationResultDTO implements Serializable {
+    private static final long serialVersionUID = -5042362121277863249L;
+    private String userId;
+    private String name;
+    private String education;
+    private String mobile;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java
new file mode 100644
index 0000000000..94a4d4ac88
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerDistributionResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @Description
+ * @Author wangxianzhang
+ * @Date 2021/12/10 5:49 下午
+ * @Version 1.0
+ */
+@Data
+public class VolunteerDistributionResultDTO {
+
+    private List<Legend> legends = new ArrayList<>();
+
+    private List<Distribution> distributions = new ArrayList<>();
+
+    @Data
+    public static class Legend {
+        private String optionLabel;
+        private String optionValue;
+    }
+
+    @Data
+    public static class Distribution {
+        private Set<String> volunteerCategories;
+        private String epmetUserId;
+        private String icResiUserId;
+        private String longitude;
+        private String latitude;
+    }
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index ff3b7ffc1c..bff8b92a50 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -608,6 +608,15 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/badge/list-users-by-badge")
     Result<List<ListUserByBadgeResultDTO>> listUsersByBadge(ListUserByBadgeFormDTO input);
 
+    /**
+     * @Description  查询巡查人数
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/20 10:21 上午
+     */
+    @PostMapping("/epmetuser/statsstaffpatrolrecorddaily/patrolcount")
+    Result<PatrolCountResultDTO> patrolCount(@RequestBody PatrolCountFormDTO formDTO);
+
     /**
      * 根据角色，查询里面的人，去重
      *
@@ -619,15 +628,6 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/staffrole/queryRoleStaffIds")
     Result<Set<String>> queryRoleStaffIds(@RequestBody RoleStaffIdFormDTO formDTO);
 
-    /**
-     * @Description  查询巡查人数
-     * @Param formDTO
-     * @author zxc
-     * @date 2021/8/20 10:21 上午
-     */
-    @PostMapping("/epmetuser/statsstaffpatrolrecorddaily/patrolcount")
-    Result<PatrolCountResultDTO> patrolCount(@RequestBody PatrolCountFormDTO formDTO);
-
     /**
      * @Description   查询巡查次数和时长
      * @Param agencyId
@@ -669,4 +669,16 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping(value = "/epmetuser/user/findepmetuser")
     Result<ResiUserResDTO> findEpmetUser(@RequestBody ResiUserFormDTO formDTO);
+
+    @GetMapping("/epmetuser/icresiuser/findfamilymem/{icResiUserId}")
+    Result<IcResiUserBriefDTO> findFamilyMem(@PathVariable("icResiUserId") String icResiUserId);
+
+    /**
+     * 查找居民端小程序里的用户对应ic里的人。以及家属们
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping(value = "/epmetuser/user/findicuser")
+    Result<EpmetUserFamilyDTO> findIcUser(@RequestBody FindIcUserFormDTO formDTO);
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 1eeca4cdd3..109c54c0ed 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -429,6 +429,11 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listUsersByBadge", input);
     }
 
+    @Override
+    public Result<PatrolCountResultDTO> patrolCount(PatrolCountFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "patrolCount", formDTO);
+    }
+
     /**
      * 根据角色，查询里面的人，去重
      *
@@ -442,11 +447,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryRoleStaffIds", formDTO);
     }
 
-    @Override
-    public Result<PatrolCountResultDTO> patrolCount(PatrolCountFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "patrolCount", formDTO);
-    }
-
     @Override
     public Result<List<PatrolYuShanResultDTO>> patrolInfo(String agencyId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "patrolInfo", agencyId);
@@ -490,4 +490,20 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<ResiUserResDTO> findEpmetUser(ResiUserFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findEpmetUser", formDTO);
     }
+
+    @Override
+    public Result<IcResiUserBriefDTO> findFamilyMem(String icResiUserId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findFamilyMem", icResiUserId);
+    }
+
+    /**
+     * 查找居民端小程序里的用户对应ic里的人。以及家属们
+     *
+     * @param epmetUserIdList
+     * @return
+     */
+    @Override
+    public Result<EpmetUserFamilyDTO> findIcUser(FindIcUserFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findIcUser", formDTO);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index d6df9f57e0..e170e5a63d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -27,7 +27,9 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -51,6 +53,7 @@ import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcResiUserImportService;
 import com.epmet.service.IcResiUserService;
+import jodd.io.FileUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -58,6 +61,9 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -66,6 +72,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -114,6 +121,30 @@ public class IcResiUserController {
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
+    /**
+     * 模板枚举
+     */
+    public enum IcUserTemplateEnums {
+        IC_RESI_IMPORT_TEMPLATE("excel/ic_resi_info_import_cid_for_easy_excel.xls", "居民信息导入模板.xls"),
+        IC_RESI_EXPORT_TEMPLATE("excel/ic_resi_info_cid_for_easy_excel.xlsx", "居民信息导出模板.xlsx");
+
+        private String pathInApp;
+        private String templateName;
+
+        IcUserTemplateEnums(String pathInApp, String templateName) {
+            this.pathInApp = pathInApp;
+            this.templateName = templateName;
+        }
+
+        public String getPathInApp() {
+            return pathInApp;
+        }
+
+        public String getTemplateName() {
+            return templateName;
+        }
+    }
+
     {
         // 初始化上传目录
         String home = System.getProperty("user.home");
@@ -206,6 +237,19 @@ public class IcResiUserController {
         return new Result<List<HomeUserResultDTO>>().ok(icResiUserService.getPeopleByRoom(formDTO.getHomeId()));
     }
 
+    /**
+     * 根据ic_resi_user找家属
+     * @param icResiUserId
+     * @return
+     */
+    @GetMapping("findfamilymem/{icResiUserId}")
+    public Result<IcResiUserBriefDTO> findFamilyMem(@PathVariable("icResiUserId") String icResiUserId){
+        if(StringUtils.isNotBlank(icResiUserId)){
+            return new Result<IcResiUserBriefDTO>().ok(icResiUserService.findFamilyMem(icResiUserId));
+        }
+        return new Result<>();
+    }
+
     @PostMapping("listresi")
     public Result<PageData<Map<String, Object>>> queryListResi1(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO) {
         //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
@@ -259,7 +303,7 @@ public class IcResiUserController {
         pageFormDTO.setPageFlag(false);
 
         //获取模版文件
-        File file = getExportTemplateFile(customerId);
+        File file = getIcResiTemplateFile(customerId, IcUserTemplateEnums.IC_RESI_EXPORT_TEMPLATE);
         ExcelWriter excelWriter = null;
         try {
             excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("居民基本信息.xlsx", response)).withTemplate(file).build();
@@ -338,7 +382,7 @@ public class IcResiUserController {
      * @param customerId
      * @return
      */
-    private File getExportTemplateFile(String customerId) throws Exception{
+    private File getIcResiTemplateFile(String customerId, IcUserTemplateEnums template) throws Exception{
         String fileType = ".xlsx";
         String fileName = customerId + fileType;
         File file = new File(IC_RESI_DOWNLOAD_DIR.resolve(fileName).toString());
@@ -354,13 +398,12 @@ public class IcResiUserController {
             Result<byte[]> result = HttpClientManager.getInstance().getDownloadFilebytes(fileUrlResult.getData(), null);
             //获取模版失败 则把默认文件写入
             if (result == null || !result.success()) {
-                log.warn("获取居民导出模版失败,path:{},走默认模版", ossFilePath);
-                String defaultTemplatePath = "excel/ic_resi_info_cid_for_easy_excel.xlsx";
-                InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream(defaultTemplatePath);
+                log.warn("获取居民模版失败,path:{},走默认模版", ossFilePath);
+                InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream(template.getPathInApp());
                 FileUtils.copyInputStreamToFile(resourceAsStream,file);
-                log.warn("getExportTemplateFile copy default file to template,customerId:{}",customerId);
+                log.warn("getIcResiTemplateFile copy default file to template,customerId:{}",customerId);
             } else {
-                log.warn("getExportTemplateFile reload file form oss default file to template,customerId:{}",customerId);
+                log.warn("getIcResiTemplateFile reload file form oss default file to template,customerId:{}",customerId);
                 FileUtils.writeByteArrayToFile(file,result.getData());
             }
             redisUtils.hSet(RedisKeys.getResiTempChangedKey(customerId), serverIp, NumConstant.ZERO_STR);
@@ -492,4 +535,96 @@ public class IcResiUserController {
         ValidatorUtils.validateEntity(formDTO, DemandUserFormDTO.InternalGroup.class);
         return new Result<List<DemandUserResDTO>>().ok(icResiUserService.queryDemandUsers(formDTO));
     }
+
+    /**
+     * 下载ic居民信息导入excel模板
+     * @param loginUserInfo
+     * @return
+     */
+    @PostMapping("import/download-template")
+    public ResponseEntity<byte[]> downloadIcResiDownloadTemplate(@LoginUser TokenDto loginUserInfo) {
+        String customerId = loginUserInfo.getCustomerId();
+
+        try {
+            File icResiImportTemplateFile = getIcResiTemplateFile(customerId, IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE);
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Access-Control-Expose-Headers", "Content-Disposition");
+            headers.add("content-Type", "application/vnd.ms-excel");
+            headers.add("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE.getTemplateName(), "UTF-8"));
+
+            return new ResponseEntity<>(FileUtil.readBytes(icResiImportTemplateFile), headers, HttpStatus.OK);
+        } catch (Exception e) {
+            String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
+
+            log.error("下载IC居民信息导入模板失败:{}", errorStackTrace);
+
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下载IC居民信息导入模板失败");
+        }
+    }
+
+
+    /**
+     * 党员年龄范围统计
+     * @Param formDTO
+     * @Return {@link Result< List<  OptionDataResultDTO >>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 15:52
+     */
+    @PostMapping("partymemberagestatistics")
+    public Result<List<OptionDataResultDTO>> partyMemberAgeStatistics(@RequestBody PartyMemberStatisticsFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<OptionDataResultDTO>>().ok(icResiUserService.partyMemberAgeStatistics(formDTO));
+    }
+
+    /**
+     * 党员年龄列表
+     * @Param formDTO
+     * @Return {@link Result< PageData< PartyMemberEducationResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:54
+     */
+    @PostMapping("partymemberagelist")
+    public Result<PageData<PartyMemberAgeResultDTO>> partyMemberAgelist(@RequestBody PartyMemberListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<PageData<PartyMemberAgeResultDTO>>().ok(icResiUserService.getPartyMemberAgeList(formDTO));
+    }
+
+    /**
+     * 党员学历统计
+     * @Param formDTO
+     * @Return {@link Result< List< OptionDataResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:58
+     */
+    @PostMapping("partymembereducationstatistics")
+    public Result<List<OptionDataResultDTO>> partyMemberEducationStatistics(@RequestBody PartyMemberStatisticsFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<OptionDataResultDTO>>().ok(icResiUserService.partyMemberEducationStatistics(formDTO));
+    }
+
+    /**
+     * 党员学历列表
+     * @Param formDTO
+     * @Return {@link Result< PageData< PartyMemberEducationResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:58
+     */
+    @PostMapping("partymembereducationlist")
+    public Result<PageData<PartyMemberEducationResultDTO>> partyMemberEducationlist(@RequestBody PartyMemberListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<PageData<PartyMemberEducationResultDTO>>().ok(icResiUserService.getPartyMemberEducationList(formDTO));
+    }
+
+    /**
+     * 根据居民id查询居民信息简介
+     * @param resiUserId
+     * @return
+     */
+    @PostMapping("resi-brief/{resi-user-id}")
+    public Result<IcResiUserBriefDTO> getResiBrief(@PathVariable("resi-user-id") String resiUserId, @LoginUser TokenDto loginUser) {
+        String customerId = loginUser.getCustomerId();
+        IcResiUserBriefDTO r = icResiUserService.getResiBrief(resiUserId, customerId);
+        return new Result<IcResiUserBriefDTO>().ok(r);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java
new file mode 100644
index 0000000000..a7e8d14592
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LbTestController.java
@@ -0,0 +1,24 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.LbFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("lbtest")
+public class LbTestController {
+
+    @Autowired
+    private LbFeignClient lbFeignClient;
+
+    @PostMapping("get-host")
+    public Result getHost() {
+        Result host = lbFeignClient.getHost();
+        return host;
+    }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
index 66d5d15d7a..5d5870439e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
@@ -198,4 +198,16 @@ public class UserController {
 		ValidatorUtils.validateEntity(formDTO,ResiUserFormDTO.AddUserInternalGroup.class);
 		return new Result<ResiUserResDTO>().ok(userService.findEpmetUser(formDTO));
 	}
+
+	/**
+	 * 查找居民端小程序里的用户对应ic里的人。以及家属们
+	 *
+	 * @param findIcUserFormDTO
+	 * @return
+	 */
+	@PostMapping(value = "findicuser")
+	public Result<EpmetUserFamilyDTO> findIcUser(@RequestBody FindIcUserFormDTO findIcUserFormDTO){
+		ValidatorUtils.validateEntity(findIcUserFormDTO,FindIcUserFormDTO.AddUserInternalGroup.class);
+		return new Result<EpmetUserFamilyDTO>().ok(userService.findIcUser(findIcUserFormDTO));
+	}
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java
new file mode 100644
index 0000000000..aedfe54e49
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/VolunteerController.java
@@ -0,0 +1,49 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dao.IcResiUserDao;
+import com.epmet.dto.form.VolunteerCommonFormDTO;
+import com.epmet.dto.result.VolunteerDistributionResultDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.service.VolunteerService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * @Description 志愿者controller
+ * @Author wangxianzhang
+ * @Date 2021/12/10 5:45 下午
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("volunteer")
+public class VolunteerController {
+
+    /**
+     * 不知道为何用注解 注入不进来，暂时用构造方法注入
+     */
+    @Autowired
+    private VolunteerService volunteerService;
+
+    /**
+     * 志愿者分布查询
+     *
+     * @param input
+     * @return
+     */
+    @PostMapping("distribution")
+    public Result<VolunteerDistributionResultDTO> getVolunteerDistribution(@RequestBody VolunteerCommonFormDTO input) {
+        ValidatorUtils.validateEntity(input, VolunteerCommonFormDTO.GetVolunteerDistribution.class);
+
+        String customerId = input.getCustomerId();
+
+        VolunteerDistributionResultDTO r = volunteerService.getVolunteerDistributionAndLegends(customerId);
+
+        return new Result<VolunteerDistributionResultDTO>().ok(r);
+    }
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index ea5ca5b741..c3f1da8654 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -18,12 +18,10 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.ResiUserQueryValueDTO;
-import com.epmet.dto.result.DemandUserResDTO;
-import com.epmet.dto.result.IcFormResColumnDTO;
-import com.epmet.dto.result.PersonDataResultDTO;
-import com.epmet.dto.result.SearchByNameResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
@@ -166,4 +164,66 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     IcResiUserDTO  selectIdByIdCard(@Param("customerId") String customerId,
                                     @Param("idNum")String idNum,
                                     @Param("icResiUserId")String icResiUserId);
+
+    /**
+     * 获取居民名称，家属名称和id
+     * @param isResiUserId
+     * @return
+     */
+    IcResiUserBriefDTO selectIcResuUser(@Param("isResiUserId") String isResiUserId);
+
+    /**
+     * 除了本人以外，住在这个房子的人
+     *
+     * @param currentIcResiUserId
+     * @param homeId
+     * @return
+     */
+    List<HouseUserDTO> selectListFamilyMember(@Param("currentIcResiUserId") String currentIcResiUserId, @Param("homeId") String homeId);
+
+    /**
+     * 组织内党员年龄范围统计
+     * @Param orgType
+     * @Param orgId
+     * @Return {@link List< OptionDataResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:11
+     */
+    List<OptionDataResultDTO> getPartyMemberAgeStatistics(@Param("orgType") String orgType, @Param("orgId") String orgId);
+
+    /**
+     * 获取年龄范围内党员列表
+     * @Param orgType
+     * @Param orgId
+     * @Param min
+     * @Param max
+     * @Return {@link List< PartyMemberAgeResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:11
+     */
+    List<PartyMemberAgeResultDTO> getPartyMemberAgeList(@Param("orgType") String orgType, @Param("orgId") String orgId,
+                                                        @Param("code") String code);
+
+
+    /**
+     * 党员文化程度统计
+     * @Param orgType
+     * @Param orgId
+     * @Return {@link List< OptionDataResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:29
+     */
+    List<OptionDataResultDTO> getPartyMemberEducationStatistics(@Param("orgType") String orgType, @Param("orgId") String orgId);
+
+    /**
+     * 按教育程度获取党员列表
+     * @Param orgType
+     * @Param orgId
+     * @Param code
+     * @Return {@link List< PartyMemberAgeResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:24
+     */
+    List<PartyMemberEducationResultDTO> getPartyMemberEducationList(@Param("orgType") String orgType, @Param("orgId") String orgId,
+                                                        @Param("code") String code);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java
index e4c7a2cec5..0d77ea3ae3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java
@@ -12,6 +12,8 @@ import com.epmet.entity.UserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @Description 用户DAO
  * @IntefaceName UserDao
@@ -63,4 +65,8 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @date 2021/9/10 8:51 上午
      */
     UserDTO selectByUserId(String userId);
+
+    String selectIdNum(@Param("customerId") String customerId,@Param("epmetUserId")  String epmetUserId);
+
+    List<String> selectCommonEpmetUser(@Param("idNum") String idNum, @Param("customerId") String customerId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/LbFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/LbFeignClient.java
new file mode 100644
index 0000000000..b714f1abf4
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/LbFeignClient.java
@@ -0,0 +1,12 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.fallback.LbFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@FeignClient(name = "gov-voice-server", fallback = LbFeignClientFallback.class)
+public interface LbFeignClient {
+    @PostMapping("/gov/voice/lb/get-host")
+    Result getHost();
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/LbFeignClientFallback.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/LbFeignClientFallback.java
new file mode 100644
index 0000000000..1d3365ab47
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/LbFeignClientFallback.java
@@ -0,0 +1,13 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.LbFeignClient;
+import org.springframework.stereotype.Component;
+
+@Component
+public class LbFeignClientFallback implements LbFeignClient {
+    @Override
+    public Result getHost() {
+        return new Result().error(0, "请求失败");
+    }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
index 25ea2917af..aaee53101c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
@@ -301,7 +301,7 @@ public class UserBaseInfoRedis {
             //此时orientCache中包概括要更新的属性以及之前有切不更新的属性
             currentCache = orientCache;
         }
-        RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(entity.getUserId());
+            RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(entity.getUserId());
         //如果没有首次注册网格，则没有网格名称(xx机关-xx网格)、显示昵称(xx网格-x先生/女士)
         if(null != relation && StringUtils.isNotBlank(relation.getGridId())){
             currentCache.setCustomerId(relation.getCustomerId());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
index 9a0fcbed95..787c54bdc3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
@@ -18,6 +18,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcResiUserDTO;
@@ -151,4 +152,44 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @return
      */
     IcResiUserDTO getByIdCard(String customerId, String idNum,String icResiUserId);
+
+    IcResiUserBriefDTO findFamilyMem(String icResiUserId);
+
+    /**
+     * 党员年龄范围统计
+     * @Param formDTO
+     * @Return {@link List<  OptionDataResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 15:54
+     */
+    List<OptionDataResultDTO> partyMemberAgeStatistics(PartyMemberStatisticsFormDTO formDTO);
+
+    /**
+     * 获取年龄范围内党员列表
+     * @Param formDTO
+     * @Return {@link PageData< PartyMemberAgeResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:40
+     */
+    PageData<PartyMemberAgeResultDTO> getPartyMemberAgeList(PartyMemberListFormDTO formDTO);
+
+    /**
+     * 党员文化程度统计
+     * @Param formDTO
+     * @Return {@link List< OptionDataResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:40
+     */
+    List<OptionDataResultDTO> partyMemberEducationStatistics(PartyMemberStatisticsFormDTO formDTO);
+
+    /**
+     * 按教育程度获取党员列表
+     * @Param formDTO
+     * @Return {@link PageData< PartyMemberEducationResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:40
+     */
+    PageData<PartyMemberEducationResultDTO> getPartyMemberEducationList(PartyMemberListFormDTO formDTO);
+
+    IcResiUserBriefDTO getResiBrief(String resiUserId, String customerId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java
index 0790655742..132ef019a7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java
@@ -113,4 +113,12 @@ public interface UserService extends BaseService<UserEntity> {
      * @return
      */
     ResiUserResDTO findEpmetUser(ResiUserFormDTO formDTO);
+
+    /**
+     * 查找居民端小程序里的用户对应ic里的人。以及家属们
+     *
+     * @param findIcUserFormDTO
+     * @return
+     */
+    EpmetUserFamilyDTO findIcUser(FindIcUserFormDTO findIcUserFormDTO);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/VolunteerService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/VolunteerService.java
new file mode 100644
index 0000000000..cd87cf7dd5
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/VolunteerService.java
@@ -0,0 +1,15 @@
+package com.epmet.service;
+
+import com.epmet.dto.result.VolunteerDistributionResultDTO;
+
+/**
+ * @Description 志愿者service
+ * @Author wangxianzhang
+ * @Date 2021/12/10 5:48 下午
+ * @Version 1.0
+ */
+public interface VolunteerService {
+
+    VolunteerDistributionResultDTO getVolunteerDistributionAndLegends(String customerId);
+    
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index f283ac5487..0b554c980e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -918,12 +918,21 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
      * @throws IOException
      */
     public void downLoadResults(HttpServletResponse response) throws IOException {
-        //public static final ThreadLocal<Map<String, List<ErrorRow>>> errorRows = new ThreadLocal<>();
         String fileName;
-        if (errorRows.get() == null || errorRows.get().size() == 0) {
-            fileName = "导入成功.xls";
-        } else {
+        
+        // 判断是否有错误信息，以确定文件名
+        boolean hasError = false;
+        Map<String, List<ErrorRow>> tableAndErrorRows = errorRows.get();
+        for (Map.Entry<String, List<ErrorRow>> entry:tableAndErrorRows.entrySet()) {
+            if (entry.getValue().size() != 0) {
+                hasError = true;
+            }
+        }
+
+        if (hasError) {
             fileName = "导入失败条目清单.xls";
+        } else {
+            fileName = "导入成功.xls";
         }
         response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
         response.setHeader("content-Type", "application/vnd.ms-excel");
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index ea21846183..2fad36a652 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -25,11 +26,11 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
-import com.epmet.commons.tools.enums.FormItemTypeEnum;
-import com.epmet.commons.tools.enums.GenderEnum;
-import com.epmet.commons.tools.enums.HouseTypeEnum;
-import com.epmet.commons.tools.enums.RelationshipEnum;
+import com.epmet.commons.tools.dto.result.DictListResultDTO;
+import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
+import com.epmet.commons.tools.enums.*;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
@@ -54,10 +55,7 @@ import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.excel.support.ExportResiUserItemDTO;
-import com.epmet.feign.EpmetHeartOpenFeignClient;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
-import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.feign.OperCustomizeOpenFeignClient;
+import com.epmet.feign.*;
 import com.epmet.service.IcResiUserService;
 import com.epmet.service.UserService;
 import com.github.pagehelper.Page;
@@ -72,6 +70,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.*;
@@ -102,6 +102,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private RedisUtils redisUtils;
     @Autowired
     private UserService userService;
+    @Autowired
+    private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
+    @Autowired
+    private IcResiUserDao icResiUserDao;
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
@@ -878,4 +882,203 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         return baseDao.selectIdByIdCard(customerId,idNum,icResiUserId);
     }
+
+    @Override
+    public IcResiUserBriefDTO findFamilyMem(String icResiUserId) {
+        return baseDao.selectIcResuUser(icResiUserId);
+    }
+
+    @Override
+    public IcResiUserBriefDTO getResiBrief(String resiUserId, String customerId) {
+        LambdaQueryWrapper<IcResiUserEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcResiUserEntity::getId, resiUserId);
+        IcResiUserEntity resiEntity = baseDao.selectOne(query);
+
+        IcResiUserBriefDTO r = new IcResiUserBriefDTO();
+
+        BeanUtil.copyProperties(resiEntity, r);
+        
+        r.setHouseId(resiEntity.getHomeId());
+        r.setIcResiUserId(resiEntity.getId());
+        r.setIcUserName(resiEntity.getName());
+        
+        // 填充网格、小区名称
+        String errorMsg = "【居民信息简介】查询网格、小区信息失败";
+        IcNeighborHoodDTO neighborHood = getResultDataOrThrowsException(govOrgOpenFeignClient.getIcNeighbordhoodById(resiEntity.getVillageId()),
+                ServiceConstant.GOV_ORG_SERVER,
+                EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
+                errorMsg,
+                errorMsg);
+
+        CustomerGridFormDTO gridInfoForm = new CustomerGridFormDTO();
+        gridInfoForm.setGridId(resiEntity.getGridId());
+        CustomerGridDTO gridInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getCustomerGridByGridId(gridInfoForm),
+                ServiceConstant.GOV_ORG_SERVER,
+                EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
+                errorMsg,
+                errorMsg);
+
+        r.setGridName(gridInfo.getGridName());
+        r.setVillageName(neighborHood.getNeighborHoodName());
+
+        // 2.志愿者类型填充
+        List<String> volunteers = icResiUserDao.selectVolunteerByUserId(resiEntity.getId());
+        if (CollectionUtils.isNotEmpty(volunteers)) {
+            String[] vCategories = volunteers.get(0).split(",");
+
+            // 志愿者类型字典
+            Map<String, String> categories = getVolunteerCategoryOptions(customerId);
+
+            for (int i = 0; i < vCategories.length; i++) {
+                r.getVolunteerCategories().put(vCategories[i], categories.get(vCategories[i]));
+            }
+        }
+        
+        return r;
+    }
+
+    /**
+     * 查询志愿者类别options
+     * @param customerId
+     * @return
+     */
+    private Map<String, String> getVolunteerCategoryOptions(String customerId) {
+        IcFormOptionsQueryFormDTO optionsQuery = new IcFormOptionsQueryFormDTO();
+        optionsQuery.setCustomerId(customerId);
+        optionsQuery.setFormCode("resi_base_info");
+        optionsQuery.setLabel("志愿者类别");
+        List<IcFormItemOptionsDTO> categorieDtos = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery),
+                ServiceConstant.OPER_CUSTOMIZE_SERVER,
+                EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
+                "【志愿者分布】志愿者简介-查询志愿者类别失败",
+                "【志愿者分布】志愿者简介-查询志愿者类别失败");
+
+        return categorieDtos.stream()
+                .collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel));
+
+    }
+
+    /**
+     * 党员年龄范围统计
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List<  OptionDataResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 15:54
+     */
+    @Override
+    public List<OptionDataResultDTO> partyMemberAgeStatistics(PartyMemberStatisticsFormDTO formDTO) {
+        //获取年龄范围字典
+        DictListFormDTO dictFormDTO = new DictListFormDTO();
+        dictFormDTO.setDictType(DictTypeEnum.AGE_GROUP.getCode());
+        Result<List<DictListResultDTO>> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO);
+        Map<String, String> map = new HashMap<>();
+        int total = 0;
+        //统计组织下各年龄范围人数
+        List<OptionDataResultDTO> list = baseDao.getPartyMemberAgeStatistics(formDTO.getOrgType(), formDTO.getOrgId());
+        if (CollectionUtils.isNotEmpty(list)) {
+            map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue));
+            total = list.stream().mapToInt(item -> Integer.parseInt(item.getValue())).sum();
+        }
+        Map<String, String> finalMap = map;
+        int finalTotal = total;
+        return dictResult.getData().stream().map(item -> {
+            OptionDataResultDTO dto = new OptionDataResultDTO();
+            dto.setCode(item.getValue());
+            dto.setLabel(item.getLabel());
+            dto.setValue(null == finalMap.get(item.getValue())?NumConstant.ZERO_STR:finalMap.get(item.getValue()));
+            BigDecimal radio = new BigDecimal("0.00");
+            if (NumConstant.ZERO != finalTotal) {
+                BigDecimal sum = new BigDecimal(finalTotal);
+                BigDecimal count = new BigDecimal(dto.getValue());
+                BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED);
+                radio = count.multiply(hundred).divide(sum, NumConstant.TWO, RoundingMode.HALF_UP);
+            }
+            dto.setRadio(radio.stripTrailingZeros().toString().concat("%"));
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 获取年龄范围内党员列表
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List< PartyMemberAgeResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:40
+     */
+    @Override
+    public PageData<PartyMemberAgeResultDTO> getPartyMemberAgeList(PartyMemberListFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        List<PartyMemberAgeResultDTO> list = baseDao.getPartyMemberAgeList(formDTO.getOrgType(), formDTO.getOrgId(), formDTO.getCode());
+        PageInfo<PartyMemberAgeResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
+    /**
+     * 党员文化程度统计
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List< OptionDataResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:40
+     */
+    @Override
+    public List<OptionDataResultDTO> partyMemberEducationStatistics(PartyMemberStatisticsFormDTO formDTO) {
+        //获取文化程度字典
+        DictListFormDTO dictFormDTO = new DictListFormDTO();
+        dictFormDTO.setDictType(DictTypeEnum.EDUCATION.getCode());
+        Result<List<DictListResultDTO>> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO);
+        Map<String, String> map = new HashMap<>();
+        //统计组织下文化程度党员人数
+        List<OptionDataResultDTO> list = baseDao.getPartyMemberEducationStatistics(formDTO.getOrgType(), formDTO.getOrgId());
+        int total = 0;
+        if (CollectionUtils.isNotEmpty(list)) {
+            map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue));
+            total = list.stream().mapToInt(item -> Integer.parseInt(item.getValue())).sum();
+        }
+        Map<String, String> finalMap = map;
+        int finalTotal = total;
+        return dictResult.getData().stream().map(item -> {
+            OptionDataResultDTO dto = new OptionDataResultDTO();
+            dto.setCode(item.getValue());
+            dto.setLabel(item.getLabel());
+            dto.setValue(null == finalMap.get(item.getValue())?NumConstant.ZERO_STR:finalMap.get(item.getValue()));
+            BigDecimal radio = new BigDecimal("0.00");
+            if (NumConstant.ZERO != finalTotal) {
+                BigDecimal sum = new BigDecimal(finalTotal);
+                BigDecimal count = new BigDecimal(dto.getValue());
+                BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED);
+                radio = count.multiply(hundred).divide(sum, NumConstant.TWO, RoundingMode.HALF_UP);
+            }
+            dto.setRadio(radio.stripTrailingZeros().toString().concat("%"));
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 按教育程度获取党员列表
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List< PartyMemberEducationResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/10 17:40
+     */
+    @Override
+    public PageData<PartyMemberEducationResultDTO> getPartyMemberEducationList(PartyMemberListFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        List<PartyMemberEducationResultDTO> list = baseDao.getPartyMemberEducationList(formDTO.getOrgType(), formDTO.getOrgId(), formDTO.getCode());
+        Result<Map<String, String>> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode());
+        PageInfo<PartyMemberEducationResultDTO> pageInfo = new PageInfo<>(list);
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.forEach(item -> {
+                item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation()));
+            });
+        }
+        return new PageData<>(list, pageInfo.getTotal());
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
index 697fda9582..1d987951bd 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
@@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -385,4 +386,32 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return resiUserResDTO;
     }
 
+    /**
+     * 查找居民端小程序里的用户对应ic里的人。以及家属们
+     *
+     * @param findIcUserFormDTO
+     * @return
+     */
+    @Override
+    public EpmetUserFamilyDTO findIcUser(FindIcUserFormDTO findIcUserFormDTO) {
+        EpmetUserFamilyDTO result=new EpmetUserFamilyDTO();
+        String idNum=baseDao.selectIdNum(findIcUserFormDTO.getCustomerId(),findIcUserFormDTO.getEpmetUserId());
+        if(StringUtils.isNotBlank(idNum)){
+            //同客户下，相同身份证号的，epmetuser
+            List<String> epmetUserIdList=baseDao.selectCommonEpmetUser(idNum,findIcUserFormDTO.getCustomerId());
+            result.setEpmetUserIdList(epmetUserIdList);
+            //找到该身份证号的居民
+            IcResiUserDTO icResiUserDTO=icResiUserService.getByIdCard(findIcUserFormDTO.getCustomerId(),idNum,null);
+            if(null!=icResiUserDTO){
+                result.setIcResiUserId(icResiUserDTO.getId());
+                result.setIcUserName(icResiUserDTO.getName());
+                result.setHouseId(icResiUserDTO.getHomeId());
+                IcResiUserBriefDTO icResiUserBriefDTO=icResiUserService.findFamilyMem(icResiUserDTO.getId());
+                result.setHouseUserList(null!=icResiUserBriefDTO&&CollectionUtils.isNotEmpty(icResiUserBriefDTO.getHouseUserList())?icResiUserBriefDTO.getHouseUserList():new ArrayList<>());
+            }
+        }
+        result.setEpmetUserIdList(Arrays.asList(findIcUserFormDTO.getEpmetUserId()));
+        return result;
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
new file mode 100644
index 0000000000..edc1149e6f
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
@@ -0,0 +1,180 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.dao.IcResiUserDao;
+import com.epmet.dao.UserBaseInfoDao;
+import com.epmet.dto.IcBuildingDTO;
+import com.epmet.dto.IcFormItemOptionsDTO;
+import com.epmet.dto.IcResiUserDTO;
+import com.epmet.dto.form.IcFormOptionsQueryFormDTO;
+import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
+import com.epmet.dto.result.VolunteerDistributionResultDTO;
+import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
+import com.epmet.feign.EpmetHeartOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.feign.OperCustomizeOpenFeignClient;
+import com.epmet.service.VolunteerService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Description
+ * @Author wangxianzhang
+ * @Date 2021/12/10 5:48 下午
+ * @Version 1.0
+ */
+@Service
+public class VolunteerServiceImpl implements VolunteerService, ResultDataResolver {
+
+    @Autowired
+    private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient;
+
+    @Autowired
+    private UserBaseInfoDao userBaseInfoDao;
+
+    @Autowired
+    private IcResiUserDao icResiUserDao;
+
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
+    @Autowired
+    private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
+
+    /**
+     * 查询志愿者分布以及志愿者图例
+     *
+     * @param customerId
+     * @return
+     */
+    public VolunteerDistributionResultDTO getVolunteerDistributionAndLegends(String customerId) {
+
+        // 1.查询分布
+        VolunteerDistributionResultDTO volunteerDistribution = getVolunteerDistribution(customerId);
+
+        // 2.补充图例
+        IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO();
+        optionsForm.setCustomerId(customerId);
+        optionsForm.setFormCode("resi_base_info");
+        optionsForm.setLabel("志愿者类别");
+
+        String errorMsg = "【志愿者分布】查询志愿者图例失败";
+        List<IcFormItemOptionsDTO> options = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsForm),
+                ServiceConstant.OPER_CUSTOMIZE_SERVER,
+                EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
+                errorMsg,
+                errorMsg);
+
+        List<VolunteerDistributionResultDTO.Legend> legends = options.stream().map(o -> {
+            VolunteerDistributionResultDTO.Legend legend = new VolunteerDistributionResultDTO.Legend();
+            legend.setOptionLabel(o.getOptionLabel());
+            legend.setOptionValue(o.getOptionValue());
+            return legend;
+        }).collect(Collectors.toList());
+
+        volunteerDistribution.setLegends(legends);
+        return volunteerDistribution;
+    }
+
+    /**
+     * 查询志愿者分布
+     *
+     * @param customerId
+     * @return
+     */
+    public VolunteerDistributionResultDTO getVolunteerDistribution(String customerId) {
+        //epmetHeartOpenFeignClient.queryVolunteerPage()
+
+        // 1.分页查询出所有志愿者列表
+        int pageNo = 1;
+        int pageSize = 100;
+
+        // 志愿者epmet user id
+        Set<String> volunteerEpmetUserIds = new HashSet<>();
+
+        // 分页查询志愿者的epmet user id
+        while (true) {
+
+            VolunteerCommonFormDTO volunteerForm = new VolunteerCommonFormDTO();
+            volunteerForm.setCustomerId(customerId);
+            volunteerForm.setPageNo(pageNo);
+            volunteerForm.setPageSize(pageSize);
+
+            String errorMsg = "【志愿者分布】分页查询志愿者列表失败";
+            List<PageVolunteerInfoResultDTO> volunteerPage = getResultDataOrThrowsException(epmetHeartOpenFeignClient.queryVolunteerPage(volunteerForm),
+                    ServiceConstant.EPMET_HEART_SERVER,
+                    EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
+                    errorMsg,
+                    errorMsg);
+
+            // 将本页userId添加到总集中去
+            volunteerEpmetUserIds.addAll(volunteerPage.stream().map(v -> v.getUserId()).collect(Collectors.toSet()));
+
+            if (volunteerPage.size() < pageSize) {
+                // 说明是最后一页了
+                break;
+            }
+
+            pageNo++;
+        }
+
+
+        VolunteerDistributionResultDTO r = new VolunteerDistributionResultDTO();
+
+        // 2.填充ic居民信息
+        for (String volunteerEpmetUserId : volunteerEpmetUserIds) {
+
+            VolunteerDistributionResultDTO.Distribution distribution = new VolunteerDistributionResultDTO.Distribution();
+
+            ResiUserBaseInfoResultDTO userBaseInfo = userBaseInfoDao.selecUserBaseInfoByUserId(volunteerEpmetUserId);
+
+            //使用身份证号查询ic resi信息
+            IcResiUserDTO icResiUserInfo = icResiUserDao.selectIdByIdCard(customerId, userBaseInfo.getIdNum(), null);
+            if (icResiUserInfo == null) {
+                continue;
+            }
+
+            // 查询志愿者类别
+            List<String> volunteerCategories = icResiUserDao.selectVolunteerByUserId(icResiUserInfo.getId());
+            //if (CollectionUtils.isEmpty(volunteerCategories)) {
+            //    // 此人没有志愿者信息
+            //    continue;
+            //}
+
+            // 将志愿者类型列表字符串，切割放到set中
+            Set<String> volunteerTypes = new HashSet();
+            for (String vTypesString : volunteerCategories) {
+                String[] vTypes = vTypesString.split(",");
+                if (vTypes != null && vTypes.length > 0) {
+                    volunteerTypes.addAll(Arrays.asList(vTypes));
+                }
+            }
+
+
+            String msg = "【志愿者分布】查询楼栋信息失败";
+            IcBuildingDTO building = getResultDataOrThrowsException(govOrgOpenFeignClient.getBuildingById(icResiUserInfo.getBuildId()),
+                    ServiceConstant.GOV_ORG_SERVER,
+                    EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
+
+            distribution.setVolunteerCategories(volunteerTypes);
+            distribution.setEpmetUserId(userBaseInfo.getUserId());
+            distribution.setIcResiUserId(icResiUserInfo.getId());
+            Optional.of(building).ifPresent(b -> {
+                distribution.setLongitude(b.getLongitude());
+                distribution.setLatitude(b.getLatitude());
+            });
+
+            r.getDistributions().add(distribution);
+        }
+
+        return r;
+    }
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
index f2aa4e4a70..ac5d97de01 100644
--- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
+++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
@@ -61,6 +61,7 @@ spring:
     password: @spring.datasource.druid.password@
     baseline-on-migrate: true
     baseline-version: 0
+    validate-on-migrate: false
   cloud:
     nacos:
       discovery:
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls
new file mode 100644
index 0000000000..1523d6719b
Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls differ
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index e7c9de9224..b10e6e259f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -324,4 +324,169 @@
             and ir.id=#{icResiUserId}
         </if>
     </select>
+
+    <resultMap id="IcResiUserBriefDTOMap" type="com.epmet.dto.result.IcResiUserBriefDTO">
+        <id property="icResiUserId" column="ID" ></id>
+        <result property="houseId" column="HOME_ID"/>
+        <result property="icUserName" column="NAME"/>
+        <collection property="houseUserList" ofType="com.epmet.dto.result.HouseUserDTO"
+                    column="{currentIcResiUserId=ID,homeId=HOME_ID}"  select="com.epmet.dao.IcResiUserDao.selectListFamilyMember">
+        </collection>
+    </resultMap>
+
+
+    <!--    查询当前居民的姓名，和房屋id -->
+    <select id="selectIcResuUser" parameterType="map" resultMap="IcResiUserBriefDTOMap">
+        SELECT
+            m.ID,
+            m.HOME_ID,
+            m.`NAME`
+        FROM
+            ic_resi_user m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.id = #{isResiUserId}
+    </select>
+
+    <!--    除了本人以外，住在这个房子的人 -->
+    <select id="selectListFamilyMember" parameterType="map" resultType="com.epmet.dto.result.HouseUserDTO">
+        SELECT
+            m.ID AS icResiUserId,
+            m.`NAME` AS icUserName
+        FROM
+            ic_resi_user m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.id != #{currentIcResiUserId}
+            and m.HOME_ID=#{homeId}
+            order by m.CREATED_TIME asc
+    </select>
+    <select id="getPartyMemberAgeStatistics" resultType="com.epmet.commons.tools.dto.result.OptionDataResultDTO">
+        SELECT
+            ageGroup AS "code",
+            COUNT(ID) AS "value"
+        FROM
+        (
+            SELECT
+                ID,
+                CASE
+                    WHEN age &lt; 50 THEN '0'
+                    WHEN age &gt;= 50 AND age &lt;= 59 THEN '1'
+                    WHEN age &gt;= 60 AND age &lt;= 69 THEN '2'
+                    WHEN age &gt;= 70 AND age &lt;= 79 THEN '3'
+                    ELSE '4'
+                END AS ageGroup
+            FROM
+            (
+                SELECT
+                    ID,
+                    YEAR (FROM_DAYS(DATEDIFF(NOW(),SUBSTRING( ID_CARD, 7, 8 )))) AS age
+                FROM
+                    ic_resi_user
+                WHERE
+                    DEL_FLAG = '0'
+                AND IS_PARTY = '1'
+                <choose>
+                    <when test='orgType == "grid"'>
+                       AND GRID_ID = #{orgId}
+                    </when>
+                    <otherwise>
+                        AND (AGENCY_ID = #{orgId} OR PIDS LIKE CONCAT('%',#{orgId},'%'))
+                    </otherwise>
+                </choose>
+                ) a
+        ) a
+        GROUP BY ageGroup
+    </select>
+    <select id="getPartyMemberAgeList" resultType="com.epmet.dto.result.PartyMemberAgeResultDTO">
+        SELECT
+            ID AS "userId",
+            NAME,
+            MOBILE,
+            age
+        FROM
+        (
+            SELECT
+                ID,
+                NAME,
+                MOBILE,
+                age,
+                CASE
+                    WHEN age &lt; 50 THEN '0'
+                    WHEN age &gt;= 50 AND age &lt;= 59 THEN '1'
+                    WHEN age &gt;= 60 AND age &lt;= 69 THEN '2'
+                    WHEN age &gt;= 70 AND age &lt;= 79 THEN '3'
+                    ELSE '4'
+                END AS ageGroup
+            FROM
+            (
+                SELECT
+                    ID,
+                    NAME,
+                    MOBILE,
+                    YEAR (FROM_DAYS(DATEDIFF(NOW(),SUBSTRING( ID_CARD, 7, 8 )))) AS age
+                FROM
+                    ic_resi_user
+                WHERE
+                    DEL_FLAG = '0'
+                AND IS_PARTY = '1'
+                <choose>
+                    <when test='orgType == "grid"'>
+                       AND GRID_ID = #{orgId}
+                    </when>
+                    <otherwise>
+                        AND (AGENCY_ID = #{orgId} OR PIDS LIKE CONCAT('%',#{orgId},'%'))
+                    </otherwise>
+                </choose>
+                ) a
+        ) a
+        <if test="null != code and '' != code">
+            WHERE ageGroup = #{code}
+        </if>
+    </select>
+
+    <select id="getPartyMemberEducationList" resultType="com.epmet.dto.result.PartyMemberEducationResultDTO">
+        SELECT
+            ID AS "userId",
+            NAME,
+            MOBILE,
+            CULTURE AS education
+        FROM
+            ic_resi_user
+        WHERE
+            DEL_FLAG = '0'
+        AND IS_PARTY = '1'
+        AND CULTURE IS NOT NULL
+        <if test="null != code and '' != code">
+            AND CULTURE = #{code}
+        </if>
+        <choose>
+            <when test='orgType == "grid"'>
+               AND GRID_ID = #{orgId}
+            </when>
+            <otherwise>
+                AND (AGENCY_ID = #{orgId} OR PIDS LIKE CONCAT('%',#{orgId},'%'))
+            </otherwise>
+        </choose>
+    </select>
+    <select id="getPartyMemberEducationStatistics" resultType="com.epmet.commons.tools.dto.result.OptionDataResultDTO">
+        SELECT
+            CULTURE AS "code",
+            count(ID) AS "value"
+        FROM
+            ic_resi_user
+        WHERE
+            DEL_FLAG = '0'
+        AND IS_PARTY = '1'
+        AND CULTURE IS NOT NULL
+        <choose>
+            <when test='orgType == "grid"'>
+               AND GRID_ID = #{orgId}
+            </when>
+            <otherwise>
+                AND (AGENCY_ID = #{orgId} OR PIDS LIKE CONCAT('%',#{orgId},'%'))
+            </otherwise>
+        </choose>
+        GROUP BY CULTURE
+    </select>
 </mapper>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
index 6d82e4c200..605350bde2 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
@@ -82,4 +82,26 @@
             u.DEL_FLAG = '0'
           AND u.id = #{userId}
     </select>
+
+    <select id="selectIdNum" parameterType="map" resultType="java.lang.String">
+        SELECT
+            uri.ID_NUM
+        FROM
+            user_resi_info uri
+        WHERE
+            uri.DEL_FLAG = '0'
+            AND uri.USER_ID = #{epmetUserId}
+            AND uri.CUSTOMER_ID = #{customerId}
+    </select>
+
+    <select id="selectCommonEpmetUser" parameterType="map" resultType="java.lang.String">
+        SELECT DISTINCT
+            uri.user_id
+        FROM
+            user_resi_info uri
+        WHERE
+            uri.DEL_FLAG = '0'
+            AND uri.CUSTOMER_ID = #{customerId}
+            AND uri.ID_NUM = #{idNum}
+    </select>
 </mapper>