Merge branches 'dev' and 'wxz_feign_datetime' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_feign_datetime

 Conflicts:

	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ExceptionUtils.java

epmet-admin/epmet-admin-server/pom.xml

@@ -136,6 +136,7 @@
                 <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
                 <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
@@ -172,6 +173,7 @@
                 <spring.flyway.enabled>false</spring.flyway.enabled>
 
                 <!--rocketmq-->
+                <rocketmq.enable>false</rocketmq.enable>
                 <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
@@ -205,6 +207,7 @@
                 <spring.flyway.enabled>true</spring.flyway.enabled>
 
                 <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
                 <rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
@@ -238,6 +241,7 @@
                 <spring.flyway.enabled>true</spring.flyway.enabled>
 
                 <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
                 <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java

@@ -2,8 +2,11 @@ package com.epmet.mq.listener;
 
 import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.rocketmq.register.MQAbstractRegister;
+import com.epmet.commons.rocketmq.register.MQConsumerProperties;
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.mq.listener.listener.AuthOperationLogListener;
+import com.epmet.mq.listener.listener.PointOperationLogListener;
 import com.epmet.mq.listener.listener.ProjectOperationLogListener;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
@@ -15,54 +18,15 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 
 @Component
-public class RocketMQConsumerRegister {
-    @Value("${spring.profiles.active}")
-    private String env;
-    @Value("${rocketmq.name-server}")
-    private String nameServer;
+public class RocketMQConsumerRegister extends MQAbstractRegister {
 
-    /**
-     * @return
-     * @Description 注册监听器
-     * @author wxz
-     * @date 2021.03.03 16:09
-     */
-    @PostConstruct
-    public void registerAllListeners() {
-        try {
-            if (!EnvEnum.LOCAL.getCode().equals(env)) {
-                register(nameServer, ConsomerGroupConstants.AUTH_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.AUTH, "*", new AuthOperationLogListener());
-                register(nameServer, ConsomerGroupConstants.PROJECT_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.PROJECT_CHANGED, "*", new ProjectOperationLogListener());
-            }
-        } catch (MQClientException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void register(String nameServer, String group, MessageModel messageModel, String topic, String subException, MessageListenerConcurrently listener) throws MQClientException {
-        // 实例化消费者
-        DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(group);
-
-        // 设置NameServer的地址
-        consumer.setNamesrvAddr(nameServer);
-        consumer.setMessageModel(messageModel);
-        consumer.setInstanceName(buildInstanceName());
-        // 订阅一个或者多个Topic，以及Tag来过滤需要消费的消息
-        consumer.subscribe(topic, subException);
-        // 注册回调实现类来处理从broker拉取回来的消息
-        consumer.registerMessageListener(listener);
-        // 启动消费者实例
-        consumer.start();
-    }
-
-    private String buildInstanceName() {
-        String instanceName = "";
-        for (int i = 0; i < 4; i++) {
-            int t = (int) (Math.random() * 10);
-            instanceName = instanceName.concat(t + "");
-        }
+    @Override
+    public void registerAllListeners(String env, MQConsumerProperties consumerProperties) {
+        // 客户初始化监听器注册
+        register(consumerProperties, ConsomerGroupConstants.AUTH_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.AUTH, "*", new AuthOperationLogListener());
+        register(consumerProperties, ConsomerGroupConstants.PROJECT_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.PROJECT_CHANGED, "*", new ProjectOperationLogListener());
+        register(consumerProperties, ConsomerGroupConstants.POINT_OPERATION_LOG_GROUP, MessageModel.CLUSTERING, TopicConstants.POINT, "*", new PointOperationLogListener());
 
-        return instanceName;
+        // ...其他监听器类似
     }
-
-}
+}

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/PointOperationLogListener.java

@@ -0,0 +1,91 @@
+package com.epmet.mq.listener.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.messages.PointRuleChangedMQMsg;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.entity.LogOperationEntity;
+import com.epmet.enums.SystemMessageTypeEnum;
+import com.epmet.mq.listener.bean.log.LogOperationHelper;
+import com.epmet.mq.listener.bean.log.OperatorInfo;
+import com.epmet.service.LogOperationService;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.redisson.api.RLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author wxz
+ * @Description 积分相关日志监听器
+
+ * @return
+ * @date 2021.06.21 10:13
+ */
+public class PointOperationLogListener implements MessageListenerConcurrently {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Override
+    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
+        try {
+            msgs.forEach(msg -> consumeMessage(msg));
+        } catch (Exception e) {
+            logger.error(ExceptionUtils.getErrorStackTrace(e));
+            return ConsumeConcurrentlyStatus.RECONSUME_LATER;
+        }
+        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+    }
+
+    private void consumeMessage(MessageExt messageExt) {
+        String opeType = messageExt.getTags();
+        String msg = new String(messageExt.getBody());
+        logger.info("积分操作日志监听器-收到消息内容:{}", msg);
+        PointRuleChangedMQMsg msgObj = JSON.parseObject(msg, PointRuleChangedMQMsg.class);
+
+        String content = StringUtils.isBlank(msgObj.getOperationBrief()) ? "" : msgObj.getOperationBrief();
+
+        OperatorInfo operatorInfo = LogOperationHelper.getInstance().getOperatorInfo(msgObj.getOperatorId());
+
+        LogOperationEntity logEntity = new LogOperationEntity();
+        logEntity.setCategory(messageExt.getTopic());
+        logEntity.setType(opeType);
+        logEntity.setTypeDisplay(SystemMessageTypeEnum.getTypeDisplay(opeType));
+        logEntity.setTargetId(msgObj.getRuleId());
+        logEntity.setIp(msgObj.getIp());
+        logEntity.setFromApp(msgObj.getFromApp());
+        logEntity.setFromClient(msgObj.getFromClient());
+        logEntity.setCustomerId(operatorInfo.getCustomerId());
+        logEntity.setOperatorId(msgObj.getOperatorId());
+        logEntity.setOperatorMobile(operatorInfo.getMobile());
+        logEntity.setOperatorName(operatorInfo.getName());
+        logEntity.setOperatingTime(msgObj.getOperatingTime());
+        logEntity.setContent(content);
+
+        DistributedLock distributedLock = null;
+        RLock lock = null;
+        try {
+            distributedLock = SpringContextUtils.getBean(DistributedLock.class);
+            lock = distributedLock.getLock(String.format("lock:point_operation_log:%s:%s", logEntity.getType(), logEntity.getTargetId()),
+                    30L, 30L, TimeUnit.SECONDS);
+            SpringContextUtils.getBean(LogOperationService.class).log(logEntity);
+        } catch (RenException e) {
+            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+            logger.error("【RocketMQ】添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+        } catch (Exception e) {
+            // 不是我们自己抛出的异常，可以让MQ重试
+            logger.error("【RocketMQ】添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            throw e;
+        } finally {
+            distributedLock.unLock(lock);
+        }
+    }
+}

epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml

@@ -136,4 +136,5 @@ shutdown:
     waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警
 
 rocketmq:
+  enable: @rocketmq.enable@
   name-server: @rocketmq.nameserver@

epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java

@@ -290,7 +290,7 @@ public class SsoServiceImpl implements SsoService {
         //3.根据华为openId查询用户是否存在历史登陆信息
         Result<StaffLatestAgencyResultDTO> latestStaffWechat = epmetUserOpenFeignClient.getLatestStaffWechatLoginRecord(userInfo.getOpenId());
         if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) {
-            logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
+            logger.warn(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
             throw new RenException(EpmetErrorCode.PLEASE_LOGIN.getCode());
         }
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -164,7 +164,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         //2.根据openid查询用户是否存在历史登陆信息
         Result<StaffLatestAgencyResultDTO> latestStaffWechat = epmetUserOpenFeignClient.getLatestStaffWechatLoginRecord(userWechatDTO.getWxOpenId());
         if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) {
-            logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
+            logger.warn(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
             throw new RenException(EpmetErrorCode.PLEASE_LOGIN.getCode());
         }
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
@@ -486,7 +486,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         dto.setMobile(formDTO.getMobile());
         Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserOpenFeignClient.getCustsomerStaffByIdAndPhone(dto);
         if (!customerStaffResult.success()) {
-            logger.error(String.format("手机密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
+            logger.warn(String.format("手机密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
             throw new RenException(customerStaffResult.getCode());
         }
         //2、密码是否正确
@@ -529,7 +529,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         if(result.success()&&null!=result.getData()){
             return result.getData();
         }
-        logger.error(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,密码%s,返回错误码%s,错误提示信息%s",
+        logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,密码%s,返回错误码%s,错误提示信息%s",
                 ServiceConstant.GOV_ORG_SERVER,
                 formDTO.getMobile(),
                 formDTO.getPassword(),

epmet-cloud-generator/src/main/java/io/renren/GeneratorApplication.java

@@ -2,7 +2,6 @@ package io.renren;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-
 @SpringBootApplication
 public class GeneratorApplication {
 

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java

@@ -97,10 +97,18 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
     }
 
     public Object getCustomerIdByFieldValue(MetaObject metaObject) {
-        if (metaObject.hasSetter(FieldConstant.CUSTOMER_ID_HUMP)) {
-            return loginUserUtil.getLoginUserCustomerId();
+        if (!metaObject.hasSetter(FieldConstant.CUSTOMER_ID_HUMP)) {
+            // 如果该entity对象，没有customerId属性，那么返回null;
+            return null;
         }
-        return null;
+
+        Object customerId;
+        customerId = getFieldValByName(FieldConstant.CUSTOMER_ID_HUMP, metaObject);
+        if (customerId != null && !customerId.equals("")) {
+            // 看entity是否手动设置了，设置了就用设置的
+            return customerId;
+        }
+        return loginUserUtil.getLoginUserCustomerId();
     }
 
     public Object getCreatedTimeByFieldValue(MetaObject metaObject) {

epmet-commons/epmet-commons-rocketmq/pom.xml

@@ -26,5 +26,10 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 </project>

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java

@@ -37,8 +37,12 @@ public interface ConsomerGroupConstants {
     String AUTH_OPERATION_LOG_GROUP = "auth_operation_log_group";
 
     /**
-     * 项目操作日志小肥猪
+     * 项目操作日志消费组
      */
     String PROJECT_OPERATION_LOG_GROUP = "project_operation_log_group";
+    /**
+     * 积分操作消费组
+     */
+    String POINT_OPERATION_LOG_GROUP = "point_operation_log_group";
 
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java

@@ -2,6 +2,7 @@ package com.epmet.commons.rocketmq.constants;
 
 /**
  * 话题列表常量，其他服务要想发送消息到mq，则应当引入epmet-commons-rocketmq模块，并且使用此常量
+ * 用于mq中的topic
  */
 public interface TopicConstants {
     /**
@@ -21,4 +22,9 @@ public interface TopicConstants {
      * 认证
      */
     String AUTH = "auth";
+
+    /**
+     * 积分系统话题
+     */
+    String POINT = "point";
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PointRuleChangedMQMsg.java

@@ -0,0 +1,33 @@
+package com.epmet.commons.rocketmq.messages;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 积分规则变动消息体
+ */
+@Data
+public class PointRuleChangedMQMsg {
+    /**
+     * 操作简介
+     */
+    private String operationBrief;
+
+    /**
+     * 规则的id
+     */
+    private String ruleId;
+    /**
+     * 谁操作的
+     */
+    private String operatorId;
+
+    private String ip;
+
+    private String fromApp;
+
+    private String fromClient;
+
+    private Date operatingTime;
+}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/ConsumerConfigProperties.java

@@ -1,43 +0,0 @@
-package com.epmet.commons.rocketmq.register;
-
-import lombok.Data;
-import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
-
-import java.io.Serializable;
-
-/**
- * desc:mq 消费配置类
- *
- * @author: LiuJanJun
- * @date: 2021/4/30 2:39 下午
- * @version: 1.0
- */
-@Data
-public class ConsumerConfigProperties implements Serializable {
-
-    private static final long serialVersionUID = 2069676324708473773L;
-    /**
-     * 消费者组
-     */
-    private String consumerGroup;
-    /**
-     * 主题
-     */
-    private String topic;
-    /**
-     * 标签
-     */
-    private String tag = "*";
-    /**
-     * 最小消费的线程数
-     */
-    private int consumeThreadMin = 2;
-    /**
-     * 最大消费的线程数
-     */
-    private int consumeThreadMax = 4;
-    /**
-     * 消费监听器
-     */
-    private MessageListenerConcurrently consumerListener;
-}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/MQAbstractRegister.java

@@ -0,0 +1,77 @@
+package com.epmet.commons.rocketmq.register;
+
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
+import org.apache.rocketmq.client.consumer.listener.MessageListener;
+import org.apache.rocketmq.client.exception.MQClientException;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
+
+/**
+ * @author wxz
+ * @Description 父类抽象注册器
+ * @date 2021.07.14 15:38:21
+ */
+@Slf4j
+public abstract class MQAbstractRegister {
+
+    /**
+     * @Description 注册所有监听器，由子类实现，做具体监听器的注册
+     * @return
+     * @author wxz
+     * @date 2021.07.14 15:48
+    */
+    public abstract void registerAllListeners(String env, MQConsumerProperties consumerProperties);
+
+    /**
+     * @Description 真正执行注册的方法，供子类直接调用，子类也可以覆盖该方法
+     * @return
+     * @author wxz
+     * @date 2021.07.14 15:56
+    */
+    public void register(MQConsumerProperties consumerProperties, String group, MessageModel messageModel, String topic, String subExpression, MessageListener listener) {
+        try {
+            String nameServer = consumerProperties.getNameServer();
+            Integer consumeThreadMin = consumerProperties.getConsumeThreadMin();
+            Integer consumeThreadMax = consumerProperties.getConsumeThreadMax();
+            String instanceName = buildInstanceName();
+            // 实例化消费者
+            DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(group);
+
+            // 设置NameServer的地址
+            consumer.setNamesrvAddr(nameServer);
+            consumer.setMessageModel(messageModel);
+            consumer.setInstanceName(instanceName);
+            // 订阅一个或者多个Topic，以及Tag来过滤需要消费的消息
+            consumer.subscribe(topic, subExpression);
+            // 注册回调实现类来处理从broker拉取回来的消息
+            consumer.registerMessageListener(listener);
+            if (consumeThreadMin != null) {
+                consumer.setConsumeThreadMin(consumeThreadMin);
+            }
+            if (consumeThreadMax != null) {
+                consumer.setConsumeThreadMax(consumeThreadMax);
+            }
+            // 启动消费者实例
+            consumer.start();
+            log.info(String.format("监听器注册完成,消费者组:%s,Topic:%s,Tag:%s,实例名称:%s", group, topic, subExpression, instanceName));
+        } catch (Exception e) {
+            log.error(String.format("监听器注册失败,消费者组:%s,Topic:%s,Tag:%s。详细信息:%s", group, topic, subExpression, ExceptionUtils.getErrorStackTrace(e)));
+        }
+    }
+
+    /**
+     * @Description 构造实例名称
+     * @return
+     * @author wxz
+     * @date 2021.07.14 15:56
+    */
+    private String buildInstanceName() {
+        String instanceName = "";
+        for (int i = 0; i < 4; i++) {
+            int t = (int) (Math.random() * 10);
+            instanceName = instanceName.concat(t + "");
+        }
+        return instanceName;
+    }
+}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/MQConsumerProperties.java

@@ -0,0 +1,29 @@
+package com.epmet.commons.rocketmq.register;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * @Description 注册属性
+ * @author wxz
+ * @date 2021.07.14 15:33:16
+*/
+@Data
+@ConfigurationProperties(prefix = "rocketmq")
+public class MQConsumerProperties {
+
+    /**
+     * nameServer
+     */
+    private String nameServer;
+
+    /**
+     * 最小消费线程数
+     */
+    private Integer consumeThreadMin;
+    /**
+     * 最大消费线程数
+     */
+    private Integer consumeThreadMax;
+
+}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/MQConsumerRegister.java

@@ -1,79 +0,0 @@
-package com.epmet.commons.rocketmq.register;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
-import org.springframework.beans.factory.annotation.Value;
-
-import javax.annotation.PostConstruct;
-
-/**
- * desc：注册mq监听器
- *
- * @author liujianjun
- */
-@Slf4j
-public abstract class MQConsumerRegister {
-    @Value("${spring.profiles.active}")
-    private String env;
-    @Value("${rocketmq.name-server}")
-    private String namesrvAddr;
-
-    public abstract ConsumerConfigProperties getConsumerProperty();
-
-
-    /**
-     * @return
-     * @Description 注册监听器
-     * @author wxz
-     * @date 2021.03.03 16:09
-     */
-    @PostConstruct
-    public void registerMQListener() {
-        ConsumerConfigProperties consumerProperty = getConsumerProperty();
-        log.info("registerAllListeners consumers:{} success", consumerProperty);
-        //本地环境不注册
-        //if (!"local".equals(env)) {
-            try {
-                // 实例化消费者
-                DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(consumerProperty.getConsumerGroup());
-
-                // 设置NameServer的地址
-                consumer.setNamesrvAddr(namesrvAddr);
-                consumer.setMessageModel(MessageModel.CLUSTERING);
-                consumer.setInstanceName(buildInstanceName());
-                // 订阅一个或者多个Topic，以及Tag来过滤需要消费的消息
-                consumer.subscribe(consumer.getConsumerGroup(), consumerProperty.getTag());
-                // 注册回调实现类来处理从broker拉取回来的消息
-                consumer.registerMessageListener(consumerProperty.getConsumerListener());
-                consumer.setConsumeThreadMin(consumerProperty.getConsumeThreadMin());
-                consumer.setConsumeThreadMax(consumerProperty.getConsumeThreadMax());
-                // 启动消费者实例
-                consumer.start();
-            } catch (MQClientException e) {
-                log.info("registerMQListener exception", e);
-            }
-
-        //}
-
-    }
-
-    /**
-     * desc: 因为docker-compose部署有问题 所有自己命名
-     *
-     * @param
-     * @return java.lang.String
-     * @author LiuJanJun
-     * @date 2021/4/30 5:00 下午
-     */
-    private String buildInstanceName() {
-        String instanceName = "";
-        for (int i = 0; i < 4; i++) {
-            int t = (int) (Math.random() * 10);
-            instanceName = instanceName.concat(t + "");
-        }
-
-        return instanceName;
-    }
-}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/MQRegisterConfiguration.java

@@ -0,0 +1,35 @@
+package com.epmet.commons.rocketmq.register;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @author wxz
+ * @Description MQ注册配置类
+ * @date 2021.07.14 15:36:24
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "rocketmq", name = "enable", havingValue = "true", matchIfMissing = false)
+@EnableConfigurationProperties(MQConsumerProperties.class)
+@Slf4j
+public class MQRegisterConfiguration {
+
+    @Value("${spring.profiles.active}")
+    private String env;
+    @Autowired
+    private MQConsumerProperties consumerProperties;
+    @Autowired
+    private MQAbstractRegister mqRegister;
+
+    @PostConstruct
+    public void register() {
+        mqRegister.registerAllListeners(env, consumerProperties);
+        log.info("监听器注册动作执行完毕");
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java

@@ -136,4 +136,13 @@ public interface Constant {
     String CREATED_TIME = "created_time";
 
     String DEFAULT_CUSTOMER = "default";
+
+    /**
+     *  省级:province; 市级: city; 区县级: district ;乡（镇、街道）级:street ;社区级：community
+     */
+    String PROVINCE = "province";
+    String CITY = "city";
+    String DISTRICT = "district";
+    String STREET = "street";
+    String COMMUNITY = "community";
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -86,4 +86,14 @@ public interface StrConstant {
     String SPECIAL_CUSTOMER = "150282ed25c14ff0785e7e06283b6283";
     //平音客户
     String PY_CUSTOMER = "6f203e30de1a65aab7e69c058826cd80";
+
+    /**
+     * 单位积分,积分上限，积分说明，积分事件
+     */
+    String POINT_CHANGE = "将%s调整为%s";
+
+    /**
+     * 积分规则修改的头
+     */
+    String POINT_CHANGE_HEAD = "修改了%s规则，";
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@@ -170,7 +170,8 @@ public enum RequirePermissionEnum {
      * 更多-日志记录
      */
     MORE_PATROL_RECORD_LIST("more_patrol_record_list","更多:日志记录:巡查记录:列表","巡查记录列表"),
-    MORE_SYSTEM_LOG_LIST("MORE_SYSTEM_LOG_LIST","更多:日志记录:系统日志:列表","系统日志列表"),
+    MORE_SYSTEM_LOG_LIST("more_system_log_list","更多:日志记录:系统日志:列表","系统日志列表"),
+    MORE_GRID_MEMBER_STATS_ANALYSIS("more_grid_member_stats_analysis", "更多:网格员数据分析", "更多:网格员数据分析"),
 
 
     /**

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -129,6 +129,7 @@ public enum EpmetErrorCode {
 	OPER_UPLOAD_IMG_TYPE_ERROR(8716, "请上传PNG格式的图片"),
 	OPER_UPLOAD_IMG_SIZE_ERROR(8717, "请上传200*200的图片"),
 	OPER_CORS_CONFIG_ERROR(8718, "跨域配置错误"),
+	ACCESS_CONFIG_ERROR(8719, "权限配置错误"),
 
 	// 党建声音 前端提示 88段
 	DRAFT_CONTENT_IS_NULL(8801, "至少需要添加一个段落"),
@@ -186,7 +187,11 @@ public enum EpmetErrorCode {
 	SIGN_IN_TIME_PASSED(8912,"当前时间已超过签到时间"),
 	INVITATION_NOT_EXIST(8913,"链接不存在"),
 	NOTICE_EXPIRATION_TIME(8914,"通知过期时间不能早于当前时间"),
-	NOTICE_BE_OVERDUE(8915,"通知已过期不允许再次变更");
+	NOTICE_BE_OVERDUE(8915,"通知已过期不允许再次变更"),
+
+	SAME_RULE_NAME(8916,"该积分事件已存在，请重新调整保存"),
+	UP_LIMIT_POINT(8917,"积分上限需为单位积分倍数，请重新调整保存"),
+	BADGE_CHECK(8918,"");
 
 
 	private int code;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ExceptionUtils.java

@@ -25,22 +25,16 @@ public class ExceptionUtils {
      * @return    返回异常信息
      */
     public static String getErrorStackTrace(Exception ex){
-        return getErrorStackTraceOfThrowable(ex);
+        return getThrowableErrorStackTrace(ex);
     }
 
-    /**
-     * @Description Throwable级别的错误信息
-     * @return
-     * @author wxz
-     * @date 2021.07.07 14:37
-    */
-    public static String getErrorStackTraceOfThrowable(Throwable t) {
+    public static String getThrowableErrorStackTrace(Throwable ex) {
         StringWriter sw = null;
         PrintWriter pw = null;
         try {
             sw = new StringWriter();
             pw = new PrintWriter(sw, true);
-            t.printStackTrace(pw);
+            ex.printStackTrace(pw);
         }finally {
             try {
                 if(pw != null) {

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -469,4 +469,8 @@ public class RedisKeys {
 	public static String getCorsConfigKey() {
 		return rootPrefix.concat("sys:cors");
 	}
+
+    public static String getProjectChangedMsgDistinceKey(String customerId) {
+		return rootPrefix.concat("project_changed:consume:").concat(customerId);
+    }
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -446,6 +446,22 @@ public class DateUtils {
         return DateUtils.format(date,DateUtils.DATE_PATTERN_YYYYMM);
     }
 
+    /**
+     * @Description  获取指定 月份的前n月 返回yyyyMM
+     * @Param beforeMonth
+     * @Param monthId
+     * @author zxc
+     * @date 2021/7/9 2:44 下午
+     */
+    public static  String getBeforeNMonthByMonth(int beforeMonth, String monthId){
+        StringBuilder builder = new StringBuilder(monthId);
+        builder.insert(NumConstant.FOUR,"-");
+        builder.insert(builder.length(),"-01");
+        LocalDate parse = LocalDate.parse(builder.toString());
+        LocalDate localDate = parse.minusMonths(beforeMonth);
+        return localDate.toString().replace("-","").substring(NumConstant.ZERO,NumConstant.SIX);
+    }
+
     /**
      * @return java.util.List<java.lang.String> 返回yyyyMMdd
      * @param startTime yyyyMMdd
@@ -847,4 +863,15 @@ public class DateUtils {
         return DateUtils.format(date,DateUtils.DATE_TIME_PATTERN);
     }
 
+    /**
+     * @Author sun
+     * @Description 获取当前日期几个自然月之前的日期（yyyy-MM-dd HH:mm:ss）
+     **/
+    public static String getBeforeMonthDate(int beforMonth, String dateType){
+        Calendar c = Calendar.getInstance();
+        c.add(Calendar.MONTH, - beforMonth);
+        Date date = c.getTime();
+        return DateUtils.format(date,dateType);
+    }
+
 }

epmet-gateway/pom.xml

@@ -233,6 +233,9 @@
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
                 <!--<gateway.routes.epmet-ext-server.url>lb://127.0.0.1:8115</gateway.routes.epmet-ext-server.url>-->
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -361,6 +364,9 @@
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
                 <!--<gateway.routes.epmet-openapi-adv-server.url>http://localhost:8115</gateway.routes.epmet-openapi-adv-server.url>-->
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -458,6 +464,9 @@
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -552,6 +561,9 @@
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-gateway/src/main/java/com/epmet/auth/ExternalAuthProcessor.java

@@ -16,7 +16,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.util.AntPathMatcher;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -73,6 +72,7 @@ public class ExternalAuthProcessor extends AuthProcessor {
         }
 
         if (!inPaths) {
+            logger.error("auth 401 ,uri:{}",requestUri);
             throw new RenException(EpmetErrorCode.ERR401.getCode(), "所请求的url并未对外部应用开放");
         }
 

epmet-gateway/src/main/resources/bootstrap.yml

@@ -476,11 +476,24 @@ epmet:
   # 外部应用认证，使用AccessToken等头进行认证
   externalOpenUrls:
     - /data/report/**
-    - /data/stats/**
     - /epmet/ext/**
     - /epmetuser/customerstaff/customerlist
     - /message/template/**
     - /data/aggregator/project/projectdistribution
+    - /data/aggregator/epmetuser/open-staffdetail
+    #stats external包下 公共的类只外部暴露方法 纯外部使用的 暴漏整个
+    - /data/stats/statsuser/gm-uploadevent
+    - /data/stats/statsuser/gm-uploaddata
+    - /data/stats/indexcalculate/all
+    - /data/stats/kcscreencoll/**
+    - /data/stats/indexcollect/**
+    - /data/stats/anscreencoll/**
+    - /data/stats/plugin/**
+    - /data/stats/screencoll/**
+    - /data/stats/project/**
+    - /data/stats/basereport/**
+    - /data/stats/governance/**
+
 
   # 对外开放接口认证白名单
   externalAuthUrlsWhiteList:
@@ -494,3 +507,8 @@ jwt:
     secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet]
     #token有效时长，默认7天，单位秒
     expire: 604800
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

epmet-gateway/src/main/resources/logback-spring.xml

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/gateway"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -131,13 +133,21 @@
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
+        </filter>
     </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" level="INFO"/>
         <logger name="com.epmet" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java

@@ -7,4 +7,8 @@ package com.epmet.dataaggre.constant;
 public interface OrgConstant {
 	String AGENCY = "agency";
 	String GRID = "grid";
+	String PROVINCE = "province";
+	String CITY = "city";
+	String DISTRICT = "district";
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgencyGovrnFormDTO.java

@@ -33,6 +33,14 @@ public class AgencyGovrnFormDTO implements Serializable {
      * 街道解决占比:street
      */
     private String type;
+    /**
+     * 组织级别
+     */
+    private String level;
+    /**
+     * 组织地区码
+     */
+    private String areaCode;
     public interface Agency extends CustomerClientShowGroup {}
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/GovrnRatioFormDTO.java

@@ -28,6 +28,8 @@ public class GovrnRatioFormDTO implements Serializable {
      * 日维度Id[日期，不传值默认查前一天的【格式：20210101】]
      */
     private String dateId;
+    private String areaCode;
+    private String level;
     public interface AgencyGrid extends CustomerClientShowGroup {}
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyGroupResultDTO.java

@@ -19,6 +19,10 @@ public class SubAgencyGroupResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
+    //机关级别[社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province
+    private String level;
+    //行政地区编码
+    private String areaCode;
     //党群小组总数
     private Integer groupTotal = 0;
     //楼院小组总数

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyIssueResultDTO.java

@@ -19,6 +19,10 @@ public class SubAgencyIssueResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
+    //机关级别[社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province
+    private String level;
+    //行政地区编码
+    private String areaCode;
     //议题总数
     private Integer issueTotal = 0;
     //表决中总数

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyProjectResultDTO.java

@@ -19,6 +19,10 @@ public class SubAgencyProjectResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
+    //机关级别[社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province
+    private String level;
+    //行政地区编码
+    private String areaCode;
     //项目总数
     private Integer projectTotal = 0;
     //处理中总数

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyTopicResultDTO.java

@@ -19,6 +19,10 @@ public class SubAgencyTopicResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
+    //机关级别[社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province
+    private String level;
+    //行政地区编码
+    private String areaCode;
     //话题总数
     private Integer topicTotal = 0;
     //热议中总数

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyUserResultDTO.java

@@ -19,6 +19,10 @@ public class SubAgencyUserResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
+    //机关级别[社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province
+    private String level;
+    //行政地区编码
+    private String areaCode;
     //用户总数
     private Integer userTotal = 0;
     //党员总数

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GovStaffRoleDTO.java

@@ -93,6 +93,11 @@ public class GovStaffRoleDTO implements Serializable {
      */
 	private Integer fullTimeOnly;
 
+    /**
+     * 角色对应的职责说明
+     */
+    private String description;
+
     /**
      * 排序
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/GovStaffRoleTemplateDTO.java

@@ -58,6 +58,16 @@ public class GovStaffRoleTemplateDTO implements Serializable {
      */
 	private Integer fullTimeOnly;
 
+    /**
+     * 角色对应的职责说明
+     */
+    private String description;
+
+    /**
+     * 排序
+     */
+    private String sort;
+
     /**
      * 
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/GridMemberStatsFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dataaggre.dto.epmetuser.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description 网格员相关统计formdto
+ * @author wxz
+ * @date 2021.07.05 15:46:23
+*/
+@Data
+public class GridMemberStatsFormDTO {
+
+    public interface IssueProjectStats {}
+
+    @NotBlank(message = "网格ID不能为空", groups = {IssueProjectStats.class})
+    private String gridId;
+
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/OpenStaffDetailFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dataaggre.dto.epmetuser.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 对外接口--查询工作人员基本信息-接口入参
+ * @Auth sun
+ */
+@Data
+public class OpenStaffDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "客户Id不能为空", groups = OpenStaffDetailFormDTO.Open.class)
+    private String customerId;
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空", groups = OpenStaffDetailFormDTO.Open.class)
+    private String mobile;
+    public interface Open extends CustomerClientShowGroup {}
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java

@@ -24,7 +24,7 @@ public class StaffListFormDTO implements Serializable {
     @NotNull(message = "最近时间不能为空", groups = StaffListFormDTO.Staff.class)
     private Integer time;
     /**
-     * 排序字段【巡查总次数：patrolTotal；最近开始巡查时间：latestPatrolledTime】
+     * 排序字段【巡查总次数：patrolTotal；最近开始巡查时间：latestPatrolledTime；上报项目数： reportProjectCount；巡查总时长：totalTime】
      */
     @NotBlank(message = "排序条件不能为空", groups = StaffListFormDTO.Staff.class)
     private String sortCode;

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/OpenStaffDetailResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 对外接口--查询工作人员基本信息-接口返参
+ * @Auth sun
+ */
+@Data
+public class OpenStaffDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = 7129564173128153335L;
+
+    //工作人员用户id
+    private String staffId = "";
+    //工作人员姓名
+    private String staffName = "";
+    //手机号
+    private String mobile = "";
+    //用户所属组织id
+    private String agencyId = "";
+    //用户所属组织全路径名称
+    private String agencyAllName = "";
+    //客户Id
+    private String customerId = "";
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PersonalPatrolListResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 个人中心-网格员巡查记录-接口入参
+ * @Auth sun
+ */
+@Data
+public class PersonalPatrolListResultDTO implements Serializable {
+    private static final long serialVersionUID = 7129564173128153335L;
+
+    //巡查总次数;巡查总时长;立项事件数
+    private String key;
+    //key对应值
+    private String value;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffListResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.dto.epmetuser.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -28,5 +29,11 @@ public class StaffListResultDTO implements Serializable {
     private String gender = "0";
     //正在巡查中：patrolling；否则返回空字符串
     private String status = "";
+    //上报项目数
+    private Integer reportProjectCount;
+    //巡查总时长
+    private String totalTime = "";
+    @JsonIgnore
+    private Integer timeNum;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenCustomerAgencyDTO.java

@@ -0,0 +1,49 @@
+package com.epmet.dataaggre.dto.evaluationindex;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 组织机构信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-21
+ */
+@Data
+public class ScreenCustomerAgencyDTO implements Serializable {
+    private static final long serialVersionUID = 6328123559936824470L;
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 组织id
+     */
+    private String agencyId;
+
+    /**
+     * 组织名称
+     */
+    private String agencyName;
+
+    /**
+     * 机关级别（社区级：community，
+     乡（镇、街道）级:street,
+     区县级: district,
+     市级: city
+     省级:province）
+     */
+    private String level;
+
+    /**
+     * 行政地区编码
+     */
+    private String areaCode;
+
+    /**
+     * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+     */
+    private String parentAreaCode;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenCustomerGridDTO.java

@@ -0,0 +1,119 @@
+/**
+ * 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.evaluationindex;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 网格(党支部)信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-26
+ */
+@Data
+public class ScreenCustomerGridDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 组织名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 坐标区域
+     */
+	private String areaMarks;
+
+    /**
+     * 中心点位
+     */
+	private String centerMark;
+
+    /**
+     * 党支部（=网格）的位置
+     */
+	private String partyMark;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
+     */
+	private String dataEndTime;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+	private String allParentIds;
+	private String pid;
+	private String pids;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenGovernRankDataDailyDTO.java

@@ -0,0 +1,161 @@
+/**
+ * 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.evaluationindex;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 基层治理-治理能力排行数据(按月统计)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Data
+public class ScreenGovernRankDataDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 年Id
+     */
+	private String yearId;
+
+    /**
+     * 月份Id
+     */
+	private String monthId;
+
+    /**
+     * 数据更新至：yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 组织类别 agency：组织；部门：department；网格：grid
+     */
+	private String orgType;
+
+    /**
+     * 组织Id 可以为网格，机关id
+     */
+	private String orgId;
+
+    /**
+     * 上级组织Id
+     */
+	private String parentId;
+
+    /**
+     * 组织名称
+     */
+	private String orgName;
+
+    /**
+     * 响应率
+     */
+	private BigDecimal responseRatio;
+
+    /**
+     * 解决率
+     */
+	private BigDecimal resolvedRatio;
+
+    /**
+     * 自治率
+     */
+	private BigDecimal governRatio;
+
+    /**
+     * 满意率
+     */
+	private BigDecimal satisfactionRatio;
+
+	/**
+	 * 响应数
+	 */
+	private Integer responseCount;
+	/**
+	 * 项目转入次数
+	 */
+	private Integer transferCount;
+	/**
+	 * 解决项目数
+	 */
+	private Integer resolvedCount;
+	/**
+	 * 已关闭项目数
+	 */
+	private Integer closedCount;
+	/**
+	 * 自治项目数
+	 */
+	private Integer governCount;
+	/**
+	 * 满意项目数
+	 */
+	private Integer satisfactionCount;
+	/**
+	 * 已关闭项目（由议题转的项目）数
+	 */
+	private Integer closedProjectCount;
+
+    /**
+     * 删除标识 0未删除；1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dataaggre.dto.govorg.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Data
+public class GridMemberDataAnalysisFromDTO {
+
+    public interface listGridMemberDatas {}
+
+    private List<String> gridIds;
+
+    // 搜索的人员姓名
+    private String searchedStaffName;
+    private String month;
+    @NotBlank(message = "排序规则不能为空", groups = { listGridMemberDatas.class })
+    private String sort;
+    private Integer pageNo = 1;
+    private Integer pageSize = 10;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.Data;
+
+@Data
+public class GridMemberDataAnalysisResultDTO {
+
+    private String gridId;
+    private String staffId;
+    private String staffName;
+    private String orgName;
+
+    private Integer projectCount;
+    private Integer issueToProjectCount;
+    private Integer closedIssueCount;
+    private Integer projectResponseCount;
+    private Integer projectTransferCount;
+    private Integer projectClosedCount;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/GridMemberDataAnalysisEnums.java

@@ -0,0 +1,39 @@
+package com.epmet.dataaggre.enums;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum GridMemberDataAnalysisEnums {
+
+    SORT_SORT_PROJECT_COUNT("projectCount", "project_count"),
+    SORT_ISSUE_TO_PROJECT_COUNT("issueToProjectCount", "issue_to_project_count"),
+    SORT_CLOSED_ISSUE_COUNT("closedIssueCount", "closed_issue_count"),
+    SORT_PROJECT_RESPONSE_COUNT("projectResponseCount", "project_response_count"),
+    SORT_PROJECT_TRANSFER_COUNT("projectTransferCount", "project_transfer_count"),
+    SORT_PROJECT_CLOSED_COUNT("projectClosedCount", "project_closed_count");
+
+    private String key;
+    private String value;
+
+    GridMemberDataAnalysisEnums(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public static GridMemberDataAnalysisEnums get(String key) {
+        for (GridMemberDataAnalysisEnums gm : GridMemberDataAnalysisEnums.values()) {
+            if (gm.key.equals(key)) {
+                return gm;
+            }
+        }
+        return null;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -7,12 +7,18 @@ import com.epmet.commons.tools.exception.RenException;
 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.epmetuser.form.OpenStaffDetailFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.GridMemberStatsFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.OpenStaffDetailResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.PatrolDateListResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.PatrolRecordListResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.PersonalPatrolListResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +26,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author zxc
@@ -33,6 +42,9 @@ public class EpmetUserController {
     @Autowired
     private EpmetUserService epmetUserService;
 
+    @Autowired
+    private DataStatsService dataStatsService;
+
 
     /**
      * @Param formDTO
@@ -79,5 +91,113 @@ public class EpmetUserController {
 		return new Result<PatrolDateListResultDTO>().ok(epmetUserService.patrolDateList(formDTO));
 	}
 
+    /**
+     * @Param formDTO
+     * @Description 【更多-巡查记录-人员巡查记录列表】
+     * @author sun
+     */
+    @PostMapping("staffpatrollist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.MORE_PATROL_RECORD_LIST)
+    public Result<List<StaffListResultDTO>> staffPatrolList(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
+        if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode())
+                && !"reportProjectCount".equals(formDTO.getSortCode()) && !"totalTime".equals(formDTO.getSortCode())) {
+            throw new RenException("参数错误，排序条件值错误");
+        }
+        if (formDTO.getTime() != 1 && formDTO.getTime() != 3) {
+            throw new RenException("参数错误，最近时间值不正确");
+        }
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<List<StaffListResultDTO>>().ok(epmetUserService.staffPatrolList(formDTO));
+    }
+
+    /**
+     * @Description 个人中心-网格员巡查记录
+     * @author sun
+     */
+    @PostMapping("personalpatrollist")
+    public Result<List<PersonalPatrolListResultDTO>> personalPatrolList(@LoginUser TokenDto tokenDto) {
+        return new Result<List<PersonalPatrolListResultDTO>>().ok(epmetUserService.personalPatrolList(tokenDto.getUserId()));
+    }
+
+    /**
+     * @Description 网格员项目议题统计数据
+     * @return
+     * @author wxz
+     * @date 2021.07.05 15:49
+    */
+    @PostMapping("/gridmember/issueprojectstats")
+    public Result<List<Map<String, Object>>> getGridMemberIssueProjectStats(@LoginUser TokenDto loginUser) {
+        String userId = loginUser.getUserId();
+
+        GridMemberDataAnalysisResultDTO data = dataStatsService.getGridMemberIssueProjectStats(userId);
+        List<Map<String, Object>> result = convertToMapList(data);
+        return new Result<List<Map<String, Object>>>().ok(result);
+    }
+
+    /**
+     * @Description 将议题项目统计数据转为前端需要的格式
+     * @return
+     * @author wxz
+     * @date 2021.07.05 16:35
+    */
+    private List<Map<String, Object>> convertToMapList(GridMemberDataAnalysisResultDTO data) {
+        Integer projectCount = data == null ? 0 : data.getProjectCount();
+        Integer closedIssueCount = data == null ? 0 : data.getClosedIssueCount();
+        Integer issueToProjectCount = data == null ? 0 : data.getIssueToProjectCount();
+        Integer projectClosedCount = data == null ? 0 : data.getProjectClosedCount();
+        Integer projectResponseCount = data == null ? 0 : data.getProjectResponseCount();
+        Integer projectTransferCount = data == null ? 0 : data.getProjectTransferCount();
+
+        HashMap<String, Object> projectCountMap = new HashMap<>();
+        projectCountMap.put("key", "直接立项数");
+        projectCountMap.put("value", projectCount);
+        projectCountMap.put("type", "project");
+
+        HashMap<String, Object> closedIssueCountMap = new HashMap<>();
+        closedIssueCountMap.put("key", "议题转项目数");
+        closedIssueCountMap.put("value", issueToProjectCount);
+        closedIssueCountMap.put("type", "project");
+
+        HashMap<String, Object> issueClosedCountMap = new HashMap<>();
+        issueClosedCountMap.put("key", "议题关闭数");
+        issueClosedCountMap.put("value", closedIssueCount);
+        issueClosedCountMap.put("type", "issue");
+
+        HashMap<String, Object> projectResponseCountMap = new HashMap<>();
+        projectResponseCountMap.put("key", "项目响应数");
+        projectResponseCountMap.put("value", projectResponseCount);
+        projectResponseCountMap.put("type", "project");
+
+        HashMap<String, Object> projectTransferCountMap = new HashMap<>();
+        projectTransferCountMap.put("key", "项目吹哨数");
+        projectTransferCountMap.put("value", projectTransferCount);
+        projectTransferCountMap.put("type", "project");
+
+        HashMap<String, Object> projectClosedCountMap = new HashMap<>();
+        projectClosedCountMap.put("key", "项目结案数");
+        projectClosedCountMap.put("value", projectClosedCount);
+        projectClosedCountMap.put("type", "project");
+
+        ArrayList<Map<String, Object>> maps = new ArrayList<>(6);
+        maps.add(projectCountMap);
+        maps.add(closedIssueCountMap);
+        maps.add(issueClosedCountMap);
+        maps.add(projectResponseCountMap);
+        maps.add(projectTransferCountMap);
+        maps.add(projectClosedCountMap);
+        return maps;
+    }
+    /**
+     * @Param formDTO
+     * @Description 对外接口--查询工作人员基本信息
+     * @author sun
+     */
+    @PostMapping("open-staffdetail")
+    public Result<OpenStaffDetailResultDTO> openStaffDetail(@RequestBody OpenStaffDetailFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, OpenStaffDetailFormDTO.Open.class);
+        return new Result<OpenStaffDetailResultDTO>().ok(epmetUserService.openStaffDetail(formDTO));
+    }
+
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -1,20 +1,35 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.govorg.form.GridMemberDataAnalysisFromDTO;
 import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.AgencyGridListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.NextAreaCodeResultDTO;
+import com.epmet.dataaggre.enums.GridMemberDataAnalysisEnums;
+import com.epmet.dataaggre.service.AggreGridService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
+import com.epmet.dto.result.PublicAndInternalFileResultDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 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 java.util.ArrayList;
 import java.util.List;
+import java.util.PriorityQueue;
 
 /**
  * @Author zxc
@@ -27,6 +42,12 @@ public class GovOrgController {
     @Autowired
     private GovOrgService govOrgService;
 
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
+    @Autowired
+    private AggreGridService aggreGridService;
+
 
     /**
      * @param tokenDTO
@@ -51,4 +72,51 @@ public class GovOrgController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<NextAreaCodeResultDTO>>().ok(govOrgService.queryNextLevelAreaCodeList(formDTO));
     }
+
+    /**
+     * @Description 网格员统计，列表查询
+     * @return
+     * @author wxz
+     * @date 2021.07.05 11:14
+    */
+    @PostMapping("gridmemberdataanalysis")
+    @RequirePermission(requirePermission = RequirePermissionEnum.MORE_GRID_MEMBER_STATS_ANALYSIS)
+    public Result getGridMemberDataAnalysis(@RequestBody GridMemberDataAnalysisFromDTO input) {
+        ValidatorUtils.validateEntity(input, GridMemberDataAnalysisFromDTO.listGridMemberDatas.class);
+
+        List<String> gridIds = input.getGridIds();
+        String month = input.getMonth();
+        Integer pageNo = input.getPageNo();
+        Integer pageSize = input.getPageSize();
+        String sort = input.getSort();
+        String searchedStaffName = input.getSearchedStaffName();
+        String loginUserId = loginUserUtil.getLoginUserId();
+
+        // 排序字段检验
+        GridMemberDataAnalysisEnums sortType;
+        if ((sortType = GridMemberDataAnalysisEnums.get(sort)) == null ) {
+            throw new RenException(EpmetErrorCode.OPEN_API_PARAMS_MISSING.getCode(), "未知的排序方式");
+        }
+
+        // 用户登录状态判断
+        if (StringUtils.isBlank(loginUserId)) {
+            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询网格员统计数据失败");
+        }
+
+        // 月份格式判断
+        if (StringUtils.isNotBlank(month)) {
+            if (!month.matches("\\d{4}/\\d{2}")) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), "月份格式错误:" + month);
+            } else {
+                month = month.replace("/", "");
+            }
+        }
+
+        // 网格id为空处理
+        if (CollectionUtils.isEmpty(gridIds)) {
+            gridIds = new ArrayList<>();
+        }
+        List<GridMemberDataAnalysisResultDTO> resultList = aggreGridService.getGridMemberDataAnalysis(gridIds, searchedStaffName, loginUserId, month, sortType.getValue(), pageNo, pageSize);
+        return new Result().ok(resultList);
+    }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java

@@ -25,6 +25,7 @@ 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.DimGridEntity;
+import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -41,43 +42,43 @@ public interface DataStatsDao {
      * @Description 查询组织下注册用户最新日统计数据
      * @author sun
      */
-    AgencyBasicDataResultDTO getAgnecyRegUser(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
+    List<AgencyBasicDataResultDTO> getAgnecyRegUser(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
 
     /**
      * @Description 查询组织下最新群组日统计数据
      * @author sun
      */
-    AgencyBasicDataResultDTO getAgnecyGroup(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
+    List<AgencyBasicDataResultDTO> getAgnecyGroup(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
 
     /**
      * @Description 查询组织下最新状态话题-机关日统计数据表
      * @author sun
      */
-    List<AgencyBasicDataResultDTO.Topic> getAgencyTopic(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
+    List<AgencyBasicDataResultDTO.Topic> getAgencyTopic(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
 
     /**
      * @Description 查询组织下最新转议题话题-机关日统计数据表
      * @author sun
      */
-    AgencyBasicDataResultDTO.Topic getAgencyTopicShiftIssue(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
+    List<AgencyBasicDataResultDTO.Topic> getAgencyTopicShiftIssue(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
 
     /**
      * @Description 热议中话题-机关日统计数据
      * @author sun
      */
-    AgencyBasicDataResultDTO.Topic getAgencyTopicHotDiscuss(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
+    List<AgencyBasicDataResultDTO.Topic> getAgencyTopicHotDiscuss(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
 
     /**
      * @Description 查询组织下最新议题日统计数据
      * @author sun
      */
-    AgencyBasicDataResultDTO getAgencyIssue(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
+    List<AgencyBasicDataResultDTO> getAgencyIssue(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
 
     /**
      * @Description 查询组织下最新项目日统计数据
      * @author sun
      */
-    AgencyBasicDataResultDTO getAgencyProject(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
+    List<AgencyBasicDataResultDTO> getAgencyProject(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
 
     /**
      * @Description 查询当前组织的直属下级组织信息
@@ -242,4 +243,14 @@ public interface DataStatsDao {
      * @author sun
      */
     List<GridGovrnResultDTO> getGridGovern(@Param("gridIds") List<String> gridIds, @Param("dateId") String dateId);
+
+    /**
+     * 根据组织Id查询事件治理指数
+     * @author zhaoqifeng
+     * @date 2021/6/25 15:08
+     * @param agencyIds
+     * @param dateId
+     * @return com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity
+     */
+    List<FactAgencyGovernDailyEntity> getAgencyGovernDaily(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/FactGridMemberStatisticsDailyDao.java

@@ -0,0 +1,55 @@
+/**
+ * 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.datastats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+import com.epmet.dataaggre.entity.datastats.FactGridMemberStatisticsDailyEntity;
+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-07-05
+ */
+@Mapper
+public interface FactGridMemberStatisticsDailyDao extends BaseDao<FactGridMemberStatisticsDailyEntity> {
+
+    /**
+     * @Description 查询网格员统计数据
+     * @return
+     * @author wxz
+     * @date 2021.07.05 13:19
+    */
+    List<GridMemberDataAnalysisResultDTO > listGridMemberDataStats(@Param("gridIds") List<String> gridIds,
+                                                                   @Param("searchedStaffName")  String searchedStaffName,
+                                                                   @Param("month")  String month,
+                                                                   @Param("sort")  String sort);
+
+    /**
+     * @Description 查询网格员议题项目统计数据
+     * @return
+     * @author wxz
+     * @date 2021.07.05 16:17
+    */
+    GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(@Param("staffId") String staffId);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java

@@ -18,8 +18,10 @@
 package com.epmet.dataaggre.dao.epmetuser;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
 import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 政府工作人员表
@@ -29,5 +31,10 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
-	
+
+    /**
+     * @Description 按staffId查询基础信息
+     * @author sun
+     */
+    CustomerStaffDTO selectByMobile(@Param("customerId") String customerId, @Param("mobile") String mobile);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolRecordDao.java

@@ -23,6 +23,7 @@ import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.StaffPatrolRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -41,4 +42,15 @@ public interface StaffPatrolRecordDao extends BaseDao<StaffPatrolRecordEntity> {
      */
     List<StaffListResultDTO> selectPatrolList(StaffListFormDTO formDTO);
 
+    /**
+     * @Description  按条件查询巡查业务数据V2
+     * @author sun
+     */
+    List<StaffListResultDTO> selectStaffPatrolList(StaffListFormDTO formDTO);
+
+    /**
+     * @Description  汇总查询当前工作人员所有巡查记录数据
+     * @author sun
+     */
+    StaffListResultDTO selectPersonalPatrolList(@Param("staffId") String staffId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java

@@ -18,9 +18,14 @@
 package com.epmet.dataaggre.dao.evaluationindex;
 
 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 org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @Author sun
  * @Description  指标统计服务
@@ -34,4 +39,60 @@ public interface EvaluationIndexDao {
      * @author sun
      */
     GovrnRatioResultDTO getAgnecyOrGridGoverRatio(@Param("orgId") String orgId, @Param("orgType") String orgType, @Param("dateId") String dateId);
+
+    /**
+     * @Description 查询areaCode对应的直属下级且不是agencyId对应的客户id的客户组织列表
+     * @author sun
+     */
+    List<String> getAgencyByAreaCodeAgencyId(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode);
+
+    /**
+     * @Description 查询直属下级组织列表，有areaCode的按areaCode查，没有的按agencyId查
+     * @author sun
+     */
+    List<ScreenCustomerAgencyDTO> getSubAgencyList(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode);
+
+    /**
+     * @Description 查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+     * @author sun
+     */
+    List<ScreenCustomerGridDTO> getSubGridList(@Param("agencyId") String agencyId);
+
+    /**
+     * 根据组织Id查询治理指数
+     * @author zhaoqifeng
+     * @date 2021/6/25 16:36
+     * @param agencyIds
+     * @param dateId
+     * @return java.util.List<com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO>
+     */
+    ScreenGovernRankDataDailyDTO getGovernRankList(@Param("agencyIds") List<String> agencyIds, @Param("dateId") String dateId);
+
+    /**
+     * 获取组织信息
+     * @author zhaoqifeng
+     * @date 2021/6/29 13:58
+     * @param agencyId
+     * @return com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO
+     */
+    ScreenCustomerAgencyDTO getAgencyInfo(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 查询agencyId对应组织信息
+     * @author sun
+     */
+    ScreenCustomerAgencyDTO getByAgencyId(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 存在子客户的，查询当前组织的areaCode对应的直属下级且不是agencyId对应的客户id的但是存在父子客户关系的客户组织列表
+     * @author sun
+     */
+    List<String> getAgencyIdsByAgencyId(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode, @Param("list") List<String> list);
+
+    /**
+     * @Description 查询直属下级组织列表，有areaCode的按areaCode查，没有的按agencyId查且是在当前客户和子客户范围内查询
+     * @author sun
+     */
+    List<ScreenCustomerAgencyDTO> getSubAgencyListByAgency(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode, @Param("list") List<String> list);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java

@@ -62,4 +62,10 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Description 查询工作人员所属组织下网格列表
      **/
     List<CustomerGridDTO> gridListByStaffId(@Param("staffId") String staffId);
+
+    /**
+     * @Description  有网格列表的查询网格基本信息，没有的查询工作人员所属组织级下级所有的网格信息
+     * @author sun
+     */
+    List<CustomerGridDTO> getGridInfoList(@Param("gridIds") List<String> gridIds, @Param("staffId") String staffId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dataaggre.dao.govorg;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerStaffAgencyDTO;
 import com.epmet.dataaggre.entity.govorg.CustomerStaffAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -38,4 +39,9 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
      **/
     CustomerStaffAgencyDTO selectByStaffId(@Param("userId") String userId);
 
+    /**
+     * @Description 查询工作人员所属组织信息
+     * @author sun
+     */
+    CustomerAgencyDTO selectAgencyByStaffId(@Param("customerId") String customerId, @Param("staffId") String staffId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercrm/CustomerRelationDao.java

@@ -13,4 +13,13 @@ import java.util.List;
 @Mapper
 public interface CustomerRelationDao {
     List<String> selectUsedAreaCodeList(String areaCode);
+
+    /**
+     * 根据customerId查询其所有下级子客户id
+     * @author zhaoqifeng
+     * @date 2021/6/29 11:04
+     * @param customerId
+     * @return java.util.List<java.lang.String>
+     */
+    List<String> selectAllSubCustomerIds(String customerId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactAgencyGovernDailyEntity.java

@@ -0,0 +1,174 @@
+/**
+ * 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.datastats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 组织的治理指数，按天统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-24
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_agency_govern_daily")
+public class FactAgencyGovernDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 数据更新至：yyyyMMdd; 
+     */
+	private String dateId;
+
+    /**
+     * 组织id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id所属的机关级别（社区级：community，
+乡（镇、街道）级:street,
+区县级: district,
+市级: city
+省级:province）
+     */
+	private String level;
+
+    /**
+     * 组织i所属的组织id
+     */
+	private String pid;
+
+    /**
+     * 组织i所有上级id
+     */
+	private String pids;
+
+    /**
+     * 界面展示：问题解决总数=1+2+3+4+5+6+7+8
+     */
+	private Integer problemResolvedCount;
+
+    /**
+     * 界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数
+     */
+	private BigDecimal groupSelfGovernRatio;
+
+    /**
+     * 界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+     */
+	private BigDecimal gridSelfGovernRatio;
+
+    /**
+     * 界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+     */
+	private BigDecimal communityClosedRatio;
+
+    /**
+     * 界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+     */
+	private BigDecimal streetClosedRatio;
+
+    /**
+     * 界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数
+     */
+	private BigDecimal districtDeptClosedRatio;
+
+    /**
+     * 1、当前组织内，话题关闭已解决数
+     */
+	private Integer topicResolvedCount;
+
+    /**
+     * 2、当前组织内，话题关闭无需解决数
+     */
+	private Integer topicUnResolvedCount;
+
+    /**
+     * 3、当前组织内，议题关闭已解决数
+     */
+	private Integer issueResolvedCount;
+
+    /**
+     * 4、当前组织内，议题关闭无需解决数
+     */
+	private Integer issueUnResolvedCount;
+
+    /**
+     * 5、当前组织内：来源于议题的项目：结案已解决数
+     */
+	private Integer issueProjectResolvedCount;
+
+    /**
+     * 6、当前组织内：来源于议题的项目：结案无需解决数
+     */
+	private Integer issueProjectUnResolvedCount;
+
+    /**
+     * 7、当前组织内：项目立项，结案已解决数；默认为0，
+     */
+	private Integer approvalProjectResolvedCount;
+
+    /**
+     * 8、当前组织内：项目立项，结案无需解决数；默认为0，
+     */
+	private Integer approvalProjectUnResolvedCount;
+
+    /**
+     * 9、当前组织内，未出小组即未转议题的：话题关闭已解决数
+     */
+	private Integer inGroupTopicResolvedCount;
+
+    /**
+     * 10、当前组织内，未出小组即未转议题的：话题关闭无需解决数
+     */
+	private Integer inGroupTopicUnResolvedCount;
+
+    /**
+     * 未出当前网格的，结案项目数
+     */
+	private Integer gridSelfGovernProjectTotal;
+
+    /**
+     * 当前组织内结案的项目中：由社区结案的项目总数
+     */
+	private Integer communityClosedCount;
+
+    /**
+     * 当前组织内结案的项目中：由街道结案的项目总数
+     */
+	private Integer streetClosedCount;
+
+    /**
+     * 当前组织内结案的项目中：由区直部门结案的项目总数
+     */
+	private Integer districtDeptClosedCount;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactGridMemberStatisticsDailyEntity.java

@@ -0,0 +1,131 @@
+/**
+ * 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.datastats;
+
+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-07-05
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_grid_member_statistics_daily")
+public class FactGridMemberStatisticsDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * yyyyMMdd
+     */
+	private String dateId;
+
+    /**
+     * 月份ID
+     */
+	private String monthId;
+
+    /**
+     * 年度ID
+     */
+	private String yearId;
+
+	/**
+	 * 来源类型 external:外部，internal:内部
+	 */
+	private String sourceType;
+
+	/**
+	 * 客户Id
+	 */
+	private String customerId;
+
+	/**
+	 * 数据来源客户Id
+	 */
+	private String sourceCustomerId;
+
+    /**
+     * 组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 网格I
+     */
+	private String gridId;
+
+    /**
+     * 上级ID（项目来源Agency的上级组织Id）
+     */
+	private String pid;
+
+    /**
+     * 所有agencyId的上级组织ID（包含agencyId）
+     */
+	private String pids;
+
+    /**
+     * 工作人员ID
+     */
+	private String staffId;
+
+    /**
+     * 工作人员姓名
+     */
+	private String staffName;
+
+    /**
+     * 项目立项数
+     */
+	private Integer projectCount;
+
+    /**
+     * 议题转项目数
+     */
+	private Integer issueToProjectCount;
+
+    /**
+     * 议题关闭数
+     */
+	private Integer closedIssueCount;
+
+    /**
+     * 项目响应数
+     */
+	private Integer projectResponseCount;
+
+    /**
+     * 项目吹哨数
+     */
+	private Integer projectTransferCount;
+
+    /**
+     * 项目结案数
+     */
+	private Integer projectClosedCount;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleEntity.java

@@ -63,6 +63,11 @@ public class GovStaffRoleEntity extends BaseEpmetEntity {
      */
 	private Integer fullTimeOnly;
 
+	/**
+	 * 角色对应的职责说明
+	 */
+	private String description;
+
     /**
      * 排序
      */

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleTemplateEntity.java

@@ -58,4 +58,14 @@ public class GovStaffRoleTemplateEntity extends BaseEpmetEntity {
      */
 	private Integer fullTimeOnly;
 
+	/**
+	 * 角色对应的职责说明
+	 */
+	private String description;
+
+	/**
+	 * 排序
+	 */
+	private String sort;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/AggreGridService.java

@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.service;
+
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+
+import java.util.List;
+
+/**
+ * @Description 聚合的网格相关service，不指定具体的数据源，它调用其他子service，子service中指定具体数据源
+ * @author wxz
+ * @date 2021.07.05 13:06:35
+*/
+public interface AggreGridService {
+    /**
+     * @Description 网格员数据统计列表查询
+     * @return
+     * @author wxz
+     * @date 2021.07.05 11:17
+     */
+    List<GridMemberDataAnalysisResultDTO> getGridMemberDataAnalysis(List<String> gridIds, String searchedStaffName, String currStaffId, String month, String sort, Integer pageNo, Integer pageSize);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java

@@ -3,9 +3,11 @@ package com.epmet.dataaggre.service.datastats;
 import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
 import com.epmet.dataaggre.dto.datastats.form.*;
 import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 
+import java.security.PrivateKey;
 import java.util.List;
 
 /**
@@ -159,4 +161,25 @@ public interface DataStatsService {
      * @author sun
      */
     GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO);
+
+    /**
+     * @Description 查询网格员统计数据列表
+     * @return
+     * @author wxz
+     * @date 2021.07.05 13:13
+    */
+    List<GridMemberDataAnalysisResultDTO> listGridMemberDataStats(List<String> gridIds,
+                                                                  String searchedStaffName,
+                                                                  String month,
+                                                                  String sort,
+                                                                  Integer pageNo,
+                                                                  Integer pageSize);
+
+    /**
+     * @Description 单个网格员议题项目统计数据
+     * @return
+     * @author wxz
+     * @date 2021.07.05 16:05
+    */
+    GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(String staffId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1,20 +1,30 @@
  package com.epmet.dataaggre.service.datastats.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.constant.OrgConstant;
 import com.epmet.dataaggre.dao.datastats.DataStatsDao;
+import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao;
 import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
 import com.epmet.dataaggre.dto.datastats.form.*;
 import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+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.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.DimGridEntity;
+import com.epmet.dataaggre.entity.datastats.FactGridMemberStatisticsDailyEntity;
+import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
+import com.github.pagehelper.PageHelper;
+import com.epmet.dataaggre.service.opercrm.CustomerRelation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -42,6 +52,11 @@ public class DataStatsServiceImpl implements DataStatsService {
     private DataStatsDao dataStatsDao;
     @Autowired
     private EvaluationIndexService indexService;
+    @Autowired
+    private CustomerRelation customerRelation;
+
+    @Autowired
+    private FactGridMemberStatisticsDailyDao factGridMemberStatisticsDailyDao;
 
 
     /**
@@ -52,6 +67,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     @Override
     public AgencyBasicDataResultDTO agencyBasicData(AgenctBasicDataFormDTO formDTO) {
         AgencyBasicDataResultDTO resultDTO = new AgencyBasicDataResultDTO();
+        List<String> agencyList = new ArrayList<>();
         resultDTO.setAgencyId(formDTO.getAgencyId());
         NumberFormat numberFormat = NumberFormat.getInstance();
         numberFormat.setMaximumFractionDigits(NumConstant.THREE);
@@ -63,78 +79,100 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setDateId(format.format(yesterday));
         }
 
+        //0.根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表
+        agencyList = indexService.getAgencyIdsByAgencyId(formDTO.getAgencyId());
+        agencyList.add(formDTO.getAgencyId());
+
         //1.查询组织下注册用户最新日统计数据【只查询注册用户的统计数据，不涉及参与用户的】
-        AgencyBasicDataResultDTO user = dataStatsDao.getAgnecyRegUser(formDTO.getAgencyId(), formDTO.getDateId());
-        if (null != user) {
-            resultDTO.setUserTotal(user.getUserTotal());
-            resultDTO.setResiTotal(user.getResiTotal());
-            resultDTO.setResiRatio(user.getResiTotal() == 0 || user.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) user.getResiTotal() / (float) user.getUserTotal())));
-            resultDTO.setPartyMemberTotal(user.getPartyMemberTotal());
-            resultDTO.setPartyMemberRatio(user.getPartyMemberTotal() == 0 || user.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) user.getPartyMemberTotal() / (float) user.getUserTotal())));
-        }
+        List<AgencyBasicDataResultDTO> userList = dataStatsDao.getAgnecyRegUser(agencyList, formDTO.getDateId());
+        int userTotal = 0;
+        int resiTotal = 0;
+        int partyMemberTotal = 0;
+        for (AgencyBasicDataResultDTO u : userList){
+            userTotal+=u.getUserTotal();
+            resiTotal+=u.getResiTotal();
+            partyMemberTotal+=u.getPartyMemberTotal();
+        }
+        resultDTO.setUserTotal(userTotal);
+        resultDTO.setResiTotal(resiTotal);
+        resultDTO.setResiRatio(resultDTO.getResiTotal() == 0 || resultDTO.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getResiTotal() / (float) resultDTO.getUserTotal())));
+        resultDTO.setPartyMemberTotal(partyMemberTotal);
+        resultDTO.setPartyMemberRatio(resultDTO.getPartyMemberTotal() == 0 || resultDTO.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getPartyMemberTotal() / (float) resultDTO.getUserTotal())));
 
         //2.查询组织下最新群组日统计数据
-        AgencyBasicDataResultDTO group = dataStatsDao.getAgnecyGroup(formDTO.getAgencyId(), formDTO.getDateId());
-        if (null != group) {
-            resultDTO.setGroupTotal(group.getGroupTotal());
-            resultDTO.setOrdinaryTotal(group.getOrdinaryTotal());
-            resultDTO.setOrdinaryRatio(group.getOrdinaryTotal() == 0 || group.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) group.getOrdinaryTotal() / (float) group.getGroupTotal())));
-            resultDTO.setBranchTotal(group.getBranchTotal());
-            resultDTO.setBranchRatio(group.getBranchTotal() == 0 || group.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) group.getBranchTotal() / (float) group.getGroupTotal())));
-        }
+        List<AgencyBasicDataResultDTO> groupList = dataStatsDao.getAgnecyGroup(agencyList, formDTO.getDateId());
+        int groupTotal = 0;
+        int ordinaryTotal = 0;
+        int branchTotal = 0;
+        for (AgencyBasicDataResultDTO g : groupList){
+            groupTotal+=g.getGroupTotal();
+            ordinaryTotal+=g.getOrdinaryTotal();
+            branchTotal+=g.getBranchTotal();
+        }
+        resultDTO.setGroupTotal(groupTotal);
+        resultDTO.setOrdinaryTotal(ordinaryTotal);
+        resultDTO.setOrdinaryRatio(resultDTO.getOrdinaryTotal() == 0 || resultDTO.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getOrdinaryTotal() / (float) resultDTO.getGroupTotal())));
+        resultDTO.setBranchTotal(branchTotal);
+        resultDTO.setBranchRatio(resultDTO.getBranchTotal() == 0 || resultDTO.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getBranchTotal() / (float) resultDTO.getGroupTotal())));
 
         //3.查询组织下最新话题日统计数据
         //状态话题-机关日统计数据表最新日期三种状态数据
         //机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念
-        List<AgencyBasicDataResultDTO.Topic> topic = dataStatsDao.getAgencyTopic(formDTO.getAgencyId(), formDTO.getDateId());
+        List<AgencyBasicDataResultDTO.Topic> topic = dataStatsDao.getAgencyTopic(agencyList, formDTO.getDateId());
         //转议题话题-机关日统计数据表
-        AgencyBasicDataResultDTO.Topic topicSHiftIssue = dataStatsDao.getAgencyTopicShiftIssue(formDTO.getAgencyId(), formDTO.getDateId());
+        List<AgencyBasicDataResultDTO.Topic> topicSHiftIssue = dataStatsDao.getAgencyTopicShiftIssue(agencyList, formDTO.getDateId());
         //热议中话题-机关日统计数据
-        AgencyBasicDataResultDTO.Topic hotdiscuss = dataStatsDao.getAgencyTopicHotDiscuss(formDTO.getAgencyId(), formDTO.getDateId());
-        AtomicReference<Integer> closedTotal = new AtomicReference<>(0);
-        if (topic.size() > NumConstant.ZERO) {
-            resultDTO.setTopicTotal(topic.stream().collect(Collectors.summingInt(AgencyBasicDataResultDTO.Topic::getTopicCount)));
-            topic.forEach(t -> {
-                if (t.getTopicStatus().equals("closed")) {
-                    closedTotal.set(t.getTopicCount());
-                }
-            });
-        }
+        List<AgencyBasicDataResultDTO.Topic> hotdiscuss = dataStatsDao.getAgencyTopicHotDiscuss(agencyList, formDTO.getDateId());
+        //话题总数
+        resultDTO.setTopicTotal(topic.stream().collect(Collectors.summingInt(AgencyBasicDataResultDTO.Topic::getTopicCount)));
+        int closedTotal = topic.stream().filter(t -> t.getTopicStatus().equals("closed")).mapToInt(AgencyBasicDataResultDTO.Topic::getTopicCount).sum();
         //转议题
-        if (null != topicSHiftIssue) {
-            resultDTO.setShiftIssueTotal(topicSHiftIssue.getShiftedIssueTotal());
-            resultDTO.setShiftIssueRatio(resultDTO.getShiftIssueTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftIssueTotal() / (float) resultDTO.getTopicTotal())));
-        }
+        int shiftIssueTotal = topicSHiftIssue.stream().mapToInt(AgencyBasicDataResultDTO.Topic::getShiftedIssueTotal).sum();
+        resultDTO.setShiftIssueTotal(shiftIssueTotal);
+        resultDTO.setShiftIssueRatio(resultDTO.getShiftIssueTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftIssueTotal() / (float) resultDTO.getTopicTotal())));
         //热议中
-        if (null != hotdiscuss) {
-            resultDTO.setDiscussingTotal(hotdiscuss.getTopicCount());
-            resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
-        }
+        int discussingTotal = hotdiscuss.stream().mapToInt(AgencyBasicDataResultDTO.Topic::getTopicCount).sum();
+        resultDTO.setDiscussingTotal(discussingTotal);
+        resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
         //已处理
-        resultDTO.setClosedTopicTotal(closedTotal.get());
+        resultDTO.setClosedTopicTotal(closedTotal);
         resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
 
         //4.查询组织下最新议题日统计数据
-        AgencyBasicDataResultDTO issue = dataStatsDao.getAgencyIssue(formDTO.getAgencyId(), formDTO.getDateId());
-        if (null != issue) {
-            resultDTO.setIssueTotal(issue.getIssueTotal());
-            resultDTO.setVotingTotal(issue.getVotingTotal());
-            resultDTO.setVotingRatio(resultDTO.getVotingTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getVotingTotal() / (float) resultDTO.getIssueTotal())));
-            resultDTO.setClosedIssueTotal(issue.getClosedIssueTotal());
-            resultDTO.setClosedIssueRatio(resultDTO.getClosedIssueTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedIssueTotal() / (float) resultDTO.getIssueTotal())));
-            resultDTO.setShiftProjectTotal(issue.getShiftProjectTotal());
-            resultDTO.setShiftProjectRatio(resultDTO.getShiftProjectTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftProjectTotal() / (float) resultDTO.getIssueTotal())));
-        }
+        List<AgencyBasicDataResultDTO> issueList = dataStatsDao.getAgencyIssue(agencyList, formDTO.getDateId());
+        int issueTotal = 0;
+        int votingTotal = 0;
+        int closedIssueTotal = 0;
+        int shiftProjectTotal = 0;
+        for (AgencyBasicDataResultDTO i : issueList){
+            issueTotal+=i.getIssueTotal();
+            votingTotal+=i.getVotingTotal();
+            closedIssueTotal+=i.getClosedIssueTotal();
+            shiftProjectTotal+=i.getShiftProjectTotal();
+        }
+        resultDTO.setIssueTotal(issueTotal);
+        resultDTO.setVotingTotal(votingTotal);
+        resultDTO.setVotingRatio(resultDTO.getVotingTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getVotingTotal() / (float) resultDTO.getIssueTotal())));
+        resultDTO.setClosedIssueTotal(closedIssueTotal);
+        resultDTO.setClosedIssueRatio(resultDTO.getClosedIssueTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedIssueTotal() / (float) resultDTO.getIssueTotal())));
+        resultDTO.setShiftProjectTotal(shiftProjectTotal);
+        resultDTO.setShiftProjectRatio(resultDTO.getShiftProjectTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftProjectTotal() / (float) resultDTO.getIssueTotal())));
 
         //5.查询组织下最新项目日统计数据
-        AgencyBasicDataResultDTO project = dataStatsDao.getAgencyProject(formDTO.getAgencyId(), formDTO.getDateId());
-        if (null != project) {
-            resultDTO.setProjectTotal(project.getProjectTotal());
-            resultDTO.setPendingTotal(project.getPendingTotal());
-            resultDTO.setPendingRatio(resultDTO.getPendingTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getPendingTotal() / (float) resultDTO.getProjectTotal())));
-            resultDTO.setClosedProjectTotal(project.getClosedProjectTotal());
-            resultDTO.setClosedProjectRatio(resultDTO.getClosedProjectTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedProjectTotal() / (float) resultDTO.getProjectTotal())));
-        }
+        List<AgencyBasicDataResultDTO> projectList = dataStatsDao.getAgencyProject(agencyList, formDTO.getDateId());
+        int projectTotal = 0;
+        int pendingTotal = 0;
+        int closedProjectTotal = 0;
+        for (AgencyBasicDataResultDTO p : projectList){
+            projectTotal+=p.getProjectTotal();
+            pendingTotal+=p.getPendingTotal();
+            closedProjectTotal+=p.getClosedProjectTotal();
+        }
+        resultDTO.setProjectTotal(projectTotal);
+        resultDTO.setPendingTotal(pendingTotal);
+        resultDTO.setPendingRatio(resultDTO.getPendingTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getPendingTotal() / (float) resultDTO.getProjectTotal())));
+        resultDTO.setClosedProjectTotal(closedProjectTotal);
+        resultDTO.setClosedProjectRatio(resultDTO.getClosedProjectTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedProjectTotal() / (float) resultDTO.getProjectTotal())));
 
         return resultDTO;
     }
@@ -258,23 +296,25 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setType("user");
         }
 
-        //1.查询当前组织的直属下级组织信息【机关维度】
-        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        //1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+        List<ScreenCustomerAgencyDTO> subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
         if (subAgencyList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+        List<String> agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
 
         //2.查询直属下级组织注册用户日统计数据，默认按用户总数降序
         List<SubAgencyUserResultDTO> list = dataStatsDao.getSubAgencyUser(agencyIds, formDTO.getDateId());
 
         //3.封装数据
-        for (DimAgencyEntity sub : subAgencyList) {
+        for (ScreenCustomerAgencyDTO sub : subAgencyList) {
             SubAgencyUserResultDTO dto = new SubAgencyUserResultDTO();
-            dto.setAgencyId(sub.getId());
+            dto.setAgencyId(sub.getAgencyId());
             dto.setAgencyName(sub.getAgencyName());
+            dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+            dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
             for (SubAgencyUserResultDTO u : list) {
-                if (sub.getId().equals(u.getAgencyId())) {
+                if (sub.getAgencyId().equals(u.getAgencyId())) {
                     dto.setUserTotal(u.getUserTotal());
                     dto.setPartyMemberTotal(u.getPartyMemberTotal());
                     dto.setResiTotal(u.getResiTotal());
@@ -327,23 +367,23 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setType("user");
         }
 
-        //1.查询组织直属网格列表【网格维度】
-        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        //1.查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+        List<ScreenCustomerGridDTO> gridList = indexService.getSubGridList(formDTO.getAgencyId());
         if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+        List<String> gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
 
         //2.查询网格层级注册用户日统计数据，默认按用户总数降序
         List<SubGridUserResultDTO> list = dataStatsDao.getSubGridUser(gridIds, formDTO.getDateId());
 
         //3.封装数据
-        for (DimGridEntity gr : gridList) {
+        for (ScreenCustomerGridDTO gr : gridList) {
             SubGridUserResultDTO dto = new SubGridUserResultDTO();
-            dto.setGridId(gr.getId());
+            dto.setGridId(gr.getGridId());
             dto.setGridName(gr.getGridName());
             for (SubGridUserResultDTO re : list) {
-                if (gr.getId().equals(re.getGridId())) {
+                if (gr.getGridId().equals(re.getGridId())) {
                     dto.setUserTotal(re.getUserTotal());
                     dto.setPartyMemberTotal(re.getPartyMemberTotal());
                     dto.setResiTotal(re.getResiTotal());
@@ -394,23 +434,25 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setType("group");
         }
 
-        //1.查询当前组织的直属下级组织信息【机关维度】
-        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        //1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+        List<ScreenCustomerAgencyDTO> subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
         if (subAgencyList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+        List<String> agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
 
         //2.查询直属下级组织小组日统计数据，默认按群组总数降序
         List<SubAgencyGroupResultDTO> list = dataStatsDao.getSubAgencyGroup(agencyIds, formDTO.getDateId());
 
         //3.封装数据
-        for (DimAgencyEntity sub : subAgencyList) {
+        for (ScreenCustomerAgencyDTO sub : subAgencyList) {
             SubAgencyGroupResultDTO dto = new SubAgencyGroupResultDTO();
-            dto.setAgencyId(sub.getId());
+            dto.setAgencyId(sub.getAgencyId());
             dto.setAgencyName(sub.getAgencyName());
+            dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+            dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
             for (SubAgencyGroupResultDTO u : list) {
-                if (sub.getId().equals(u.getAgencyId())) {
+                if (sub.getAgencyId().equals(u.getAgencyId())) {
                     dto.setGroupTotal(u.getGroupTotal());
                     dto.setOrdinaryTotal(u.getOrdinaryTotal());
                     dto.setBranchTotal(u.getBranchTotal());
@@ -460,23 +502,23 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setType("group");
         }
 
-        //1.查询组织直属网格列表【网格维度】
-        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        //1.查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+        List<ScreenCustomerGridDTO> gridList = indexService.getSubGridList(formDTO.getAgencyId());
         if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+        List<String> gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
 
         //2.查询网格层级小组日统计数据，默认按群组总数降序
         List<SubGridGroupResultDTO> list = dataStatsDao.getSubGridGroup(gridIds, formDTO.getDateId());
 
         //3.封装数据并返回
-        for (DimGridEntity gr : gridList) {
+        for (ScreenCustomerGridDTO gr : gridList) {
             SubGridGroupResultDTO dto = new SubGridGroupResultDTO();
-            dto.setGridId(gr.getId());
+            dto.setGridId(gr.getGridId());
             dto.setGridName(gr.getGridName());
             for (SubGridGroupResultDTO re : list) {
-                if (gr.getId().equals(re.getGridId())) {
+                if (gr.getGridId().equals(re.getGridId())) {
                     dto.setGroupTotal(re.getGroupTotal());
                     dto.setOrdinaryTotal(re.getOrdinaryTotal());
                     dto.setBranchTotal(re.getBranchTotal());
@@ -527,12 +569,12 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setType("topic");
         }
 
-        //1.查询当前组织的直属下级组织信息【机关维度】
-        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        //1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+        List<ScreenCustomerAgencyDTO> subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
         if (subAgencyList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+        List<String> agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
 
         //2.查询直属下级组织状态话题-日统计数据
         //机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念
@@ -548,7 +590,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             AtomicInteger shiftIssueTotal = new AtomicInteger(0);
             AtomicInteger hotdiscussTotal = new AtomicInteger(0);
             topic.forEach(t -> {
-                if (t.getAgencyId().equals(sub.getId())) {
+                if (t.getAgencyId().equals(sub.getAgencyId())) {
                     topicTotal.addAndGet(t.getTopicCount());
                     if (t.getTopicStatus().equals("closed")) {
                         closedTotal.set(t.getTopicCount());
@@ -556,18 +598,20 @@ public class DataStatsServiceImpl implements DataStatsService {
                 }
             });
             topicShiftIssue.forEach(t -> {
-                if (t.getAgencyId().equals(sub.getId())) {
+                if (t.getAgencyId().equals(sub.getAgencyId())) {
                     shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
                 }
             });
             hotdiscuss.forEach(t -> {
-                if (t.getAgencyId().equals(sub.getId())) {
+                if (t.getAgencyId().equals(sub.getAgencyId())) {
                     hotdiscussTotal.addAndGet(t.getTopicCount());
                 }
             });
 
-            resultDTO.setAgencyId(sub.getId());
+            resultDTO.setAgencyId(sub.getAgencyId());
             resultDTO.setAgencyName(sub.getAgencyName());
+            resultDTO.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+            resultDTO.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
             resultDTO.setTopicTotal(topicTotal.get());
             resultDTO.setDiscussingTotal(hotdiscussTotal.get());
             resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
@@ -621,12 +665,12 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setType("topic");
         }
 
-        //1.查询组织直属网格列表【网格维度】
-        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        //1.查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+        List<ScreenCustomerGridDTO> gridList = indexService.getSubGridList(formDTO.getAgencyId());
         if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+        List<String> gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
 
         //2.查询网格层级话题数据
         //查询网格层级状态话题-日统计数据  机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念，热议中=总量-关闭数-屏蔽数-转议题数
@@ -642,7 +686,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             AtomicInteger shiftIssueTotal = new AtomicInteger(0);
             AtomicInteger hotdiscussTotal = new AtomicInteger(0);
             topic.forEach(t -> {
-                if (t.getGridId().equals(gr.getId())) {
+                if (t.getGridId().equals(gr.getGridId())) {
                     topicTotal.addAndGet(t.getTopicCount());
                     if (t.getTopicStatus().equals("closed")) {
                         closedTotal.set(t.getTopicCount());
@@ -650,17 +694,17 @@ public class DataStatsServiceImpl implements DataStatsService {
                 }
             });
             topicShiftIssue.forEach(t -> {
-                if (t.getGridId().equals(gr.getId())) {
+                if (t.getGridId().equals(gr.getGridId())) {
                     shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
                 }
             });
             hotdiscuss.forEach(t -> {
-                if (t.getGridId().equals(gr.getId())) {
+                if (t.getGridId().equals(gr.getGridId())) {
                     hotdiscussTotal.addAndGet(t.getTopicCount());
                 }
             });
 
-            resultDTO.setGridId(gr.getId());
+            resultDTO.setGridId(gr.getGridId());
             resultDTO.setGridName(gr.getGridName());
             resultDTO.setTopicTotal(topicTotal.get());
             resultDTO.setDiscussingTotal(hotdiscussTotal.get());
@@ -714,23 +758,25 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setType("issue");
         }
 
-        //1.查询当前组织的直属下级组织信息【机关维度】
-        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        //1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+        List<ScreenCustomerAgencyDTO> subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
         if (subAgencyList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+        List<String> agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
 
         //2.查询直属下级组织议题日统计数据，默认按议题总数降序
         List<SubAgencyIssueResultDTO> list = dataStatsDao.getSubAgencyIssue(agencyIds, formDTO.getDateId());
 
         //3.封装数据
-        for (DimAgencyEntity sub : subAgencyList) {
+        for (ScreenCustomerAgencyDTO sub : subAgencyList) {
             SubAgencyIssueResultDTO dto = new SubAgencyIssueResultDTO();
-            dto.setAgencyId(sub.getId());
+            dto.setAgencyId(sub.getAgencyId());
             dto.setAgencyName(sub.getAgencyName());
+            dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+            dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
             for (SubAgencyIssueResultDTO u : list) {
-                if (sub.getId().equals(u.getAgencyId())) {
+                if (sub.getAgencyId().equals(u.getAgencyId())) {
                     dto.setIssueTotal(u.getIssueTotal());
                     dto.setVotingTotal(u.getVotingTotal());
                     dto.setClosedIssueTotal(u.getClosedIssueTotal());
@@ -784,23 +830,23 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setType("issue");
         }
 
-        //1.查询组织直属网格列表【网格维度】
-        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        //1.查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+        List<ScreenCustomerGridDTO> gridList = indexService.getSubGridList(formDTO.getAgencyId());
         if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+        List<String> gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
 
         //2.查询网格层级议题日统计数据，默认按议题总数降序
         List<SubGridIssueResultDTO> list = dataStatsDao.getSubGridIssue(gridIds, formDTO.getDateId());
 
         //3.封装数据
-        for (DimGridEntity gr : gridList) {
+        for (ScreenCustomerGridDTO gr : gridList) {
             SubGridIssueResultDTO dto = new SubGridIssueResultDTO();
-            dto.setGridId(gr.getId());
+            dto.setGridId(gr.getGridId());
             dto.setGridName(gr.getGridName());
             for (SubGridIssueResultDTO re : list) {
-                if (gr.getId().equals(re.getGridId())) {
+                if (gr.getGridId().equals(re.getGridId())) {
                     dto.setIssueTotal(re.getIssueTotal());
                     dto.setVotingTotal(re.getVotingTotal());
                     dto.setClosedIssueTotal(re.getClosedIssueTotal());
@@ -854,23 +900,25 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setType("project");
         }
 
-        //1.查询当前组织的直属下级组织信息【机关维度】
-        List<DimAgencyEntity> subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+        //1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+        List<ScreenCustomerAgencyDTO> subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
         if (subAgencyList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+        List<String> agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
 
         //2.查询直属下级组织项目日统计数据，默认按项目总数降序
         List<SubAgencyProjectResultDTO> list = dataStatsDao.getSubAgencyProject(agencyIds, formDTO.getDateId());
 
         //3.封装数据
-        for (DimAgencyEntity sub : subAgencyList) {
+        for (ScreenCustomerAgencyDTO sub : subAgencyList) {
             SubAgencyProjectResultDTO dto = new SubAgencyProjectResultDTO();
-            dto.setAgencyId(sub.getId());
+            dto.setAgencyId(sub.getAgencyId());
             dto.setAgencyName(sub.getAgencyName());
+            dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+            dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
             for (SubAgencyProjectResultDTO u : list) {
-                if (sub.getId().equals(u.getAgencyId())) {
+                if (sub.getAgencyId().equals(u.getAgencyId())) {
                     dto.setProjectTotal(u.getProjectTotal());
                     dto.setPendingTotal(u.getPendingTotal());
                     dto.setClosedProjectTotal(u.getClosedProjectTotal());
@@ -920,23 +968,23 @@ public class DataStatsServiceImpl implements DataStatsService {
             formDTO.setType("project");
         }
 
-        //1.查询组织直属网格列表【网格维度】
-        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        //1.查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+        List<ScreenCustomerGridDTO> gridList = indexService.getSubGridList(formDTO.getAgencyId());
         if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+        List<String> gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
 
         //2.查询网格层级项目日统计数据，默认按项目总数降序
         List<SubGridProjectResultDTO> list = dataStatsDao.getSubGridProject(gridIds, formDTO.getDateId());
 
         //3.封装数据
-        for (DimGridEntity gr : gridList) {
+        for (ScreenCustomerGridDTO gr : gridList) {
             SubGridProjectResultDTO dto = new SubGridProjectResultDTO();
-            dto.setGridId(gr.getId());
+            dto.setGridId(gr.getGridId());
             dto.setGridName(gr.getGridName());
             for (SubGridProjectResultDTO re : list) {
-                if (gr.getId().equals(re.getGridId())) {
+                if (gr.getGridId().equals(re.getGridId())) {
                     dto.setProjectTotal(re.getProjectTotal());
                     dto.setPendingTotal(re.getPendingTotal());
                     dto.setClosedProjectTotal(re.getClosedProjectTotal());
@@ -1078,6 +1126,7 @@ public class DataStatsServiceImpl implements DataStatsService {
     public AgencyGovrnResultDTO agencyGovrn(AgencyGovrnFormDTO formDTO) {
         AgencyGovrnResultDTO resultDTO = new AgencyGovrnResultDTO();
         resultDTO.setAgencyId(formDTO.getAgencyId());
+        resultDTO.setLevel(formDTO.getLevel());
         NumberFormat numberFormat = NumberFormat.getInstance();
         numberFormat.setMaximumFractionDigits(NumConstant.THREE);
 
@@ -1087,6 +1136,42 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getAgencyId());
+        if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) {
+            if (OrgConstant.PROVINCE.equals(agencyDTO.getLevel()) || OrgConstant.CITY.equals(agencyDTO.getLevel()) || OrgConstant.DISTRICT.equals(agencyDTO.getLevel())) {
+                List<String> subAgencyIds = indexService.getAgencyByAreaCodeAgencyId(formDTO.getAgencyId(), agencyDTO.getAreaCode());
+                if (CollectionUtils.isEmpty(subAgencyIds)) {
+                    subAgencyIds = new ArrayList<>();
+                }
+                subAgencyIds.add(formDTO.getAgencyId());
+                List<FactAgencyGovernDailyEntity> list =  dataStatsDao.getAgencyGovernDaily(subAgencyIds, formDTO.getDateId());
+                if (CollectionUtils.isNotEmpty(list)) {
+                    //问题解决总数
+                    Integer problemResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getProblemResolvedCount).sum();
+                    //未出小组即未转议题的：话题关闭已解决数
+                    Integer inGroupTopicResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getInGroupTopicResolvedCount).sum();
+                    //未出小组即未转议题的：话题关闭无需解决数
+                    Integer inGroupTopicUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getInGroupTopicUnResolvedCount).sum();
+                    //未出当前网格的，结案项目数
+                    Integer gridSelfGovernProjectTotal = list.stream().mapToInt(FactAgencyGovernDailyEntity::getGridSelfGovernProjectTotal).sum();
+                    //由社区结案的项目总数
+                    Integer communityClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getCommunityClosedCount).sum();
+                    //由街道结案的项目总数
+                    Integer streetClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getStreetClosedCount).sum();
+                    //由区直部门结案的项目总数
+                    Integer districtDeptClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getDistrictDeptClosedCount).sum();
+
+                    resultDTO.setProblemResolvedCount(problemResolvedCount);
+                    resultDTO.setGroupSelfGovernRatio(getPercentage(inGroupTopicResolvedCount + inGroupTopicUnResolvedCount, problemResolvedCount));
+                    resultDTO.setGridSelfGovernRatio(getPercentage(gridSelfGovernProjectTotal, problemResolvedCount));
+                    resultDTO.setCommunityResolvedRatio(getPercentage(communityClosedCount, problemResolvedCount));
+                    resultDTO.setStreetResolvedRatio(getPercentage(streetClosedCount, problemResolvedCount));
+                    resultDTO.setDistrictDeptResolvedRatio(getPercentage(districtDeptClosedCount, problemResolvedCount));
+
+                    return resultDTO;
+                }
+            }
+        }
         //1.按日期查询当前组织事件治理指数
         List<String> agencyIds = new ArrayList<>();
         agencyIds.add(formDTO.getAgencyId());
@@ -1125,6 +1210,18 @@ public class DataStatsServiceImpl implements DataStatsService {
             return resultList;
         }
         List<String> agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+        ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getAgencyId());
+        if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) {
+            List<ScreenCustomerAgencyDTO> subAgencies = indexService.getSubAgencyList(formDTO.getAgencyId(), agencyDTO.getAreaCode());
+            agencyIds = subAgencies.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
+            subAgencyList = subAgencies.stream().map(item -> {
+                DimAgencyEntity entity = new DimAgencyEntity();
+                entity.setId(item.getAgencyId());
+                entity.setAgencyName(item.getAgencyName());
+                entity.setLevel(item.getLevel());
+                return entity;
+            }).collect(Collectors.toList());
+        }
 
         //2.按日期查询所有下级组织的事件治理指数
         List<AgencyGovrnResultDTO> list = dataStatsDao.getAgencyGovern(agencyIds, formDTO.getDateId());
@@ -1223,22 +1320,22 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
 
         //1.查询组织直属网格列表【网格维度】
-        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        List<ScreenCustomerGridDTO> gridList = indexService.getSubGridList(formDTO.getAgencyId());
         if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+        List<String> gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
 
         //2.按日期查找组织直属网格事件治理指数列表
         List<GridGovrnResultDTO> list = dataStatsDao.getGridGovern(gridIds, formDTO.getDateId());
 
         //3.封装数据
-        for (DimGridEntity gr : gridList) {
+        for (ScreenCustomerGridDTO gr : gridList) {
             GridGovrnResultDTO dto = new GridGovrnResultDTO();
-            dto.setGridId(gr.getId());
+            dto.setGridId(gr.getGridId());
             dto.setGridName(gr.getGridName());
             for (GridGovrnResultDTO re : list) {
-                if (gr.getId().equals(re.getGridId())) {
+                if (gr.getGridId().equals(re.getGridId())) {
                     dto.setProblemResolvedCount(re.getProblemResolvedCount());
                     dto.setGroupSelfGovernRatio(re.getGroupSelfGovernRatio());
                     dto.setGridSelfGovernRatio(re.getGridSelfGovernRatio());
@@ -1290,6 +1387,19 @@ public class DataStatsServiceImpl implements DataStatsService {
             SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
             formDTO.setDateId(format.format(yesterday));
         }
+        if (OrgConstant.AGENCY.equals(formDTO.getOrgType())) {
+            ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getOrgId());
+            if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) {
+                if (OrgConstant.PROVINCE.equals(agencyDTO.getLevel()) || OrgConstant.CITY.equals(agencyDTO.getLevel()) || OrgConstant.DISTRICT.equals(agencyDTO.getLevel())) {
+                    ScreenGovernRankDataDailyDTO governData = indexService.getGovernRank(formDTO.getOrgId(), agencyDTO.getAreaCode(), formDTO.getDateId());
+                    resultDTO.setGovernRatio(getPercentage(governData.getGovernCount(), governData.getClosedCount()));
+                    resultDTO.setResolvedRatio(getPercentage(governData.getResolvedCount(), governData.getClosedCount()));
+                    resultDTO.setResponseRatio(getPercentage(governData.getResponseCount(), governData.getTransferCount()));
+                    resultDTO.setSatisfactionRatio(getPercentage(governData.getSatisfactionCount(), governData.getClosedProjectCount()));
+                    return resultDTO;
+                }
+            }
+        }
 
         //1.按类型、日期查询治理指数下响应解决满意自治四个统计率
         GovrnRatioResultDTO dto = indexService.governRatio(formDTO);
@@ -1302,4 +1412,31 @@ public class DataStatsServiceImpl implements DataStatsService {
         return resultDTO;
     }
 
+    @Override
+    public List<GridMemberDataAnalysisResultDTO> listGridMemberDataStats(List<String> gridIds,
+                                                                         String searchedStaffName,
+                                                                         String month,
+                                                                         String sort,
+                                                                         Integer pageNo,
+                                                                         Integer pageSize) {
+
+        PageHelper.startPage(pageNo, pageSize);
+        return factGridMemberStatisticsDailyDao.listGridMemberDataStats(gridIds, searchedStaffName, month, sort);
+    }
+
+    @Override
+    public GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(String staffId) {
+        return factGridMemberStatisticsDailyDao.getGridMemberIssueProjectStats( staffId);
+    }
+    private String getPercentage(Integer countInt, Integer totalInt) {
+        if (NumConstant.ZERO == totalInt) {
+            return "0%";
+        }
+        BigDecimal count = new BigDecimal(countInt);
+        BigDecimal total = new BigDecimal(totalInt);
+        BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED);
+        BigDecimal ratio = count.multiply(hundred).divide(total, NumConstant.ONE, RoundingMode.HALF_UP);
+        return  ratio.toString().concat("%");
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@@ -1,12 +1,10 @@
 package com.epmet.dataaggre.service.epmetuser;
 
+import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.PatrolDateListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.PatrolRecordListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.*;
 import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
 
 import java.util.List;
@@ -64,4 +62,23 @@ public interface EpmetUserService {
      */
     List<GridStaffResultDTO> staffGridRole(List<GridStaffResultDTO> forms, String staffName);
 
+    /**
+     * @Param formDTO
+     * @Description 【更多-巡查记录-人员巡查记录列表】
+     * @author sun
+     */
+    List<StaffListResultDTO> staffPatrolList(StaffListFormDTO formDTO);
+
+    /**
+     * @Description 个人中心-网格员巡查记录
+     * @author sun
+     */
+    List<PersonalPatrolListResultDTO> personalPatrolList(String staffId);
+    /**
+     * @Param formDTO
+     * @Description 对外接口--查询工作人员基本信息
+     * @author sun
+     */
+    OpenStaffDetailResultDTO openStaffDetail(OpenStaffDetailFormDTO formDTO);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -4,15 +4,19 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.epmetuser.CustomerStaffDao;
 import com.epmet.dataaggre.dao.epmetuser.StaffPatrolRecordDao;
 import com.epmet.dataaggre.dao.epmetuser.StaffRoleDao;
 import com.epmet.dataaggre.dao.epmetuser.UserBaseInfoDao;
+import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
 import com.epmet.dataaggre.dto.epmetuser.StaffPatrolDetailDTO;
 import com.epmet.dataaggre.dto.epmetuser.StaffPatrolRecordDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.*;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
@@ -25,6 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.NumberFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -49,6 +55,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     private StaffPatrolRecordService staffPatrolRecordService;
     @Resource
     private StaffRoleDao staffRoleDao;
+    @Resource
+    private CustomerStaffDao customerStaffDao;
 
     /**
      * @Description  根据UserIds查询
@@ -247,5 +255,115 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         return result;
     }
 
+    /**
+     * @Param formDTO
+     * @Description 【更多-巡查记录-人员巡查记录列表】
+     * @author sun
+     */
+    @Override
+    public List<StaffListResultDTO> staffPatrolList(StaffListFormDTO formDTO) {
+        List<StaffListResultDTO> resultList = new ArrayList<>();
+        //1.查询网格信息供后续封装数据使用
+        List<CustomerGridDTO> list = govOrgService.getGridInfoList(formDTO.getGridIds(), formDTO.getUserId());
+        if (CollectionUtils.isEmpty(formDTO.getGridIds())) {
+            formDTO.setGridIds(list.stream().map(CustomerGridDTO::getId).collect(Collectors.toList()));
+        }
+
+        //2.按条件分页查询业务数据
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        //起始查询日期
+        formDTO.setPatrolStartTime(DateUtils.getBeforeMonthDate(formDTO.getTime(), "yyyyMMdd"));
+        resultList = staffPatrolRecordDao.selectStaffPatrolList(formDTO);
+
+        //3.封装数据并返回
+        resultList.forEach(re -> list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName())));
+        //NumberFormat numberFormat = NumberFormat.getInstance();
+        //numberFormat.setMaximumFractionDigits(NumConstant.ZERO);
+        resultList.forEach(re -> {
+            String totalTime = "0分钟";
+            if (re.getTimeNum() > NumConstant.ZERO) {
+                int num = re.getTimeNum() / 60;
+                int hour = num / 60;
+                int minute = num % 60;
+                totalTime = (hour < 1 ? "" : hour + "小时") + (minute < 1 ? "" : minute + "分钟");
+            }
+            re.setTotalTime(totalTime == "" ? "0分钟" : totalTime);
+            //re.setTotalTime(re.getTimeNum() < 1 ? BigDecimal.ZERO + "h" : new BigDecimal(numberFormat.format((float) re.getTimeNum() / (float) 3600)) + "h");
+            //re.setTotalTime(re.getTimeNum() / 60 + "分钟");
+            list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName()));
+        });
+
+        return resultList;
+    }
+
+    /**
+     * @Description 个人中心-网格员巡查记录
+     * @author sun
+     */
+    @Override
+    public List<PersonalPatrolListResultDTO> personalPatrolList(String staffId) {
+        LinkedList<PersonalPatrolListResultDTO> resultList = new LinkedList<>();
+        //1.汇总查询当前工作人员所有巡查记录数据
+        StaffListResultDTO resultDTO = staffPatrolRecordDao.selectPersonalPatrolList(staffId);
+        if (null == resultDTO) {
+            return resultList;
+        }
+        //2.封装数据并返回
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(NumConstant.ZERO);
+        PersonalPatrolListResultDTO personal1 = new PersonalPatrolListResultDTO();
+        personal1.setKey("总次数");
+        personal1.setValue(resultDTO.getPatrolTotal().toString());
+        resultList.add(personal1);
+        PersonalPatrolListResultDTO personal2 = new PersonalPatrolListResultDTO();
+        personal2.setKey("总时长");
+        //personal2.setValue(resultDTO.getTimeNum() / 60 + "分钟");
+        String totalTime = "0分钟";
+        if (resultDTO.getTimeNum() > NumConstant.ZERO) {
+            int num = resultDTO.getTimeNum() / 60;
+            int hour = num / 60;
+            int minute = num % 60;
+            totalTime = (hour < 1 ? "" : hour + "小时") + (minute < 1 ? "" : minute + "分钟");
+        }
+        personal2.setValue(totalTime == "" ? "0分钟" : totalTime);
+        resultList.add(personal2);
+        PersonalPatrolListResultDTO personal3 = new PersonalPatrolListResultDTO();
+        personal3.setKey("事件数");
+        personal3.setValue(resultDTO.getReportProjectCount().toString());
+        resultList.add(personal3);
+
+        return resultList;
+    }
+    /**
+     * @Param formDTO
+     * @Description 对外接口--查询工作人员基本信息
+     * @author sun
+     */
+    @Override
+    public OpenStaffDetailResultDTO openStaffDetail(OpenStaffDetailFormDTO formDTO) {
+        OpenStaffDetailResultDTO resultDTO = new OpenStaffDetailResultDTO();
+        //1.按staffId查询基础信息
+        CustomerStaffDTO staffDTO = customerStaffDao.selectByMobile(formDTO.getCustomerId(), formDTO.getMobile());
+        if (null == staffDTO) {
+            return resultDTO;
+        }
+
+        //2.查询工作人员所属组织信息
+        CustomerAgencyDTO agencyDTO = govOrgService.gridByAgencyId(formDTO.getCustomerId(), staffDTO.getUserId());
+
+        //3.封装数据并返回
+        resultDTO.setCustomerId(formDTO.getCustomerId());
+        if (null != agencyDTO) {
+            resultDTO.setAgencyId(agencyDTO.getId());
+            resultDTO.setAgencyAllName(agencyDTO.getAllParentName());
+        }
+        resultDTO.setStaffId(staffDTO.getUserId());
+        resultDTO.setStaffName(staffDTO.getRealName());
+        resultDTO.setMobile(formDTO.getMobile());
+
+        return resultDTO;
+    }
+
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java

@@ -2,6 +2,11 @@ package com.epmet.dataaggre.service.evaluationindex;
 
 import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
 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 java.util.List;
 
 /**
  * @Author sun
@@ -15,4 +20,55 @@ public interface EvaluationIndexService {
      * @author sun
      */
     GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO);
+
+    /**
+     * @Description 查询areaCode对应的直属下级且不是agencyId对应的客户id的客户组织列表
+     * @author sun
+     */
+    List<String> getAgencyByAreaCodeAgencyId(String agencyId, String areaCode);
+
+    /**
+     * @Description 查询直属下级组织列表，有areaCode的按areaCode查，没有的按agencyId查
+     * @author sun
+     */
+    List<ScreenCustomerAgencyDTO> getSubAgencyList(String agencyId, String areaCode);
+
+    /**
+     * @Description 查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+     * @author sun
+     */
+    List<ScreenCustomerGridDTO> getSubGridList(String agencyId);
+
+    /**
+     * 根据组织ID获取治理指数
+     * @author zhaoqifeng
+     * @date 2021/6/25 16:33
+     * @param agencyId
+     * @param areaCode
+     * @param dateId
+     * @return java.util.List<com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO>
+     */
+    ScreenGovernRankDataDailyDTO getGovernRank(String agencyId, String areaCode, String dateId);
+
+    /**
+     * 获取组织信息
+     * @author zhaoqifeng
+     * @date 2021/6/29 13:57
+     * @param agencyId
+     * @return com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO
+     */
+    ScreenCustomerAgencyDTO getAgencyInfo(String agencyId);
+
+    /**
+     * @Description 根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表
+     * @author sun
+     */
+    List<String> getAgencyIdsByAgencyId(String agencyId);
+
+    /**
+     * @Description 查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+     * @author sun
+     */
+    List<ScreenCustomerAgencyDTO> getSubAgencyListByAgency(String agencyId);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java

@@ -7,14 +7,21 @@ import com.epmet.dataaggre.dao.datastats.DataStatsDao;
 import com.epmet.dataaggre.dao.evaluationindex.EvaluationIndexDao;
 import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
 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.service.evaluationindex.EvaluationIndexService;
+import com.epmet.dataaggre.service.opercrm.CustomerRelation;
 import lombok.extern.slf4j.Slf4j;
+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.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author sun
@@ -26,6 +33,8 @@ import java.util.Date;
 public class EvaluationIndexServiceImpl implements EvaluationIndexService {
     @Autowired
     private EvaluationIndexDao evaluationIndexDao;
+    @Autowired
+    private CustomerRelation customerRelation;
 
     /**
      * @Param formDTO
@@ -37,4 +46,99 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
         return  evaluationIndexDao.getAgnecyOrGridGoverRatio(formDTO.getOrgId(),formDTO.getOrgType(),formDTO.getDateId());
     }
 
+    /**
+     * @Description 查询areaCode对应的直属下级且不是agencyId对应的客户id的客户组织列表
+     * @author sun
+     */
+    @Override
+    public List<String> getAgencyByAreaCodeAgencyId(String agencyId, String areaCode) {
+        return evaluationIndexDao.getAgencyByAreaCodeAgencyId(agencyId,areaCode);
+    }
+
+    /**
+     * @Description 查询直属下级组织列表，有areaCode的按areaCode查，没有的按agencyId查
+     * @author sun
+     */
+    @Override
+    public List<ScreenCustomerAgencyDTO> getSubAgencyList(String agencyId, String areaCode) {
+        return evaluationIndexDao.getSubAgencyList(agencyId,areaCode);
+    }
+
+    /**
+     * @Description 查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+     * @author sun
+     */
+    @Override
+    public List<ScreenCustomerGridDTO> getSubGridList(String agencyId) {
+        return evaluationIndexDao.getSubGridList(agencyId);
+    }
+
+    /**
+     * 根据组织ID获取治理指数
+     *
+     * @param agencyId
+     * @param areaCode
+     * @param dateId
+     * @return java.util.List<com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO>
+     * @author zhaoqifeng
+     * @date 2021/6/25 16:33
+     */
+    @Override
+    public ScreenGovernRankDataDailyDTO getGovernRank(String agencyId, String areaCode, String dateId) {
+        List<String> agencyIdList =  getAgencyByAreaCodeAgencyId(agencyId, areaCode);
+        if (CollectionUtils.isEmpty(agencyIdList)) {
+            agencyIdList = new ArrayList<>();
+        }
+        agencyIdList.add(agencyId);
+        return evaluationIndexDao.getGovernRankList(agencyIdList, dateId);
+    }
+
+    /**
+     * 获取组织信息
+     *
+     * @param agencyId
+     * @return com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO
+     * @author zhaoqifeng
+     * @date 2021/6/29 13:57
+     */
+    @Override
+    public ScreenCustomerAgencyDTO getAgencyInfo(String agencyId) {
+        return evaluationIndexDao.getAgencyInfo(agencyId);
+    }
+
+    /**
+     * @Description 根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表
+     * @author sun
+     */
+    @Override
+    public List<String> getAgencyIdsByAgencyId(String agencyId) {
+        //1.查询agencyId对应组织信息
+        ScreenCustomerAgencyDTO dto = evaluationIndexDao.getByAgencyId(agencyId);
+        //2.判断客户是否存在子客户
+        List<String> list = customerRelation.haveSubCustomer(dto.getCustomerId());
+        if (!CollectionUtils.isNotEmpty(list)) {
+            return new ArrayList<>();
+        }
+        //3.存在子客户的，查询当前组织的areaCode对应的直属下级且不是agencyId对应的客户id的但是存在父子客户关系的客户组织列表
+        return evaluationIndexDao.getAgencyIdsByAgencyId(agencyId, dto.getAreaCode(), list);
+    }
+
+    /**
+     * @Description 查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查且是在当前客户和子客户范围内查询
+     * @author sun
+     */
+    @Override
+    public List<ScreenCustomerAgencyDTO> getSubAgencyListByAgency(String agencyId) {
+        //1.查询agencyId对应组织信息
+        ScreenCustomerAgencyDTO dto = evaluationIndexDao.getByAgencyId(agencyId);
+        //2.判断客户是否存在子客户
+        List<String> list = customerRelation.haveSubCustomer(dto.getCustomerId());
+        if (!CollectionUtils.isNotEmpty(list)) {
+            return evaluationIndexDao.getSubAgencyListByAgency(agencyId, null, null);
+        } else {
+            list.add(dto.getCustomerId());
+            return evaluationIndexDao.getSubAgencyListByAgency(null, dto.getAreaCode(), list);
+        }
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.service.govorg;
 
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
@@ -59,4 +60,16 @@ public interface GovOrgService {
      * @author sun
      */
     List<GridStaffResultDTO> selectGridStaffByGridIds(List<String> gridIds, String staffName);
+
+    /**
+     * @Description  查询网格信息或查询当前人员所属组织下所有网格信息
+     * @author sun
+     */
+    List<CustomerGridDTO> getGridInfoList(List<String> gridIds, String staffId);
+
+    /**
+     * @Description  查询工作人员所属组织信息
+     * @author sun
+     */
+    CustomerAgencyDTO gridByAgencyId(String customerId, String staffId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -11,6 +11,7 @@ import com.epmet.dataaggre.dao.govorg.CustomerAgencyDao;
 import com.epmet.dataaggre.dao.govorg.CustomerGridDao;
 import com.epmet.dataaggre.dao.govorg.CustomerStaffAgencyDao;
 import com.epmet.dataaggre.dao.govorg.CustomerStaffGridDao;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerStaffAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
@@ -264,4 +265,24 @@ public class GovOrgServiceImpl implements GovOrgService {
         return result;
     }
 
+    /**
+     * @Description  查询网格信息或查询当前人员所属组织下所有网格信息
+     * @author sun
+     */
+    @Override
+    public List<CustomerGridDTO> getGridInfoList(List<String> gridIds, String staffId) {
+        //1.有网格列表的查询网格基本信息，没有的查询工作人员所属组织级下级所有的网格信息
+        List<CustomerGridDTO> list = customerGridDao.getGridInfoList(gridIds, staffId);
+        return list;
+    }
+
+    /**
+     * @Description 查询工作人员所属组织信息
+     * @author sun
+     */
+    @Override
+    public CustomerAgencyDTO gridByAgencyId(String customerId, String staffId) {
+        return customerStaffAgencyDao.selectAgencyByStaffId(customerId, staffId);
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java

@@ -0,0 +1,51 @@
+package com.epmet.dataaggre.service.impl;
+
+import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+import com.epmet.dataaggre.service.AggreGridService;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
+import com.epmet.dataaggre.service.govorg.GovOrgService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class AggreGridServiceImpl implements AggreGridService {
+
+    @Autowired
+    private GovOrgService govOrgService;
+
+    @Autowired
+    private DataStatsService dataStatsService;
+
+    @Override
+    public List<GridMemberDataAnalysisResultDTO> getGridMemberDataAnalysis(
+            List<String> gridIds,
+            String searchedStaffName,
+            String currStaffId,
+            String month,
+            String sort,
+            Integer pageNo,
+            Integer pageSize) {
+
+        //1.得到网格id列表
+        Map<String, String> gridIdAndName = new HashMap<>();
+        List<CustomerGridDTO> grids = govOrgService.getGridInfoList(gridIds, currStaffId);
+        grids.forEach(g -> {
+            gridIds.add(g.getId());
+            gridIdAndName.put(g.getId(), g.getGridName());
+        });
+
+        //2.查询列表，并且填充内容
+        List<GridMemberDataAnalysisResultDTO> records = dataStatsService.listGridMemberDataStats(gridIds, searchedStaffName, month, sort, pageNo, pageSize);
+        records.forEach(r -> r.setOrgName(gridIdAndName.get(r.getGridId())));
+        return records;
+    }
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/CustomerRelation.java

@@ -10,4 +10,13 @@ import java.util.List;
  */
 public interface CustomerRelation {
     List<String> selectUsedAreaCodeList(String areaCode);
+
+    /**
+     * 是否有子客户
+     * @author zhaoqifeng
+     * @date 2021/6/29 11:06
+     * @param customerId
+     * @return List<String>
+     */
+    List<String> haveSubCustomer(String customerId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/impl/CustomerRelationImpl.java

@@ -5,6 +5,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.opercrm.CustomerRelationDao;
 import com.epmet.dataaggre.service.opercrm.CustomerRelation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,4 +28,17 @@ public class CustomerRelationImpl implements CustomerRelation {
     public List<String> selectUsedAreaCodeList(String areaCode) {
         return customerRelationDao.selectUsedAreaCodeList(areaCode);
     }
+
+    /**
+     * 是否有子客户
+     *
+     * @param customerId
+     * @return boolean
+     * @author zhaoqifeng
+     * @date 2021/6/29 11:06
+     */
+    @Override
+    public List<String> haveSubCustomer(String customerId) {
+        return customerRelationDao.selectAllSubCustomerIds(customerId);
+    }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -12,9 +12,10 @@
             fact_reg_user_agency_daily
         WHERE
             del_flag = '0'
-        AND agency_id = #{agencyId}
         AND date_id = #{dateId}
-        LIMIT 1
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
     </select>
 
     <select id="getAgnecyGroup" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO">
@@ -26,9 +27,10 @@
             fact_group_total_agency_daily
         WHERE
             del_flag = '0'
-        AND agency_id = #{agencyId}
         AND date_id = #{dateId}
-        LIMIT 1
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
     </select>
 
     <select id="getAgencyTopic" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO$Topic">
@@ -40,9 +42,10 @@
         WHERE
             del_flag = '0'
         AND topic_status_id in('discussing','closed','hidden')<!-- 讨论中(热议中！=讨论中)、已处理、已屏蔽 -->
-        AND agency_id = #{agencyId}
         AND date_id = #{dateId}
-        LIMIT 3
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
     </select>
 
     <select id="getAgencyTopicShiftIssue" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO$Topic">
@@ -53,9 +56,10 @@
             fact_topic_issue_agency_daily
         WHERE
             del_flag = '0'
-        AND agency_id = #{agencyId}
         AND date_id = #{dateId}
-        LIMIT 1
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
     </select>
 
     <select id="getAgencyTopicHotDiscuss" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO$Topic">
@@ -66,9 +70,10 @@
             fact_topic_hotdiscuss_agency_daily
         WHERE
             del_flag = '0'
-        AND agency_id = #{agencyId}
         AND date_id = #{dateId}
-        LIMIT 1
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
     </select>
 
     <select id="getAgencyIssue" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO">
@@ -81,9 +86,10 @@
             fact_issue_agency_daily
         WHERE
             del_flag = '0'
-        AND agency_id = #{agencyId}
         AND date_id = #{dateId}
-        LIMIT 1
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
     </select>
 
     <select id="getAgencyProject" resultType="com.epmet.dataaggre.dto.datastats.result.AgencyBasicDataResultDTO">
@@ -95,9 +101,10 @@
             fact_agency_project_daily
         WHERE
             del_flag = '0'
-        AND agency_id = #{agencyId}
         AND date_id = #{dateId}
-        LIMIT 1
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
     </select>
 
     <select id="getSubAgencyList" resultType="com.epmet.dataaggre.entity.datastats.DimAgencyEntity">
@@ -653,5 +660,30 @@
         </foreach>
         ORDER BY problem_resolved_count DESC
     </select>
+    <select id="getAgencyGovernDaily" resultType="com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity">
+        SELECT
+            AGENCY_ID,
+            `LEVEL`,
+            PROBLEM_RESOLVED_COUNT,
+            GROUP_SELF_GOVERN_RATIO,
+            GRID_SELF_GOVERN_RATIO,
+            COMMUNITY_CLOSED_RATIO,
+            STREET_CLOSED_RATIO,
+            DISTRICT_DEPT_CLOSED_RATIO,
+            IN_GROUP_TOPIC_RESOLVED_COUNT,
+            IN_GROUP_TOPIC_UN_RESOLVED_COUNT,
+            GRID_SELF_GOVERN_PROJECT_TOTAL,
+            COMMUNITY_CLOSED_COUNT,
+            STREET_CLOSED_COUNT,
+            DISTRICT_DEPT_CLOSED_COUNT
+        FROM
+            fact_agency_govern_daily
+        WHERE
+            DEL_FLAG = '0'
+            AND DATE_ID = #{dateId}
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            AGENCY_ID = #{agencyId}
+        </foreach>
+    </select>
 
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml

@@ -0,0 +1,133 @@
+<?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.datastats.FactGridMemberStatisticsDailyDao">
+
+    <resultMap type="com.epmet.dataaggre.entity.datastats.FactGridMemberStatisticsDailyEntity" id="factGridMemberStatisticsDailyMap">
+        <result property="id" column="ID"/>
+        <result property="dateId" column="DATE_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="pid" column="PID"/>
+        <result property="pids" column="PIDS"/>
+        <result property="staffId" column="STAFF_ID"/>
+        <result property="staffName" column="STAFF_NAME"/>
+        <result property="projectCount" column="PROJECT_COUNT"/>
+        <result property="issueToProjectCount" column="ISSUE_TO_PROJECT_COUNT"/>
+        <result property="closedIssueCount" column="CLOSED_ISSUE_COUNT"/>
+        <result property="projectResponseCount" column="PROJECT_RESPONSE_COUNT"/>
+        <result property="projectTransferCount" column="PROJECT_TRANSFER_COUNT"/>
+        <result property="projectClosedCount" column="PROJECT_CLOSED_COUNT"/>
+        <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>
+    <sql id="allColumns">
+        member.id,
+        member.date_id,
+        member.month_id,
+        member.year_id,
+        member.customer_id,
+        member.agency_id,
+        member.grid_id,
+        member.pid,
+        member.pids,
+        member.staff_id,
+        member.staff_name,
+        member.project_count,
+        member.issue_to_project_count,
+        member.closed_issue_count,
+        member.project_response_count,
+        member.project_transfer_count,
+        member.project_closed_count,
+        member.project_incr,
+        member.issue_to_project_incr,
+        member.closed_issue_incr,
+        member.project_response_incr,
+        member.project_transfer_incr,
+        member.project_closed_incr,
+        member.del_flag,
+        member.revision,
+        member.created_by,
+        member.created_time,
+        member.updated_by,
+        member.updated_time
+    </sql>
+
+    <!--查询网格员统计数据-->
+    <!--查询网格员统计数据-->
+    <select id="listGridMemberDataStats"
+            resultType="com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO">
+        select member.id,
+            member.date_id,
+            member.month_id,
+            member.year_id,
+            member.customer_id,
+            member.agency_id,
+            member.grid_id,
+            member.pid,
+            member.pids,
+            member.staff_id,
+            member.staff_name,
+
+            sum(member.project_incr) project_count,
+            sum(member.issue_to_project_incr) issue_to_project_count,
+            sum(member.closed_issue_incr) closed_issue_count,
+            sum(member.project_response_incr) project_response_count,
+            sum(member.project_transfer_incr) project_transfer_count,
+            sum(member.project_closed_incr) project_closed_count
+        from fact_grid_member_statistics_daily member
+        <where>
+            <if test="gridIds != null and gridIds.size() > 0">
+                <foreach collection="gridIds" item="gridId" separator="OR" open="(" close=")">
+                    member.GRID_ID = #{gridId}
+                </foreach>
+            </if>
+            <if test="searchedStaffName != null and searchedStaffName != ''">
+                and member.STAFF_NAME like CONCAT('%',#{searchedStaffName},'%')
+            </if>
+            <if test="month != null and month != ''">
+                and member.MONTH_ID = #{month}
+            </if>
+            and del_flag = 0
+        </where>
+        group by member.staff_id, member.grid_id
+        order by ${sort} desc, convert(member.staff_name using gbk) asc, member.GRID_ID asc
+    </select>
+
+    <select id="getGridMemberIssueProjectStats"
+            resultType="com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO">
+        SELECT member.id,
+               member.date_id,
+               member.month_id,
+               member.year_id,
+               member.customer_id,
+               member.agency_id,
+               member.grid_id,
+               member.pid,
+               member.pids,
+               member.staff_id,
+               member.staff_name,
+               sum(member.project_count)          project_count,
+               sum(member.issue_to_project_count) issue_to_project_count,
+               sum(member.closed_issue_count)     closed_issue_count,
+               sum(member.project_response_count) project_response_count,
+               sum(member.project_transfer_count) project_transfer_count,
+               sum(member.project_closed_count)   project_closed_count
+        FROM fact_grid_member_statistics_daily member
+                 inner join (select max(mt.DATE_ID) latest_date
+                             from fact_grid_member_statistics_daily mt
+                             where mt.STAFF_ID = #{staffId} and mt.del_flag=0) latest_record
+                            on (member.DATE_ID = latest_record.latest_date)
+        WHERE member.STAFF_ID = #{staffId}
+          and member.DEL_FLAG = 0
+    </select>
+
+
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml

@@ -3,4 +3,16 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.epmetuser.CustomerStaffDao">
 
+    <select id="selectByMobile" resultType="com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO">
+        SELECT
+            *
+        FROM
+            customer_staff
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND mobile = #{mobile}
+        LIMIT 1
+    </select>
+
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml

@@ -51,4 +51,70 @@
             -->
     </select>
 
+    <select id="selectStaffPatrolList" resultType="com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO">
+        SELECT
+            d.latest_patrol_status AS status,
+            t.*
+        FROM(
+            SELECT
+            ssp.grid_id AS gridId,
+            ssp.staff_id AS staffId,
+            cs.real_name AS staffName,
+            cs.gender AS gender,
+            IFNULL(MAX(ssp.latest_patrol_time), '') AS patrolStartTime,
+            IFNULL(SUM(ssp.patrol_total), 0) AS patrolTotal,
+            MAX(DATE_ID) dateId,
+            IFNULL(SUM(ssp.report_project_count), 0) AS reportProjectCount,
+            IFNULL(SUM(ssp.total_time), 0) AS timeNum
+            FROM
+            stats_staff_patrol_record_daily ssp
+            LEFT JOIN customer_staff cs ON ssp.staff_id = cs.user_id
+            WHERE
+            ssp.del_flag = '0'
+            AND ssp.date_id >= #{patrolStartTime}
+            <if test="staffName!= null and staffName != ''">
+                AND cs.real_name = #{staffName}
+            </if>
+            <if test="gridIds != null and gridIds.size() > 0">
+                <foreach collection="gridIds" item="gridId" open="AND (" separator=" OR "  close=" )" >
+                    ssp.grid_id = #{gridId}
+                </foreach>
+            </if>
+            GROUP BY ssp.grid_id, ssp.staff_id
+            <if test="sortCode!= null and sortCode != ''">
+                <choose>
+                    <when test="sortCode == 'patrolTotal' ">
+                        ORDER BY SUM(ssp.patrol_total) DESC
+                    </when>
+                    <when test="sortCode == 'latestPatrolledTime' ">
+                        ORDER BY MAX(ssp.latest_patrol_time) DESC
+                    </when>
+                    <when test="sortCode == 'reportProjectCount' ">
+                        ORDER BY SUM(ssp.report_project_count) DESC
+                    </when>
+                    <otherwise>
+                        ORDER BY SUM(ssp.total_time) DESC
+                    </otherwise>
+                </choose>
+            </if>
+            LIMIT
+            #{pageNo}, #{pageSize}
+        ) t
+        INNER JOIN stats_staff_patrol_record_daily d ON t.dateId = d.date_id
+        AND t.gridId = d.grid_id
+        AND t.staffId = d.staff_id
+    </select>
+
+    <select id="selectPersonalPatrolList" resultType="com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO">
+        SELECT
+            IFNULL(SUM(ssp.patrol_total), 0) AS patrolTotal,
+            IFNULL(SUM(ssp.total_time), 0) AS timeNum,
+            IFNULL(SUM(ssp.report_project_count), 0) AS reportProjectCount
+        FROM
+            stats_staff_patrol_record_daily ssp
+        WHERE
+            ssp.del_flag = '0'
+        AND ssp.staff_id = #{staffId}
+    </select>
+
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

@@ -20,4 +20,158 @@
         AND date_id = #{dateId}
     </select>
 
+    <select id="getAgencyByAreaCodeAgencyId" resultType="java.lang.String">
+        SELECT
+            agency_id
+        FROM
+            screen_customer_agency
+        WHERE
+            del_flag = '0'
+        AND parent_area_code = #{areaCode}
+        AND customer_id != (
+            SELECT
+                customer_id
+            FROM
+                screen_customer_agency
+            WHERE
+                agency_id = #{agencyId}
+        )
+    </select>
+
+    <select id="getSubAgencyList" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO">
+        SELECT
+            customer_id AS customerId,
+            agency_id AS agencyId,
+            agency_name AS agencyName,
+            level AS level,
+            area_code AS areaCode,
+            parent_area_code AS parentAreaCode
+        FROM
+            SCREEN_CUSTOMER_AGENCY
+        WHERE
+            del_flag = '0'
+        <choose>
+            <when test="areaCode != null and areaCode.trim() != ''">
+                AND parent_area_code = #{areaCode}
+            </when>
+            <otherwise>
+                AND pid = #{agencyId}
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="getSubGridList" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO">
+        SELECT
+            customer_id AS customerId,
+            grid_id AS gridId,
+            grid_name AS gridName,
+            parent_agency_id AS parentAgencyId,
+            area_marks AS areaMarks,
+            center_mark AS centerMark,
+            party_mark AS partyMark,
+            data_end_time AS dataEndTime,
+            all_parent_ids AS allParentIds
+        FROM
+            screen_customer_grid
+        WHERE
+            del_flag = '0'
+        AND parent_agency_id = #{agencyId}
+    </select>
+    <select id="getGovernRankList" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO">
+        SELECT
+        IFNULL( SUM( RESPONSE_COUNT ), 0 ) AS responseCount,
+        IFNULL( SUM( TRANSFER_COUNT ), 0 ) AS transferCount,
+        IFNULL( SUM( RESOLVED_COUNT ), 0 ) AS resolvedCount,
+        IFNULL( SUM( CLOSED_COUNT ), 0 ) AS closedCount,
+        IFNULL( SUM( GOVERN_COUNT ), 0 ) AS governCount,
+        IFNULL( SUM( SATISFACTION_COUNT ), 0 ) AS satisfactionCount,
+        IFNULL( SUM( CLOSED_PROJECT_COUNT ), 0 ) AS closedProjectCount
+        FROM
+            screen_govern_rank_data_daily
+        WHERE
+            DEL_FLAG = '0'
+        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+            ORG_ID = #{agencyId}
+        </foreach>
+          AND ORG_TYPE = 'agency'
+          AND DATE_ID = #{dateId}
+    </select>
+    <select id="getAgencyInfo" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO">
+        SELECT
+            customer_id,
+            agency_id ,
+            agency_name,
+            level,
+            area_code,
+            parent_area_code
+        FROM
+            SCREEN_CUSTOMER_AGENCY
+        WHERE
+            del_flag = '0'
+        and AGENCY_ID = #{agencyId}
+    </select>
+
+    <select id="getByAgencyId" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO">
+        SELECT
+            customer_id AS customerId,
+            agency_id AS agencyId,
+            agency_name AS agencyName,
+            level AS level,
+            area_code AS areaCode,
+            parent_area_code AS parentAreaCode
+        FROM
+            screen_customer_agency
+        WHERE
+            del_flag = '0'
+        AND agency_id = #{agencyId}
+    </select>
+
+    <select id="getAgencyIdsByAgencyId" resultType="java.lang.String">
+        SELECT
+            agency_id
+        FROM
+            screen_customer_agency
+        WHERE
+            del_flag = '0'
+        AND parent_area_code = #{areaCode}
+        AND customer_id != (
+            SELECT
+                customer_id
+            FROM
+                screen_customer_agency
+            WHERE
+                agency_id = #{agencyId}
+        )
+        <foreach collection="list" item="customerId" open="AND (" separator=" OR " close=")">
+            customer_id = #{customerId}
+        </foreach>
+    </select>
+
+    <select id="getSubAgencyListByAgency" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO">
+        SELECT
+            customer_id AS customerId,
+            agency_id AS agencyId,
+            agency_name AS agencyName,
+            level AS level,
+            area_code AS areaCode,
+            parent_area_code AS parentAreaCode
+        FROM
+            screen_customer_agency
+        WHERE
+            del_flag = '0'
+        <choose>
+            <when test="areaCode != null and areaCode.trim() != ''">
+                AND parent_area_code = #{areaCode}
+            </when>
+            <otherwise>
+                AND pid = #{agencyId}
+            </otherwise>
+        </choose>
+        <if test="null != list and list.size() > 0">
+            <foreach collection="list" item="customerId" open="AND (" separator=" OR " close=")">
+                customer_id = #{customerId}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml

@@ -99,4 +99,52 @@
         )
     </select>
 
+    <select id="getGridInfoList" resultType="com.epmet.dataaggre.dto.govorg.CustomerGridDTO">
+        SELECT
+            cg.id AS 'id',
+            IF (
+                ca.pid = '0',
+                IF (
+                        ca.organization_name = '',
+                        cg.grid_name,
+                        CONCAT(ca.organization_name,'-',cg.grid_name)
+                ),
+                CONCAT(
+                    (select organization_name from customer_agency where id = ca.pid),
+                    '-',
+                    IF (
+                        ca.organization_name = '',
+                        cg.grid_name,
+                        CONCAT(ca.organization_name,'-',cg.grid_name)
+                    )
+                )
+            )AS 'gridName'
+        FROM
+            customer_grid cg
+        INNER JOIN customer_agency ca ON cg.pid = ca.id
+        WHERE
+            cg.del_flag = '0'
+        AND ca.del_flag = '0'
+        <choose>
+            <when test="gridIds != null and gridIds.size() > 0">
+                <foreach collection="gridIds" item="id" open="AND (" separator=" OR "  close=" )" >
+                    cg.id = #{id}
+                </foreach>
+            </when>
+            <otherwise>
+                AND cg.pids
+                    LIKE CONCAT(
+                        '%',
+                        (
+                        select agency_id
+                        from customer_staff_agency
+                        where del_flag = '0'
+                        AND user_id = #{staffId}
+                        ),
+                        '%'
+                    )
+            </otherwise>
+        </choose>
+    </select>
+
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml

@@ -16,4 +16,18 @@
         AND user_id = #{userId}
     </select>
 
+    <select id="selectAgencyByStaffId" resultType="com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO">
+        SELECT
+            ca.id,
+            ca.all_parent_name
+        FROM
+            customer_staff_agency csa
+        INNER JOIN customer_agency ca ON csa.agency_id = ca.id
+        WHERE
+            csa.del_flag = '0'
+        AND ca.del_flag = '0'
+        AND csa.customer_id = #{customerId}
+        AND csa.user_id = #{staffId}
+    </select>
+
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercrm/CustomerRelationDao.xml

@@ -14,4 +14,13 @@
             AND cr.AREA_CODE LIKE concat(#{areaCode}, '%')
             AND cr.AREA_CODE != #{areaCode}
     </select>
+    <select id="selectAllSubCustomerIds" resultType="java.lang.String">
+        SELECT
+            cr.CUSTOMER_ID
+        FROM
+            customer_relation cr
+        WHERE
+            cr.DEL_FLAG = '0'
+          AND cr.PIDS like CONCAT(#{customerId},'%')
+    </select>
 </mapper>

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/AgencyInfoDTO.java

@@ -13,8 +13,9 @@ import java.util.List;
  */
 @Data
 public class AgencyInfoDTO implements Serializable {
-    private String agencyId;
-    private String areaCode;
-    private List<String> subAgencyIds;
-    private List<String> subGridIds;
+    private String currentAgencyId;
+    private String currentAgencyName;
+    private String currentAreaCode;
+    private List<ScreenCustomerAgencyCommonDTO> subAgencies;
+    private List<ScreenCustomerGridCommonDTO> subGrids;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerAgencyCommonDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * screen_customer_agency
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/7/13 15:31
+ */
+@Data
+public class ScreenCustomerAgencyCommonDTO implements Serializable {
+    private static final long serialVersionUID = -6222325433226628163L;
+    private String agencyId;
+    private String agencyName;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerGridCommonDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * screen_customer_grid
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/7/13 15:32
+ */
+@Data
+public class ScreenCustomerGridCommonDTO implements Serializable {
+    private static final long serialVersionUID = -4405092094598416917L;
+    private String gridId;
+    private String gridName;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerGridDTO.java

@@ -0,0 +1,119 @@
+/**
+ * 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.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 网格(党支部)信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-26
+ */
+@Data
+public class ScreenCustomerGridDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 组织名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 坐标区域
+     */
+	private String areaMarks;
+
+    /**
+     * 中心点位
+     */
+	private String centerMark;
+
+    /**
+     * 党支部（=网格）的位置
+     */
+	private String partyMark;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
+     */
+	private String dataEndTime;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+	private String allParentIds;
+	private String pid;
+	private String pids;
+	private String areaCode;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/AgencyDetailMulticFormDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 工作端小程序-数据上面的  当前组织调用此接口
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/6/24 15:26
+ */
+@Data
+public class AgencyDetailMulticFormDTO implements Serializable {
+    private static final long serialVersionUID = 6603177626712295270L;
+    /**
+     * 内部错误分组
+     * */
+    public interface AddUserInternalGroup{}
+
+    /**
+     * 机关组织Id
+     */
+    @NotBlank(message = "机关组织ID不能为空" , groups = {AddUserInternalGroup.class})
+    private String agencyId;
+
+
+    /**
+     * 当前登录用户所属的客户id
+     */
+    private String customerId;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/project/MassesDiscontentFormV2DTO.java

@@ -0,0 +1,57 @@
+package com.epmet.dto.form.project;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 群众不满列表查询入参DTO，从指标库取值
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/6/24 10:55
+ */
+@Data
+public class MassesDiscontentFormV2DTO implements Serializable {
+    public interface MassesDiscontentFormV2 {
+    }
+
+    /**
+     * 时间区间,三个月：threeMonth；半年：sixMonth；一年：twelveMonth
+     * 一个月按照30天，三个月90天，半年180天，一年365天
+     */
+    @NotBlank(message = "timeSection不能为空,取值：三个月:threeMonth;半年:sixMonth;一年:twelveMonth", groups = MassesDiscontentFormV2.class)
+    private String timeSection;
+
+    /**
+     * asc:分数由低到高
+     * desc:分数由高到低
+     */
+    @NotBlank(message = "sortType不能为空,取值:asc:分数由低到高;desc:分数由高到低", groups = MassesDiscontentFormV2.class)
+    private String sortType;
+
+    /**
+     * 组织ID
+     */
+    @NotBlank(message = "agencyId不能为空", groups = MassesDiscontentFormV2.class)
+    private String agencyId;
+
+    @NotNull(message = "pageNo不能为空", groups = MassesDiscontentFormV2.class)
+    private Integer pageNo;
+
+    @NotNull(message = "pageSize不能为空", groups = MassesDiscontentFormV2.class)
+    private Integer pageSize;
+
+    /**
+     * 当前agency对应的区域编码，由前端传入，前端从/data/report/screen/agency/agencydetail这取值
+     */
+    private String areaCode;
+
+
+
+
+    //以下属性无需前端传入
+    private String startDate;
+    private String endDate;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/AgencyDetailMulticResultDTO.java

@@ -0,0 +1,104 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/6/24 15:31
+ */
+@Data
+public class AgencyDetailMulticResultDTO implements Serializable {
+    /**
+     * 机关组织Id
+     */
+    private String agencyId = "";
+
+    /**
+     * 组织名称
+     */
+    private String agencyName = "";
+
+    /**
+     * 机关级别（社区级：community，
+     * 乡（镇、街道）级:street,
+     * 区县级: district,
+     * 市级: city
+     * 省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String level = "";
+
+    /**
+     * 地区编码
+     */
+    private String areaCode = "";
+
+    /**
+     * 【省份】名称
+     */
+    private String province = "";
+
+    /**
+     * 【城市】名称
+     */
+    private String city = "";
+
+    /**
+     * 【区县】名称
+     */
+    private String district = "";
+
+    /**
+     * 本机关的所有上级机关
+     */
+    private List<ParentListResultDTO> parentList;
+
+    /**
+     * 街道
+     */
+    private String street="";
+
+    /**
+     * 社区
+     */
+    private String community="";
+
+    /**
+     * open: 选择地区编码必填；closed:  无需选择地区编码;;0409新增返参
+     */
+    private String areaCodeSwitch;
+
+    /**
+     * 组织区划的名称
+     */
+    private String areaName;
+
+    /**
+     * 当前组织对应客户根组织级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String rootlevel;
+
+
+    //以下参数是06.24新增
+    private String rootAgencyId;
+    private String parentAreaCode;
+    /**
+     * 是否有字客户
+     */
+    private Boolean haveSubCustomer;
+
+    /**
+     * 子客户列表
+     */
+    private List<String> subCustomerIds;
+
+    // @JsonIgnore
+    /**
+     * 当前agencyId所属的客户id
+     */
+    private String customerId;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java

@@ -0,0 +1,46 @@
+/**
+ * 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.dto.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 组织首页-获取组织机构信息接口-本机关的所有上级机关信息
+ *
+ * @author sun
+ */
+@Data
+public class ParentListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关组织Id
+     */
+    private String id = "";
+    /**
+     * 机关组织名称
+     */
+    private String name = "";
+
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/ScreenCustomerAgencyDTO.java

@@ -46,4 +46,14 @@ public class ScreenCustomerAgencyDTO implements Serializable {
      * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
      */
     private String parentAreaCode;
+
+    /**
+     * 父级id ,顶级，此列为0
+     */
+    private String pid;
+
+    /**
+     * 所有上级ID，用逗号（英文）分开
+     */
+    private String pids;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/project/MassesDiscontentResultV2DTO.java

@@ -0,0 +1,69 @@
+package com.epmet.dto.result.project;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 群众不满列表查询返参DTO，从指标库取值
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/6/24 11:02
+ */
+@Data
+public class MassesDiscontentResultV2DTO implements Serializable {
+    private static final long serialVersionUID = 403953150174574960L;
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    /**
+     * 话题所在网格
+     */
+    private String gridName;
+
+    /**
+     * 话题图片
+     */
+    private List<String> photos;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 项目分类标签
+     */
+    private String projectCategory;
+
+    /**
+     * 项目评价分数
+     * 直接取整数位展示
+     */
+    private BigDecimal score;
+
+    @JsonIgnore
+    private String customerId;
+    @JsonIgnore
+    private String parentAgencyId;
+    @JsonIgnore
+    private String areaCode;
+
+    public MassesDiscontentResultV2DTO() {
+        this.gridName = "";
+        this.photos = new ArrayList<>();
+        this.topicContent = "";
+        this.projectCategory = "";
+    }
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java

@@ -19,6 +19,7 @@ package com.epmet.evaluationindex.index.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 
@@ -37,20 +38,24 @@ public class IndexExplainFormDTO implements Serializable {
     /**
      * 客户id
      */
+    @NotBlank(message = "客户ID不能为空")
 	private String customerId;
 
     /**
      * 组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）
      */
+    @NotBlank(message = "组织级别不能为空")
 	private String orgLevel;
 
     /**
      * 组织id
      */
+    @NotBlank(message = "组织ID不能为空")
     private String orgId;
     /**
      * 月份Id
      */
+    @NotBlank(message = "月份不能为空")
     private String monthId;
 
 

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexExplainResult.java

@@ -1,5 +1,6 @@
 package com.epmet.evaluationindex.index.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -49,5 +50,8 @@ public class IndexExplainResult {
      */
     private String tableDesc;
 
+    @JsonIgnore
+    private String indexCode;
+
 
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java

@@ -23,6 +23,15 @@ public class IndexScoreResult implements Serializable {
      */
     private BigDecimal score;
 
+    /**
+     * 本级分数
+     */
+    private BigDecimal selfScore;
+    /**
+     * 下级分数
+     */
+    private BigDecimal subScore;
+
     /**
      * 指标对应的权重
      */
@@ -43,4 +52,9 @@ public class IndexScoreResult implements Serializable {
      */
     private String valueType;
 
+    /**
+     * 是否是总分
+     */
+    private Boolean isTotal;
+
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AgencyFormDTO.java

@@ -21,4 +21,9 @@ public class AgencyFormDTO implements Serializable {
 
     @NotBlank(message = "机关Id不能为空" , groups =  CommonAgencyIdGroup.class)
     private String agencyId;
+
+    /**
+     * 平阴县默认穿370124,跟随8个街道点击事件，传入街道的areaCode
+     * */
+    private String areaCode;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/FineExampleFormDTO.java

@@ -3,7 +3,6 @@ package com.epmet.evaluationindex.screen.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -22,4 +21,16 @@ public class FineExampleFormDTO implements Serializable {
      */
     @NotBlank(message = "机关ID不能为空",groups = {FineExample.class})
     private String agencyId;
+
+    /**
+     * 目前只有平阴在传，默认赋值：370124,跟随8个街道变化
+     */
+    private String areaCode;
+
+    /**
+     * 当前token中的客户id
+     */
+    @NotBlank(message = "token中的customerId不能为空",groups = {FineExample.class})
+    private String customerId;
+
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/RootAgencyFormDTO.java

@@ -21,4 +21,9 @@ public class RootAgencyFormDTO implements Serializable {
     @NotBlank(message = "组织ID不能为空",groups = {RootAgencyFormDTO.AddUserInternalGroup.class})
     private String agencyId;
 
+    /**
+     * token中客户Id
+     */
+    private String customerId;
+
 }