From 9f5a2222b151124a399bf6f0dd6d236fc380ec99 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, 3 Mar 2022 09:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1screenBaseR?= =?UTF-8?q?eportDataPushTask?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/screen/form/ItemCountParamDTO.java | 33 ++++ .../epdc-analysis-server/pom.xml | 2 +- .../ScreenBaseReportDataController.java | 153 +++++++++++------- .../screen/dao/ScreenBaseReportDataDao.java | 5 +- .../service/ScreenBaseReportDataService.java | 77 +++++---- .../impl/ScreenBaseReportDataServiceImpl.java | 90 +++++++++-- .../mapper/screen/ScreenBaseReportDataDao.xml | 90 ++++++++--- .../esua/epdc/feign/AnalysisFeignClient.java | 5 +- .../fallback/AnalysisFeignClientFallback.java | 5 +- .../ScreenBaseReportDataPushTaskImpl.java | 21 ++- 10 files changed, 332 insertions(+), 149 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ItemCountParamDTO.java diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ItemCountParamDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ItemCountParamDTO.java new file mode 100644 index 00000000..7d16730a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ItemCountParamDTO.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.dto.screen.form; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * @author: qushutong + * @Date: 2022/2/23 16:58 + * @Description: 项目总数数据推送 + */ +@Data +public class ItemCountParamDTO implements Serializable { + private static final long serialVersionUID = 1132628937660635407L; + + /** + * 截止时间 + */ + private String endTime; + + /** + * 客户id + */ + private String customId; + + /** + * 开始时间 + */ + private String startTime; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml index 7a15522c..7ab1f96c 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml @@ -190,7 +190,7 @@ true 172.16.0.7:10000,172.16.0.7:10001 - 172.16.0.8 + 172.16.0.7 https://epmet-open.pingyin.gov.cn/api 0f2ad2929f1e4f778dc1e90a64d154e572af864ea0eb4d73be56480f0af34ba1 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportDataController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportDataController.java index 2a399e95..17bfc638 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportDataController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportDataController.java @@ -1,9 +1,11 @@ package com.elink.esua.epdc.modules.screen.controller; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO; import com.elink.esua.epdc.modules.screen.service.ScreenBaseReportDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,170 +23,197 @@ public class ScreenBaseReportDataController { private ScreenBaseReportDataService screenBaseReportDataService; /** - * @Description 网格状态话题数据 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 网格状态话题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @PostMapping("gridtopicstatus") - Result gridTopicStatus(){ + Result gridTopicStatus() { return screenBaseReportDataService.gridTopicStatus(); - }; + } + + ; /** - * @Description 组织状态话题数据 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 组织状态话题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @PostMapping("agencytopicstatus") - Result agencyTopicStatus(){ + Result agencyTopicStatus() { return screenBaseReportDataService.agencyTopicStatus(); - }; + } + + ; /** - * @Description 网格话题转议题数据 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 网格话题转议题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @PostMapping("gridtopicissue") - Result gridTopicIssue(){ + Result gridTopicIssue() { return screenBaseReportDataService.gridTopicIssue(); - }; + } + + ; /** - * @Description 组织话题转议题数据 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 组织话题转议题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @PostMapping("agencytopicissue") - Result agencyTopicIssue(){ + Result agencyTopicIssue() { return screenBaseReportDataService.agencyTopicIssue(); - }; + } + ; /** - * @Description 网格项目数据 + * @Description 网格项目数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ @PostMapping("gridproject") - Result selectGridProjectList(){ - return screenBaseReportDataService.selectGridProjectList(); - }; + Result selectGridProjectList(@RequestBody ItemCountParamDTO paramDto) { + return screenBaseReportDataService.selectGridProjectList(paramDto); + } + + ; /** - * @Description 组织项目数据 + * @Description 组织项目数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ @PostMapping("agencyproject") - Result selectCommunityProjectList(){ - return screenBaseReportDataService.selectCommunityProjectList(); - }; + Result selectCommunityProjectList(@RequestBody ItemCountParamDTO paramDto) { + return screenBaseReportDataService.selectCommunityProjectList(paramDto); + } + + ; /** - * @Description 网格群组总数 + * @Description 网格群组总数 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ @PostMapping("gridgrouptotal") - Result selectGridGroupTotalList(){ + Result selectGridGroupTotalList() { return screenBaseReportDataService.selectGridGroupTotalList(); - }; + } + + ; /** - * @Description 组织群组总数 + * @Description 组织群组总数 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ @PostMapping("agencygrouptotal") - Result selectCommunityGroupTotalList(){ + Result selectCommunityGroupTotalList() { return screenBaseReportDataService.selectCommunityGroupTotalList(); - }; + } + + ; /** - * @Description 网格热议话题数据 + * @Description 网格热议话题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ @PostMapping("gridhottopic") - Result selectGridHotTopic(){ + Result selectGridHotTopic() { return screenBaseReportDataService.selectGridHotTopic(); - }; + } + + ; /** - * @Description 组织热议话题数据 + * @Description 组织热议话题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ @PostMapping("agencyhottopic") - Result selectAgencyHotTopic(){ + Result selectAgencyHotTopic() { return screenBaseReportDataService.selectAgencyHotTopic(); - }; + } + + ; /** - * @Description 网格议题数据 + * @Description 网格议题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ @PostMapping("gridissue") - Result selectGridIssue(){ + Result selectGridIssue() { return screenBaseReportDataService.selectGridIssue(); - }; + } + + ; /** - * @Description 组织议题数据 + * @Description 组织议题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ @PostMapping("agencyissue") - Result selectAgencyIssue(){ + Result selectAgencyIssue() { return screenBaseReportDataService.selectAgencyIssue(); - }; + } + + ; /** - * @Description 网格注册用户数据 + * @Description 网格注册用户数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ @PostMapping("gridreguser") - Result selectGridRegUser(){ + Result selectGridRegUser() { return screenBaseReportDataService.selectGridRegUser(); - }; + } + + ; /** - * @Description 组织注册用户数据 + * @Description 组织注册用户数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ @PostMapping("agencyreguser") - Result selectAgencyRegUser(){ + Result selectAgencyRegUser() { return screenBaseReportDataService.selectAgencyRegUser(); - }; + } + + ; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java index 9ec1c963..75258729 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.modules.screen.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO; import com.elink.esua.epdc.dto.screen.form.ScreenBaseReportDataFormDTO; import com.elink.esua.epdc.dto.screen.result.*; import org.apache.ibatis.annotations.Mapper; @@ -59,7 +60,7 @@ public interface ScreenBaseReportDataDao extends BaseDao **/ - List selectGridProjectList(@Param("customId")String customId); + List selectGridProjectList(ItemCountParamDTO paramDto); /** * @Description 组织项目数据 @@ -68,7 +69,7 @@ public interface ScreenBaseReportDataDao extends BaseDao **/ - List selectCommunityProjectList(@Param("customId")String customId); + List selectCommunityProjectList(ItemCountParamDTO paramDto); /** diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportDataService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportDataService.java index b75682b3..6a8c3748 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportDataService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportDataService.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.modules.screen.service; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO; /** * 平阴-大屏基础信息上报 @@ -10,127 +11,125 @@ import com.elink.esua.epdc.commons.tools.utils.Result; */ public interface ScreenBaseReportDataService { /** - * @Description 网格状态话题数据 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 网格状态话题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result gridTopicStatus(); - /** - * @Description 组织状态话题数据 + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 组织状态话题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result agencyTopicStatus(); - /** - * @Description 网格话题转议题数据 + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 网格话题转议题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result gridTopicIssue(); - /** - * @Description 组织话题转议题数据 + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 组织话题转议题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result agencyTopicIssue(); /** - * @Description 网格项目数据 + * @Description 网格项目数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ - Result selectGridProjectList(); + Result selectGridProjectList(ItemCountParamDTO paramDto); /** - * @Description 组织项目数据 + * @Description 组织项目数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ - Result selectCommunityProjectList(); + Result selectCommunityProjectList(ItemCountParamDTO paramDto); /** - * @Description 网格群组总数 + * @Description 网格群组总数 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ Result selectGridGroupTotalList(); /** - * @Description 组织群组总数 + * @Description 组织群组总数 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ Result selectCommunityGroupTotalList(); - - /** - * @Description 网格热议话题数据 + * @Description 网格热议话题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ Result selectGridHotTopic(); /** - * @Description 组织热议话题数据 + * @Description 组织热议话题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ Result selectAgencyHotTopic(); /** - * @Description 网格议题数据 + * @Description 网格议题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ Result selectGridIssue(); /** - * @Description 组织议题数据 + * @Description 组织议题数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ Result selectAgencyIssue(); /** - * @Description 网格注册用户数据 + * @Description 网格注册用户数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ Result selectGridRegUser(); /** - * @Description 组织注册用户数据 + * @Description 组织注册用户数据 * @Author songyunpeng - * @Date 2021/6/25 + * @Date 2021/6/25 * @Param [customId] **/ Result selectAgencyRegUser(); diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java index 1c148869..26230b14 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.screen.service.impl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.EpmetConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO; import com.elink.esua.epdc.dto.screen.form.ScreenBaseReportDataFormDTO; import com.elink.esua.epdc.dto.screen.result.*; import com.elink.esua.epdc.modules.screen.dao.ScreenBaseReportDataDao; @@ -10,10 +11,15 @@ import com.elink.esua.epdc.modules.screen.service.ScreenBaseReportDataService; import com.elink.esua.epdc.utils.EpmetUtils; import com.elink.esua.epdc.utils.ScreenDataUtils; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.Optional; @@ -68,22 +74,82 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl gridGridProjectResultDTOS = baseDao.selectGridProjectList(customerId); - String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS,true); - // 数据上报 - String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson); - log.info(body); + public Result selectGridProjectList(ItemCountParamDTO paramDto) { + paramDto.setCustomId(customerId); + + if (StringUtils.isBlank(paramDto.getEndTime())) { + List gridGridProjectResultDTOS = baseDao.selectGridProjectList(paramDto); + String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS,true); + log.info("正常网格项目数据上报数据 " + dataJson); + // 数据上报 + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson); + log.info("正常网格项目数据上报返回 " + body); + } else { + // 推送所有日期 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar ca = Calendar.getInstance(); + Date curDate = null; + Date endDate = null; + try { + curDate = sdf.parse(paramDto.getStartTime()); + endDate = sdf.parse(paramDto.getEndTime()); + } catch (ParseException e) { + e.printStackTrace(); + } + int i =curDate.compareTo(endDate); + while (curDate.compareTo(endDate) <= 0) { + ca.setTime(curDate); + paramDto.setEndTime(sdf.format(curDate)); + ca.add(Calendar.DAY_OF_MONTH, 1); + curDate = ca.getTime(); + List gridGridProjectResultDTOS = baseDao.selectGridProjectList(paramDto); + String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS,true); + log.info("网格项目数据上报数据 " + dataJson); + // 数据上报 + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson); + log.info("网格项目数据上报返回 " + body); + } + } return new Result(); } @Override - public Result selectCommunityProjectList() { - List communityProjectResultDTOS = baseDao.selectCommunityProjectList(customerId); - String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS,true); - // 数据上报 - String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson); - log.info(body); + public Result selectCommunityProjectList(ItemCountParamDTO paramDto) { + paramDto.setCustomId(customerId); + + if (StringUtils.isBlank(paramDto.getEndTime())) { + List communityProjectResultDTOS = baseDao.selectCommunityProjectList(paramDto); + String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS,true); + log.info("正常组织项目数据上报数据 " + dataJson); + // 数据上报 + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson); + log.info("正常组织项目数据上报返回 " + body); + } else { + // 推送所有日期 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar ca = Calendar.getInstance(); + Date curDate = null; + Date endDate = null; + try { + curDate = sdf.parse(paramDto.getStartTime()); + endDate = sdf.parse(paramDto.getEndTime()); + } catch (ParseException e) { + e.printStackTrace(); + } + int i =curDate.compareTo(endDate); + while (curDate.compareTo(endDate) <= 0) { + ca.setTime(curDate); + paramDto.setEndTime(sdf.format(curDate)); + ca.add(Calendar.DAY_OF_MONTH, 1); + curDate = ca.getTime(); + List communityProjectResultDTOS = baseDao.selectCommunityProjectList(paramDto); + String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS,true); + log.info("组织项目数据上报数据 " + dataJson); + // 数据上报 + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson); + log.info("组织项目数据上报返回 " + body); + } + } return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml index 95d675e3..5242b819 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml @@ -303,16 +303,32 @@ grid.id as gridId, grid.pid as agencyId, '${customId}' as customerId, - DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId, - CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), - 'W', - WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId, - DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId, - CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), - 'Q', - QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), - '%Y-%m-%d'))) quarterId, - DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId, + + + DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y%m%d') as dateId, + CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), + 'W', + WEEK(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId, + DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId, + CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), + 'Q', + QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), + '%Y-%m-%d'))) quarterId, + DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId, + + + DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId, + CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), + 'W', + WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId, + DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId, + CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'), + 'Q', + QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), + '%Y-%m-%d'))) quarterId, + DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId, + + ifnull(count(ei.ID),0) as projectTotal, ifnull(count(ei.ITEM_STATE = '0' or null),0) as pendingTotal, ifnull(round(ifnull(count(ei.ITEM_STATE = '0' or null),0) / ifnull(count(ei.ID),0) * 100),0) as pendingRatio, @@ -339,7 +355,14 @@ where grid.del_flag = '0' and grid.type_key = 'grid_party' and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') - and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') + + + and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d') + + + and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') + + group by grid.id