From c2c915871b9a1d2c93f7c7bc5452b5ed2a25f033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 19 Dec 2019 14:43:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=BC=E5=8F=AB=E6=80=BB?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/ResourceFeignClient.java | 2 +- .../esua/epdc/feign/UserFeignClient.java | 2 +- esua-epdc/epdc-gateway/pom.xml | 8 +- .../form/EpdcEventsItemMataFromDTO.java | 45 +++++++++++ .../item/controller/ItemController.java | 15 ++++ .../esua/epdc/modules/item/dao/ItemDao.java | 11 +++ .../modules/item/service/ItemService.java | 10 +++ .../item/service/impl/ItemServiceImpl.java | 8 ++ .../main/resources/mapper/item/ItemDao.xml | 40 +++++++--- .../controller/KpiMetaDataController.java | 6 +- .../esua/epdc/feign/AdminFeignClient.java | 2 +- .../esua/epdc/feign/EventFeignClient.java | 18 ++++- .../fallback/EventFeignClientFallback.java | 7 ++ .../esua/epdc/service/KpiMetaDataService.java | 10 +++ .../service/impl/KpiMetaDataServiceImpl.java | 79 +++++++++++++++++++ 15 files changed, 242 insertions(+), 21 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsItemMataFromDTO.java diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java index 8077f0782..9f6656153 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java +++ b/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 { /** * 获取所有资源列表 diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 88e354940..0caf32001 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/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 { /** diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index a6980a704..daac2269c 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -99,8 +99,8 @@ lb://epdc-auth-server - lb://epdc-admin-server - + + http://127.0.0.1:9092 lb://epdc-activiti-server @@ -116,8 +116,8 @@ http://127.0.0.1:9064 lb://epdc-oss-server - lb://epdc-events-server - + + http://127.0.0.1:9066 lb://epdc-services-server diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsItemMataFromDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsItemMataFromDTO.java new file mode 100644 index 000000000..3284cdf76 --- /dev/null +++ b/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 deptIdList; + + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index e37250a85..536890ba3 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/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> + * @author qushutong + * @date 2019/12/18 16:02 + */ + @PostMapping("queryItemCountData") + Result> queryItemCountData(@RequestBody EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO){ + + return itemService.ListItemCountData(epdcEventsItemMataFromDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index eab0cdd0e..b3229cdea 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/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 { */ List selectListKpiEvaluationData(KpiEventEvaluationFromDTO kpiEventEvaluationFromDto); + + /*** + * 网格呼叫事项总数 与响应呼叫数（议题流转项目） + * @param epdcEventsItemMataFromDTO + * @return java.util.List + * @author qushutong + * @date 2019/12/18 16:23 + */ + List selectListItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO); + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index e6133ecce..d60075c9e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/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 { * @date 2019/12/18 10:30 */ Result> ListEvaluationData(KpiEventEvaluationFromDTO kpiEventEvaluationFromDto); + + /*** + * 网格呼叫事项总数 与响应呼叫数（议题流转项目） + * @param epdcEventsItemMataFromDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/18 16:02 + */ + Result> ListItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 5adbd1f82..bcbe23395 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/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 implem kpiMetaDataDTOList.addAll(bestList); return new Result>().ok(kpiMetaDataDTOList); } + + @Override + public Result> ListItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO) { + //网格呼叫事件总数 + epdcEventsItemMataFromDTO.setItemCountType(NumConstant.ZERO_STR); + return new Result>().ok(baseDao.selectListItemCountData(epdcEventsItemMataFromDTO)); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index eb85fe7e7..c3833876f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -807,22 +807,42 @@ + + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java index 2797b4d7f..a91c9e1f6 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java +++ b/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(); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 6d16111c7..d437de897 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/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 { /** diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java index 46b473e1c..61c947b2c 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java +++ b/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> * @author qushutong @@ -54,4 +55,17 @@ public interface EventFeignClient { @PostMapping(value = "events/item/queryEvaluationData", consumes = MediaType.APPLICATION_JSON_VALUE) Result> queryEvaluationData(KpiEventEvaluationFromDTO kpiEventEvaluationFromDto); + + + /*** + * kpi 构建数据 响应网格呼叫数 网格呼叫总数 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/18 15:58 + */ + @PostMapping(value = "events/item/queryItemCountData", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> queryItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO); + + } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java index 35092d182..4f16451d8 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java +++ b/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> queryEvaluationData(KpiEventEvaluationFromDTO kpiEventEvaluationFromDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryEvaluationData", kpiEventEvaluationFromDto); } + + @Override + public Result> queryItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryItemCountData", epdcEventsItemMataFromDTO); + } + } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java index 5f47a5908..2c82ca054 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java +++ b/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 { * @date 2019/12/18 9:34 */ void createEvaluationData(); + + + /*** + * 构建元数据 网格呼叫总数 网格响应呼叫数 + * @param + * @return void + * @author qushutong + * @date 2019/12/18 18:21 + */ + void createItemMataData(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java index d1db66cc4..cf8f5c900 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java +++ b/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 kpiMetaDataDTOList; + //容量 + int pageSize = 10; + //页码 + int pageIndex = 1; + List 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)); + } } \ No newline at end of file