网格呼叫总数

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java

@@ -22,7 +22,7 @@ import java.util.List;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ResourceFeignClientFallback.class, contextId = "ResourceFeignClient")
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ResourceFeignClientFallback.class, contextId = "ResourceFeignClient",url = "http://localhost:9092")
 public interface ResourceFeignClient {
     /**
      * 获取所有资源列表

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -28,7 +28,7 @@ import java.util.List;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient")
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient",url = "http://localhost:9092")
 public interface UserFeignClient {
 
     /**

esua-epdc/epdc-gateway/pom.xml

@@ -99,8 +99,8 @@
 
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
+                <!--<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
-                <!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
+                                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
                 </gateway.routes.epdc-activiti-server.uri>
                 <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
@@ -116,8 +116,8 @@
                 <!--<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>-->
                 <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
+                <!--<gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>-->
-                <!--                <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>-->
+                                <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
                 </gateway.routes.epdc-services-server.uri>
                 <!--                <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsItemMataFromDTO.java

@@ -0,0 +1,45 @@
+package com.elink.esua.epdc.dto.events.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2019/12/18 18:35
+ *  @Description: 网格呼叫事项总数
+ */
+@Data
+public class EpdcEventsItemMataFromDTO implements Serializable {
+
+    private static final long serialVersionUID = 7548801365236261157L;
+
+    /***
+     * 开始时间
+     */
+    private Date startTime;
+
+    /***
+     * 结束时间
+     */
+    private Date endTime;
+
+    /***
+     *  月 季  年
+     */
+    private String timeType;
+
+    /***
+     * 网格呼叫总数 0  网格响应呼叫总数 1
+     */
+    private String itemCountType;
+
+    /***
+     * 区直街道列表
+     */
+    private List<Long> deptIdList;
+
+
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
 import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO;
 import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
@@ -37,6 +38,7 @@ import com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO;
 import com.elink.esua.epdc.modules.item.excel.ItemExcel;
 import com.elink.esua.epdc.modules.item.service.ItemService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -177,4 +179,17 @@ public class ItemController {
         return itemService.ListEvaluationData(kpiEventEvaluationFromDto);
     }
 
+
+    /***
+     * 网格呼叫事项总数 与响应呼叫数（议题流转项目）
+     * @param epdcEventsItemMataFromDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.KpiMetaDataDTO>>
+     * @author qushutong
+     * @date 2019/12/18 16:02
+     */
+    @PostMapping("queryItemCountData")
+    Result<List<KpiMetaDataDTO>> queryItemCountData(@RequestBody EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO){
+
+        return itemService.ListItemCountData(epdcEventsItemMataFromDTO);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.item.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
 import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
@@ -196,4 +197,14 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      */
     List<KpiMetaDataDTO> selectListKpiEvaluationData(KpiEventEvaluationFromDTO kpiEventEvaluationFromDto);
 
+
+    /***
+     * 网格呼叫事项总数 与响应呼叫数（议题流转项目）
+     * @param epdcEventsItemMataFromDTO
+     * @return java.util.List<com.elink.esua.epdc.dto.KpiMetaDataDTO>
+     * @author qushutong
+     * @date 2019/12/18 16:23
+     */
+    List<KpiMetaDataDTO> selectListItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO);
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
 import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
@@ -291,4 +292,13 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @date 2019/12/18 10:30
      */
     Result<List<KpiMetaDataDTO>> ListEvaluationData(KpiEventEvaluationFromDTO kpiEventEvaluationFromDto);
+
+    /***
+     * 网格呼叫事项总数 与响应呼叫数（议题流转项目）
+     * @param epdcEventsItemMataFromDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.KpiMetaDataDTO>>
+     * @author qushutong
+     * @date 2019/12/18 16:02
+     */
+    Result<List<KpiMetaDataDTO>> ListItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -41,6 +41,7 @@ import com.elink.esua.epdc.dto.MenuNoticeDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
 import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
@@ -840,4 +841,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         kpiMetaDataDTOList.addAll(bestList);
         return new Result<List<KpiMetaDataDTO>>().ok(kpiMetaDataDTOList);
     }
+
+    @Override
+    public Result<List<KpiMetaDataDTO>> ListItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO) {
+        //网格呼叫事件总数
+        epdcEventsItemMataFromDTO.setItemCountType(NumConstant.ZERO_STR);
+        return new Result<List<KpiMetaDataDTO>>().ok(baseDao.selectListItemCountData(epdcEventsItemMataFromDTO));
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -807,22 +807,42 @@
     <select id="selectListKpiEvaluationData" resultType="com.elink.esua.epdc.dto.KpiMetaDataDTO">
         SELECT
         COUNT(ei.ISSUE_ID) AS dataValue,
-        ei.GRID_ID as deptId,
+        dept.deptId as deptId,
-        #{startTime} as startDate,
+        DATE(DATE_SUB(#{startTime}, INTERVAL 1 DAY) )as startDate,
-        #{endTime} as endDate,
+        DATE(DATE_SUB(#{endTime}, INTERVAL 1 DAY)) as endDate,
         #{type} as kpiCycle
         FROM
-        epdc_item ei
+        <foreach item="gridId" collection="gridIdList" open="(" separator="UNION ALL" close=")">
-        WHERE
+            SELECT #{gridId} AS deptId
-        DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </foreach> dept
+        LEFT JOIN epdc_item ei ON ei.GRID_ID = dept.deptId
+        and
+        DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         and
         ei.EVALUATION_SCORE = #{evaluationScore}
         and ei.DEL_FLAG = '0'
-        and ei.GRID_ID IN
+        GROUP BY
-        <foreach item="gridId" collection="gridIdList" open="(" separator="," close=")">
+        dept.deptId
-            #{gridId}
+    </select>
+
+    <select id="selectListItemCountData" resultType="com.elink.esua.epdc.dto.KpiMetaDataDTO">
+       SELECT
+            COUNT(ed.ID) AS dataValue,
+            dept.deptId AS deptId,
+            '网格呼叫总数' as data_name,
+            'wghjzs' as data_code,
+            DATE(DATE_SUB(#{startTime}, INTERVAL 1 DAY)) as startDate,
+            DATE(DATE_SUB(#{endTime}, INTERVAL 1 DAY)) as endDate,
+            #{timeType} as kpiCycle
+        FROM
+        <foreach item="deptId" collection="deptIdList" open="(  " separator="UNION ALL" close=") dept">
+            SELECT #{deptId} AS deptId
         </foreach>
+        LEFT JOIN epdc_item_dept ed ON ed.DEPT_ID = dept.deptId
+        and
+        DATE_FORMAT( ed.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        AND ed.DEL_FLAG = '0'
         GROUP BY
-        ei.GRID_ID
+        dept.deptId
     </select>
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java

@@ -101,9 +101,11 @@ public class KpiMetaDataController {
     @GetMapping("buildMetaData")
     public Result buildMetaData(){
         //网格事件上报总数 与响应数
-        kpiMetaDataService.createMataData();
+//        kpiMetaDataService.createMataData();
         //问题办理满意度
-        kpiMetaDataService.createEvaluationData();
+//        kpiMetaDataService.createEvaluationData();
+        //网格呼叫事项总数 与响应呼叫数（议题流转项目）
+        kpiMetaDataService.createItemMataData();
         return new Result();
     }
 

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -22,7 +22,7 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/7 9:27
  */
-@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class,url = "http://127.0.0.1:9092")
 public interface AdminFeignClient {
 
     /**

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.dto.EventCountFromDTO;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
 import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
 import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.feign.fallback.EventFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -20,7 +21,7 @@ import java.util.List;
  * @Date: 2019/12/4 09:28
  * @Description: 事件接口
  */
-@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = EventFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = EventFeignClientFallback.class,url = "http://127.0.0.1:9066")
 public interface EventFeignClient {
 
     /**
@@ -45,7 +46,7 @@ public interface EventFeignClient {
 
 
 	/***
-	 * 查询问题办理满意度
+	 * kpi 构建数据  查询问题办理满意度
 	 * @param kpiEventEvaluationFromDto
 	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.KpiMetaDataDTO>>
 	 * @author qushutong
@@ -54,4 +55,17 @@ public interface EventFeignClient {
 	@PostMapping(value = "events/item/queryEvaluationData", consumes = MediaType.APPLICATION_JSON_VALUE)
 	Result<List<KpiMetaDataDTO>>  queryEvaluationData(KpiEventEvaluationFromDTO kpiEventEvaluationFromDto);
 
+
+
+	/***
+	 * kpi 构建数据 响应网格呼叫数 网格呼叫总数
+	 * @param
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.KpiMetaDataDTO>>
+	 * @author qushutong
+	 * @date 2019/12/18 15:58
+	 */
+	@PostMapping(value = "events/item/queryItemCountData", consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<KpiMetaDataDTO>> queryItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO);
+
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java

@@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.EventCountFromDTO;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
 import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
 import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.feign.EventFeignClient;
 import org.springframework.stereotype.Component;
@@ -35,4 +36,10 @@ public class EventFeignClientFallback implements EventFeignClient {
 	public Result<List<KpiMetaDataDTO>> queryEvaluationData(KpiEventEvaluationFromDTO kpiEventEvaluationFromDto) {
 		return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryEvaluationData", kpiEventEvaluationFromDto);
 	}
+
+	@Override
+	public Result<List<KpiMetaDataDTO>> queryItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryItemCountData", epdcEventsItemMataFromDTO);
+	}
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java

@@ -110,4 +110,14 @@ public interface KpiMetaDataService extends BaseService<KpiMetaDataEntity> {
      * @date 2019/12/18 9:34
      */
     void createEvaluationData();
+
+
+    /***
+     * 构建元数据 网格呼叫总数  网格响应呼叫数
+     * @param
+     * @return void
+     * @author qushutong
+     * @date 2019/12/18 18:21
+     */
+    void createItemMataData();
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java

@@ -31,6 +31,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.KpiMetaDataDao;
 import com.elink.esua.epdc.dto.EventCountFromDTO;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
+import com.elink.esua.epdc.dto.events.form.EventCountSqlFromDTO;
 import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.entity.KpiMetaDataEntity;
 import com.elink.esua.epdc.enums.KpiCycleEnum;
@@ -207,4 +209,81 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
         } while (CollUtil.isNotEmpty(gridList));
     }
 
+    @Override
+    public void createItemMataData() {
+        //查询sql入参
+        //月
+        EpdcEventsItemMataFromDTO monthFromDto;
+
+        //季度
+        EpdcEventsItemMataFromDTO quarterFromDto;
+        // 年
+        EpdcEventsItemMataFromDTO yearFromDto;
+        //统计月
+        //取本月第一天
+        YearMonth now = YearMonth.now();
+        LocalDate startTime = now.minusMonths(1).atDay(1);
+        LocalDate endTime = now.atDay(1);
+        Date endTimeDate = LocalDateUtils.localDateToDate(startTime);
+        //按月统计
+
+        monthFromDto = new EpdcEventsItemMataFromDTO();
+        monthFromDto.setEndTime(LocalDateUtils.localDateToDate(endTime));
+        monthFromDto.setStartTime(endTimeDate);
+
+        //按照季度
+        int nowMonth = now.getMonthValue();
+        //上个季度第一天
+        LocalDate lastQuarter = now.minusMonths(3).atDay(1);
+        Date startQuarterDate = LocalDateUtils.localDateToDate(lastQuarter);
+        quarterFromDto = new EpdcEventsItemMataFromDTO();
+        quarterFromDto.setStartTime(startQuarterDate);
+        quarterFromDto.setEndTime(endTimeDate);
+        //年统计
+        //上个季度第一天
+        LocalDate lastYear = now.minusYears(1).atDay(1);
+        yearFromDto = new EpdcEventsItemMataFromDTO();
+        yearFromDto.setStartTime(LocalDateUtils.localDateToDate(lastYear));
+        yearFromDto.setEndTime(endTimeDate);
+
+
+        //查询区直
+        getCountItem(monthFromDto, quarterFromDto, yearFromDto, nowMonth, OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT);
+        //查询街道
+        getCountItem(monthFromDto, quarterFromDto, yearFromDto, nowMonth, OrganizationTypeConstant.ORG_TYPE_STREET_DEPT);
+    }
+
+    private void getCountItem(EpdcEventsItemMataFromDTO monthFromDto, EpdcEventsItemMataFromDTO quarterFromDto, EpdcEventsItemMataFromDTO yearFromDto, int nowMonth, String dept) {
+        List<KpiMetaDataDTO> kpiMetaDataDTOList;
+        //容量
+        int pageSize = 10;
+        //页码
+        int pageIndex = 1;
+        List<Long> deptIdList;
+        do {
+            // 分页获取所有网格
+             deptIdList =  deptUtils.getDeptIdList(dept, pageSize, pageIndex);
+            //月统计
+            monthFromDto.setDeptIdList(deptIdList);
+            monthFromDto.setTimeType(KpiCycleEnum.KPI_CYCLE_MONTH.getValue());
+            kpiMetaDataDTOList = eventFeignClient.queryItemCountData(monthFromDto).getData();
+            insertBatch(ConvertUtils.sourceToTarget(kpiMetaDataDTOList, KpiMetaDataEntity.class));
+            // 1,4,7,10 月份的时候统计 季度 季度第一天统计上一季度
+            if (nowMonth == NumConstant.ONE || nowMonth == NumConstant.FOUR || nowMonth == NumConstant.SEVEN || nowMonth == NumConstant.TEN) {
+                monthFromDto.setTimeType(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue());
+                kpiMetaDataDTOList = eventFeignClient.queryItemCountData(quarterFromDto).getData();
+                insertBatch(ConvertUtils.sourceToTarget(kpiMetaDataDTOList, KpiMetaDataEntity.class));
+            }
+
+            // 一月份统计去年的
+            if (nowMonth == NumConstant.ONE) {
+                monthFromDto.setTimeType(KpiCycleEnum.KPI_CYCLE_YEAR.getValue());
+                kpiMetaDataDTOList = eventFeignClient.queryItemCountData(yearFromDto).getData();
+                insertBatch(ConvertUtils.sourceToTarget(kpiMetaDataDTOList, KpiMetaDataEntity.class));
+            }
+            //页码
+            pageIndex++;
+            deptIdList = deptUtils.getDeptIdList(dept, pageSize, pageIndex);
+        }while (CollUtil.isNotEmpty(deptIdList));
+    }
 }