From 8aeac66c45c821b7e26744d51de23a64654c515f Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 3 Feb 2021 13:58:05 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkLogAnalysisController.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/worklog/controller/WorkLogAnalysisController.java diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/worklog/controller/WorkLogAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/worklog/controller/WorkLogAnalysisController.java new file mode 100644 index 0000000..406cc0c --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/worklog/controller/WorkLogAnalysisController.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.modules.worklog.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description 获取customID + * @Author songyunpeng + * @Date 2020/2/10 16:06 + */ +@RestController +@RequestMapping("workLog") +public class WorkLogAnalysisController { + + @Value("${epmet.config.customerId}") + private String customId; + + + /** + * @Description 获取customId + * @Author songyunpeng + * @Date 2021/1/27 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping("getCustomId") + public Result getCustomId(){ + return new Result().ok(customId); + } + + + +} From e001fbf737eba4fae03f8095bc416e4e9e00bb0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 26 Feb 2021 11:00:49 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=90=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 12 ++++++++++++ epdc-cloud-client-yushan | 1 + epdc-cloud-commons-yushan | 1 + epdc-cloud-gateway-yushan | 1 + epdc-cloud-parent-yushan | 1 + pom.xml | 20 ++++++++++++++++++++ 6 files changed, 36 insertions(+) create mode 100644 .gitmodules create mode 160000 epdc-cloud-client-yushan create mode 160000 epdc-cloud-commons-yushan create mode 160000 epdc-cloud-gateway-yushan create mode 160000 epdc-cloud-parent-yushan create mode 100644 pom.xml diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3f1f4a2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,12 @@ +[submodule "epdc-cloud-client-yushan"] + path = epdc-cloud-client-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-client-yushan.git +[submodule "epdc-cloud-commons-yushan"] + path = epdc-cloud-commons-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-commons-yushan.git +[submodule "epdc-cloud-gateway-yushan"] + path = epdc-cloud-gateway-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-gateway-yushan.git +[submodule "epdc-cloud-parent-yushan"] + path = epdc-cloud-parent-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-parent-yushan.git diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan new file mode 160000 index 0000000..2b151d9 --- /dev/null +++ b/epdc-cloud-client-yushan @@ -0,0 +1 @@ +Subproject commit 2b151d97fc6d0d2068ed5f46934f41dd57d50c44 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan new file mode 160000 index 0000000..3c32a04 --- /dev/null +++ b/epdc-cloud-commons-yushan @@ -0,0 +1 @@ +Subproject commit 3c32a04b69a4bef06bc48c3d9c17a5a1d96a8fed diff --git a/epdc-cloud-gateway-yushan b/epdc-cloud-gateway-yushan new file mode 160000 index 0000000..61799e3 --- /dev/null +++ b/epdc-cloud-gateway-yushan @@ -0,0 +1 @@ +Subproject commit 61799e3a8e58e4d1b60a390ae2d6147a4ef5342a diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan new file mode 160000 index 0000000..db92131 --- /dev/null +++ b/epdc-cloud-parent-yushan @@ -0,0 +1 @@ +Subproject commit db9213163f8005cba05ad21334bebb72484174b7 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..9c7af19 --- /dev/null +++ b/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.esua.epdc.yushan + epdc-cloud-analysis-pc-yushan + 1.0.0 + pom + 榆山党群e家微服务数据分析模块 + + + epdc-cloud-analysis-pc + epdc-cloud-client-yushan + epdc-cloud-commons-yushan + epdc-cloud-gateway-yushan + epdc-cloud-parent-yushan + + From 73495278f51cc9e9590511168100f073f36e88ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 26 Feb 2021 21:51:18 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenProjectDataController.java | 96 + .../ScreenPublicDataController.java | 115 + .../screen/dao/ScreenProjectDataDao.java | 70 + .../screen/dao/ScreenPublicDataDao.java | 91 +- .../service/ScreenProjectDataService.java | 69 + .../service/ScreenPublicDataService.java | 95 + .../impl/ScreenProjectDataServiceImpl.java | 126 + .../impl/ScreenPublicDataServiceImpl.java | 239 +- .../esua/epdc/utils/ScreenDataUtils.java | 33 + .../mapper/screen/ScreenProjectDataDao.xml | 388 +++ .../mapper/screen/ScreenPublicDataDao.xml | 3001 +++++++++++++++++ epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 13 files changed, 4317 insertions(+), 10 deletions(-) create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java create mode 100644 epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java new file mode 100644 index 0000000..cf40b1e --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java @@ -0,0 +1,96 @@ +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.ScreenProjectFormDTO; +import com.elink.esua.epdc.modules.screen.service.ScreenProjectDataService; +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; + +/** + * 大屏项目数据上报 + * + * @Author：songyunpeng + * @Date：2021/2/23 14:06 + */ +@RestController +@RequestMapping("data/stats/project") +public class ScreenProjectDataController { + + + @Autowired + private ScreenProjectDataService screenProjectDataService; + + /** + * @Description 项目信息上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("uploadprojectinfo") + private Result uploadProjectInfo(@RequestBody ScreenProjectFormDTO screenProjectFormDTO){ + return screenProjectDataService.uploadProjectInfo(screenProjectFormDTO); + } + /** + * @Description 项目处理进展上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("uploadprojectprocess") + private Result uploadProjectProcess(@RequestBody ScreenProjectFormDTO screenProjectFormDTO){ + return screenProjectDataService.uploadProjectProcess(screenProjectFormDTO); + } + + /** + * @describe: 【事件/项目分析】网格内事件 + * @author wangtong + * @date 2021/2/23 14:53 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("project-grid-daily") + private Result projectGridDaily(){ + return screenProjectDataService.projectGridDaily(); + } + + /** + * @describe: 【事件/项目分析】组织内事件 + * @author wangtong + * @date 2021/2/24 9:29 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("project/project-org-daily") + private Result projectOrgDaily(){ + return screenProjectDataService.projectOrgDaily(); + } + + /** + * @describe: 【事件/项目分析】网格内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:38 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("quantity-grid-monthly") + private Result quantityGridMonthly(){ + return screenProjectDataService.quantityGridMonthly(); + } + + /** + * @describe: 【事件/项目分析】组织内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:57 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("quantity-org-monthly") + private Result quantityOrgMonthly(){ + return screenProjectDataService.quantityOrgMonthly(); + } +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java index 7ecdd79..0677690 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java @@ -56,4 +56,119 @@ public class ScreenPublicDataController { return screenPublicDataService.customerDept(); } + /** + * @describe: 001、基层党建-党员基本情况 + * @author wk + * @date 2020/8/19 17:25 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("cpcbasedata") + public Result cpcbasedata() { + return screenPublicDataService.cpcbasedata(); + } + /** + * @describe: 002、党建引领-先锋模范数据 + * @author wangtong + * @date 2020/8/20 18:02 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("pioneerdata") + public Result pioneerdata() { + return screenPublicDataService.pioneerdata(); + } + + /** + * @describe: 003、党建引领-党员联系群众数据 + * @author wangtong + * @date 2020/8/20 14:25 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("partylinkmassesdata") + public Result partylinkmassesdata() { + return screenPublicDataService.partylinkmassesdata(); + } + /** + * 004、党建引领-先进排行榜单-先进支部排行 + * @Params: + * @Return: OrgrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + @PostMapping("orgrankdata") + public Result orgrankdata() { + return screenPublicDataService.getOrgrankdata(); + } + /** + * 005、党建引领|基层治理-居民（党员）积分排行榜 + * @Params: + * @Return: PartyuserrankdataResultDTO + * @Author: wk + * @Date: 2020/08/20 + */ + @PostMapping("partyuserrankdata") + public Result partyuserrankdata() { + return screenPublicDataService.getPartyuserrankdata(); + + } + /** + * 006、基层治理-难点赌点项目上报 + * @Params: + * @Return: DifficultydataResultDTO + * @Author: wk + * @Date: 2020/08/19 + */ + @PostMapping("difficultydata") + public Result difficultydata() { + return screenPublicDataService.getDifficultydata(); + } + /** + * 007、基层治理-公众参与 + * @Params: + * @Return: UserjoinResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/20 + */ + @PostMapping("userjoin") + public Result userjoin() { + return screenPublicDataService.getUserjoin(); + + } + /** + * @describe: 008、公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("publicpartitotaldata") + public Result publicpartitotaldata() { + return screenPublicDataService.publicpartitotaldata(); + } + /** + * 009、基层治理-治理能力数据 + * @Params: + * @Return: GovernrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + @PostMapping("governrankdata") + public Result governrankdata() { + return screenPublicDataService.getGovernrankdata(); + } + /** + * @describe: 010、中央区各类总数 + * @author wk + * @date 2020/8/21 10:32 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("usertotaldata") + public Result usertotaldata() { + return screenPublicDataService.usertotaldata(); + } + + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java new file mode 100644 index 0000000..86b8953 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java @@ -0,0 +1,70 @@ +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.ScreenProjectFormDTO; +import com.elink.esua.epdc.dto.screen.result.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Author：songunpeng + * @Date：2021/2/23 18:03 + */ +@Mapper +public interface ScreenProjectDataDao extends BaseDao { + + /** + * @Description 项目信息上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return java.util.List + * + * @param screenProjectFormDTO*/ + List uploadProjectInfo(ScreenProjectFormDTO screenProjectFormDTO); + /** + * @Description 项目处理进展上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return java.util.List + **/ + List uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO); + /** + * @describe: + * @author wangtong + * @date 2021/2/23 14:55 + * @params [] + * @return java.util.List + */ + List selectProjectGridDaily(@Param("yesterDayDate") String yesterDayDate); + + /** + * @describe: 【事件/项目分析】组织内事件 + * @author wangtong + * @date 2021/2/24 9:30 + * @params [yesterDayDate] + * @return java.util.List + */ + List selectProjectOrgDaily(@Param("yesterDayDate") String yesterDayDate); + + /** + * @describe: 【事件/项目分析】网格内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:43 + * @params [lastMonth] + * @return java.util.List + */ + List selectQuantityGridMonthly(@Param("lastMonth") String lastMonth); + + /** + * @describe: 【事件/项目分析】组织内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:58 + * @params [lastMonth] + * @return java.util.List + */ + List selectQuantityOrgMonthly(@Param("lastMonth") String lastMonth); +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java index 3b02211..d6970da 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java @@ -1,10 +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.result.ScreenCustomerAgencyDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenCustomerDeptDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenCustomerGridDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenPublicDataResultDTO; +import com.elink.esua.epdc.dto.screen.result.*; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -42,4 +39,90 @@ public interface ScreenPublicDataDao extends BaseDao * @since 2020/9/17 14:23 */ List customerDept(); + + /** + * @describe: 001、基层党建-党员基本情况 + * @author wk + * @date 2020/8/19 17:25 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List cpcbasedata(); + /** + * @describe: 002、党建引领-先锋模范数据 + * @author wangtong + * @date 2020/8/20 18:02 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List pioneerdata(); + + /** + * @describe: 003、党建引领-党员联系群众数据 + * @author wangtong + * @date 2020/8/20 14:25 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List partylinkmassesdata(); + /** + * 004、党建引领-先进排行榜单-先进支部排行 + * @Params: + * @Return: OrgrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + List getOrgrankdata(); + /** + * 005、党建引领|基层治理-居民（党员）积分排行榜 + * @Params: + * @Return: PartyuserrankdataResultDTO + * @Author: wk + * @Date: 2020/08/20 + */ + List getPartyuserrankdata(); + /** + * 006、基层治理-难点赌点项目上报 + * @Params: + * @Return: DifficultydataResultDTO + * @Author: wk + * @Date: 2020/08/19 + */ + List getDifficultydata(); + + /** + * 007、基层治理-公众参与 + * @Params: + * @Return: UserjoinResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/20 + */ + List getUserjoin(); + + /** + * @describe: 008、公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List publicpartitotaldata(); + /** + * 009、基层治理-治理能力数据 + * @Params: + * @Return: GovernrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + List getGovernrankdata(); + + + /** + * @describe: 中央区各类总数 + * @author wk + * @date 2020/8/21 10:32 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List usertotaldata(); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java new file mode 100644 index 0000000..004eac2 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java @@ -0,0 +1,69 @@ +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.ScreenProjectFormDTO; + +/** + * 大屏项目信息上报 + * + * @Author：songyunpeng + * @Date：2020/2/23 18:04 + */ +public interface ScreenProjectDataService { + + /** + * @Description 项目信息上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * + * @param screenProjectFormDTO*/ + Result uploadProjectInfo(ScreenProjectFormDTO screenProjectFormDTO); + + /** + * @Description 项目处理进展上报 + * @Author songyunpeng + * @Date 2021/2/23 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * + * @param screenProjectFormDTO*/ + Result uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO); + + /** + * @describe: 【事件/项目分析】网格内事件 + * @author wangtong + * @date 2021/2/23 14:54 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result projectGridDaily(); + + /** + * @describe: 事件/项目分析】组织内事件 + * @author wangtong + * @date 2021/2/24 9:29 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result projectOrgDaily(); + + /** + * @describe: 【事件/项目分析】网格内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:39 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result quantityGridMonthly(); + + /** + * @describe: 【事件/项目分析】组织内月度数量统计 + * @author wangtong + * @date 2021/2/24 10:57 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result quantityOrgMonthly(); +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java index a86af7e..27f543c 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java @@ -36,4 +36,99 @@ public interface ScreenPublicDataService { * @since 2020/9/17 14:24 */ Result customerDept(); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 001、基层党建-党员基本情况 + * @author wk + * @date 2020/8/19 17:25 + * @params [] + */ + Result cpcbasedata(); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 002、党建引领-先锋模范数据 + * @author wangtong + * @date 2020/8/20 18:02 + * @params [] + */ + Result pioneerdata(); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 003、党建引领-党员联系群众数据 + * @author wangtong + * @date 2020/8/20 14:25 + * @params [] + */ + Result partylinkmassesdata(); + + /** + * 004、党建引领-先进排行榜单-先进支部排行 + * + * @Params: + * @Return: OrgrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + Result getOrgrankdata(); + + /** + * 005、党建引领|基层治理-居民（党员）积分排行榜 + * + * @Params: + * @Return: PartyuserrankdataResultDTO + * @Author: wk + * @Date: 2020/08/20 + */ + Result getPartyuserrankdata(); + + /** + * 006、基层治理-难点赌点项目上报 + * + * @Params: + * @Return: DifficultydataResultDTO + * @Author: wk + * @Date: 2020/08/19 + */ + Result getDifficultydata(); + + /** + * 007、基层治理-公众参与 + * + * @Params: + * @Return: UserjoinResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/20 + */ + Result getUserjoin(); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 008、公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + */ + Result publicpartitotaldata(); + + /** + * 009、基层治理-治理能力数据 + * + * @Params: + * @Return: GovernrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + Result getGovernrankdata(); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 010 中央区各类总数 + * @author wk + * @date 2020/8/21 10:32 + * @params [] + */ + Result usertotaldata(); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java new file mode 100644 index 0000000..c552d1d --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java @@ -0,0 +1,126 @@ +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.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO; +import com.elink.esua.epdc.dto.screen.result.*; +import com.elink.esua.epdc.modules.screen.dao.ScreenProjectDataDao; +import com.elink.esua.epdc.modules.screen.service.ScreenProjectDataService; +import com.elink.esua.epdc.utils.EpmetUtils; +import com.elink.esua.epdc.utils.ScreenDataUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：liuchuang + * @Date：2020/9/9 18:05 + */ +@Service +public class ScreenProjectDataServiceImpl extends BaseServiceImpl implements ScreenProjectDataService { + @Autowired + private EpmetUtils epmetUtils; + + @Override + public Result uploadProjectInfo(ScreenProjectFormDTO screenProjectFormDTO) { + // 数据统计 + List data = baseDao.uploadProjectInfo(screenProjectFormDTO); + if(data.size()!=0) { + if (data.size() > 1000) { + List> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND); + if (formList != null && formList.size() > NumConstant.ZERO) { + for (int i = NumConstant.ZERO; i < formList.size(); i++) { + String dataJson = ""; + // 数据格式化 + dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson); + } + } + } else { + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson); + } + } + return new Result(); + } + + @Override + public Result uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO) { + // 数据统计 + List data = baseDao.uploadProjectProcess(screenProjectFormDTO); + if(data.size()!=0){ + if (data.size() > 1000) { + List> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND); + if (formList != null && formList.size() > NumConstant.ZERO) { + for (int i = NumConstant.ZERO; i < formList.size(); i++) { + String dataJson = ""; + // 数据格式化 + dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson); + } + } + } else { + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson); + } + } + return new Result(); + } + + @Override + public Result projectGridDaily() { + String yesterDayDate = ScreenDataUtils.getYesterdayDate(); + // 数据统计 + List data = baseDao.selectProjectGridDaily(yesterDayDate); + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataDateJson(data, true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_GRID_DAILY, dataJson); + return new Result(); + } + + @Override + public Result projectOrgDaily() { + String yesterDayDate = ScreenDataUtils.getYesterdayDate(); + // 数据统计 + List data = baseDao.selectProjectOrgDaily(yesterDayDate); + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataDateJson(data, true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_ORG_DAILY, dataJson); + return new Result(); + } + + @Override + public Result quantityGridMonthly() { + String lastMonth = ScreenDataUtils.getLastMonthDate(); + // 数据统计 + List data = baseDao.selectQuantityGridMonthly(lastMonth); + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataMonthJson(data, null,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_GRID_MONTHLY, dataJson); + return new Result(); + } + + @Override + public Result quantityOrgMonthly() { + String lastMonth = ScreenDataUtils.getLastMonthDate(); + // 数据统计 + List data = baseDao.selectQuantityOrgMonthly(lastMonth); + // 数据格式化 + String dataJson = ScreenDataUtils.getScreenDataMonthJson(data, null,true); + // 数据上报 + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_ORG_MONTHLY, dataJson); + return new Result(); + } +} diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java index 0ee86a2..5e419ec 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java @@ -4,23 +4,24 @@ import com.alibaba.fastjson.JSONObject; 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.result.ScreenCustomerAgencyDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenCustomerDeptDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenCustomerGridDTO; -import com.elink.esua.epdc.dto.screen.result.ScreenPublicDataResultDTO; +import com.elink.esua.epdc.dto.screen.result.*; import com.elink.esua.epdc.modules.screen.dao.ScreenPublicDataDao; import com.elink.esua.epdc.modules.screen.service.ScreenPublicDataService; import com.elink.esua.epdc.utils.EpmetUtils; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; + /** * @Author：liuchuang * @Date：2020/9/17 14:08 */ @Service +@Slf4j public class ScreenPublicDataServiceImpl extends BaseServiceImpl implements ScreenPublicDataService { @Autowired @@ -55,4 +56,234 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl + */ + @Override + public Result cpcbasedata() { + List list = baseDao.cpcbasedata(); + // 将list转换为json格式 + CpcbasedataDTO result = new CpcbasedataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_CPC_BASE, json); + log.info(body); + return null; + } + + /** + * @describe: 002、党建引领-先锋模范数据 + * @author wangtong + * @date 2020/8/20 18:02 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @Override + public Result pioneerdata() { + List list = baseDao.pioneerdata(); + // 将list转换为json格式 + PioneerdataDTO result = new PioneerdataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_PIONEER, json); + log.info(body); + return null; + } + + /** + * @describe: 003、党建引领-党员联系群众数据 + * @author wangtong + * @date 2020/8/20 14:25 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @Override + public Result partylinkmassesdata() { + List list = baseDao.partylinkmassesdata(); + // 将list转换为json格式 + PartylinkmassesdataDTO result = new PartylinkmassesdataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_PARTY_LINK_MESSAGE, json); + log.info(body); + return null; + } + + /** + * 004、党建引领-先进排行榜单-先进支部排行 + * @Params: + * @Return: OrgrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + @Override + public Result getOrgrankdata() { + List list = baseDao.getOrgrankdata(); + // 将list转换为json格式 + if(list != null && list.size()>0){ + OrgrankdataDTO result = new OrgrankdataDTO(); + result.setDataList(list); + result.setMonthId(list.get(0).getMonthId()); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_ORG_RANK, json); + log.info(body); + } + return null; + } + + /** + * 005、党建引领|基层治理-居民（党员）积分排行榜 + * @Params: + * @Return: PartyuserrankdataResultDTO + * @Author: wk + * @Date: 2020/08/20 + */ + @Override + public Result getPartyuserrankdata() { + List list = baseDao.getPartyuserrankdata(); + // 将list转换为json格式 + if(list != null && list.size()>0){ + PartyuserrankdataDTO result = new PartyuserrankdataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_PARTY_USER_RANK, json); + log.info(body); + } + return null; + } + + /** + * 006、基层治理-难点赌点项目上报 + * @Params: + * @Return: DifficultydataResultDTO + * @Author: wk + * @Date: 2020/08/19 + */ + @Override + public Result getDifficultydata() { + List list = baseDao.getDifficultydata(); + List> formList = fixedGrouping(list, 1000); + if (formList != null && formList.size()>0) { + for (int i = 0; i < formList.size(); i++) { + DifficultyResultDTO difficultyResultDTO = new DifficultyResultDTO(); + if (i == 0) { + difficultyResultDTO.setIsFirst(true); + } + difficultyResultDTO.setDataList(formList.get(i)); + // 将list转换为json格式 + String json = JSONObject.toJSONString(difficultyResultDTO); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_DIFFICULTY, json); + log.info(body); + } + } + return null; + } + + /** + * 007、基层治理-公众参与 + * @Params: + * @Return: UserjoinResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/20 + */ + @Override + public Result getUserjoin() { + List list = baseDao.getUserjoin(); + // 将list转换为json格式 + if(list != null && list.size()>0) { + UserjoinDTO result = new UserjoinDTO(); + result.setDataList(list); + result.setMonthId(list.get(0).getMonthId()); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_USER_JOIN, json); + log.info(body); + } + return null; + } + + /** + * @describe: 008、公众参与各类总数 + * @author wangtong + * @date 2020/8/24 18:27 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @Override + public Result publicpartitotaldata() { + List list = baseDao.publicpartitotaldata(); + // 将list转换为json格式 + PublicpartitotaldataDTO result = new PublicpartitotaldataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_PUBLIC_PARTY_TOTAL, json); + log.info(body); + return null; + } + + /** + * 009、基层治理-治理能力数据 + * @Params: + * @Return: GovernrankdataResultDTO + * @Author: wanggongfeng + * @Date: 2020/08/19 + */ + @Override + public Result getGovernrankdata() { + List list = baseDao.getGovernrankdata(); + // 将list转换为json格式 + if(list != null && list.size()>0){ + GovernrankdataDTO result = new GovernrankdataDTO(); + result.setDataList(list); + result.setMonthId(list.get(0).getMonthId()); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_GOVERN_RANK, json); + log.info(body); + } + return null; + } + + /** + * 将一组数据固定分组，每组n个元素 + * + * @param source 要分组的数据源 + * @param n 每组n个元素 + * @param + * @return + */ + public static List> fixedGrouping(List source, int n) { + + if (null == source || source.size() == 0 || n <= 0) + return null; + List> result = new ArrayList>(); + int remainder = source.size() % n; + int size = (source.size() / n); + for (int i = 0; i < size; i++) { + List subset = null; + subset = source.subList(i * n, (i + 1) * n); + result.add(subset); + } + if (remainder > 0) { + List subset = null; + subset = source.subList(size * n, size * n + remainder); + result.add(subset); + } + return result; + } + + @Override + public Result usertotaldata() { + List list = baseDao.usertotaldata(); + // 将list转换为json格式 + UsertotaldataDTO result = new UsertotaldataDTO(); + result.setDataList(list); + String json = JSONObject.toJSONString(result); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_USER_TOTAL, json); + log.info(body); + return null; + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java index 690da72..e06b3cb 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java @@ -6,7 +6,10 @@ import com.elink.esua.epdc.dto.screen.result.ScreenDataDateDTO; import com.elink.esua.epdc.dto.screen.result.ScreenDataMonthDTO; import org.apache.commons.lang3.StringUtils; +import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; /** * 大屏上报数据JSON处理 @@ -58,4 +61,34 @@ public class ScreenDataUtils { return JSONObject.toJSONString(dateDto); } + + /** + * @describe: 获取昨日日期：yyyy-MM-dd + * @author wangtong + * @date 2021/2/23 15:02 + * @params [] + * @return java.lang.String + */ + public static String getYesterdayDate(){ + SimpleDateFormat simpleDateFormat =new SimpleDateFormat("yyyy-MM-dd"); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(new Date()); + calendar.add(calendar.DATE,-1); + return simpleDateFormat.format(calendar.getTime()); + } + + /** + * @describe: 获取上个月日期：yyyy-MM + * @author wangtong + * @date 2021/2/24 10:40 + * @params [] + * @return java.lang.String + */ + public static String getLastMonthDate(){ + SimpleDateFormat simpleDateFormat =new SimpleDateFormat("yyyy-MM"); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(new Date()); + calendar.add(calendar.MONTH,-1); + return simpleDateFormat.format(calendar.getTime()); + } } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml new file mode 100644 index 0000000..7b17a56 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index 1fd3785..eb93074 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -63,5 +63,3006 @@ FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) + + + + + + + + + + + + + + + + + + + + diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 2b151d9..43f964b 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 2b151d97fc6d0d2068ed5f46934f41dd57d50c44 +Subproject commit 43f964b23834db67899f4dac0f97ab99d25e225a diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 3c32a04..c54cd39 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 3c32a04b69a4bef06bc48c3d9c17a5a1d96a8fed +Subproject commit c54cd39e2e6543aa4a96e186fd2270e3f8a178c9 From 19624bc6d88e7571e4c039827254e6f8db2c70ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 1 Mar 2021 17:52:13 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/common/EpdcTableName.xml | 22 +- .../mapper/screen/ScreenProjectDataDao.xml | 66 +-- .../mapper/screen/ScreenPublicDataDao.xml | 556 +++++++++--------- 3 files changed, 322 insertions(+), 322 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml index d933b52..85c4c55 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml @@ -5,7 +5,7 @@ - + yushan_esua_epdc_user - esua_epdc_admin - esua_epdc_analysis - esua_epdc_api - esua_epdc_custom - esua_epdc_events - esua_epdc_group - esua_epdc_mutuality - esua_epdc_news - esua_epdc_user + + + + + + + + + diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 7b17a56..05d442a 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -44,13 +44,13 @@ t1.CATEGORY_FULL_NAME as allCategoryName, t2.IMG_URL as projectImgUrl, t3.CREATED_TIME as closeCaseTime - from (select * from(select * from esua_epdc_events.epdc_item where DEL_FLAG = '0' + from (select * from(select * from .epdc_item where DEL_FLAG = '0' and GRID_ID not in ( SELECT t.`dept_id` FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) order by ID)a group by a.EVENT_ID) t1 - left join esua_epdc_events.epdc_img t2 on t1.EVENT_ID = t2.REFERENCE_ID and t1.DEL_FLAG = '0' - left join esua_epdc_events.epdc_item_handle_process t3 on t3.ITEM_ID = t1.ID and t3.DEL_FLAG = '0' and t3.STATE = 10 + left join .epdc_img t2 on t1.EVENT_ID = t2.REFERENCE_ID and t1.DEL_FLAG = '0' + left join .epdc_item_handle_process t3 on t3.ITEM_ID = t1.ID and t3.DEL_FLAG = '0' and t3.STATE = 10 where date_format(t1.UPDATED_TIME, '%Y-%m-%d') >= STR_TO_DATE(#{yearMonthDay}, '%Y-%m-%d') and date_format(t1.UPDATED_TIME, '%Y-%m-%d') <= date_sub(curdate(),interval 1 day) order by t2.CREATED_TIME @@ -91,17 +91,17 @@ t1.HANDLER_DEPT_ID as handlerId, 'unknown' as handlerType, case - when (t4.ID is not null and t1.STATE = 0 and t1.CREATED_TIME != (select min(t.CREATED_TIME) from esua_epdc_events.epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'transfer' - when (t4.ID is null and t1.STATE = 0 and t1.CREATED_TIME != (select min(t.CREATED_TIME) from esua_epdc_events.epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'response' - when (t1.STATE = 0 and t1.CREATED_TIME = (select min(t.CREATED_TIME) from esua_epdc_events.epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'created' + when (t4.ID is not null and t1.STATE = 0 and t1.CREATED_TIME != (select min(t.CREATED_TIME) from .epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'transfer' + when (t4.ID is null and t1.STATE = 0 and t1.CREATED_TIME != (select min(t.CREATED_TIME) from .epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'response' + when (t1.STATE = 0 and t1.CREATED_TIME = (select min(t.CREATED_TIME) from .epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'created' when t1.STATE = 5 then 'close' when t1.STATE = 10 then 'closed_case' else '' END as operation, t1.OUT_HANDLE_ADVICE as publicReply, t1.HANDLE_ADVICE as internalRemark, t1.CREATED_TIME as processTime - from esua_epdc_events.epdc_item_handle_process t1 - left join esua_epdc_events.epdc_item_dept t4 on t4.ITEM_HANDLE_ID = t1.ID and t4.DEL_FLAG = '0' + from .epdc_item_handle_process t1 + left join .epdc_item_dept t4 on t4.ITEM_HANDLE_ID = t1.ID and t4.DEL_FLAG = '0' where date_format(t1.UPDATED_TIME, '%Y-%m-%d') >= STR_TO_DATE(#{yearMonthDay}, '%Y-%m-%d') and date_format(t1.UPDATED_TIME, '%Y-%m-%d') <= date_sub(curdate(),interval 1 day) and t1.DEL_FLAG = '0' and t1.HANDLER_DEPT_ID not in ( SELECT t.`dept_id` @@ -109,7 +109,7 @@ WHERE t.`del_flag`= 0) group by t1.ID )t - left join esua_epdc_events.epdc_img t3 on t3.REFERENCE_ID = t.processId and t3.DEL_FLAG = '0' + left join .epdc_img t3 on t3.REFERENCE_ID = t.processId and t3.DEL_FLAG = '0' order by t3.CREATED_TIME diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index eb93074..ee93128 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -115,24 +115,24 @@ IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age, d.id as orgId FROM - esua_epdc_admin.sys_dept d + .`sys_dept` d left join (select eu.id, eu.BIRTHDAY, eu.DEPT_ID AS orgId, eu.PARTY_FLAG - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG = '0' )e on d.id=e.orgId WHERE d.DEL_FLAG = '0' and d.type_key='grid_party' AND d.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) ) t GROUP BY t.orgId ) t1 - left join esua_epdc_admin.sys_dept d on d.id=t1.orgId + left join .sys_dept d on d.id=t1.orgId ) total GROUP BY total.orgId @@ -189,26 +189,26 @@ IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age, co.id AS orgId FROM - esua_epdc_admin.sys_dept co - left join esua_epdc_admin.sys_dept gr on gr.pid=co.id + .sys_dept co + left join .sys_dept gr on gr.pid=co.id left join (select eu.id, eu.BIRTHDAY, eu.DEPT_ID AS orgId, eu.PARTY_FLAG - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG = '0' )e on gr.id=e.orgId WHERE co.DEL_FLAG = '0' and gr.DEL_FLAG = '0' and co.type_key='community_party' AND co.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) ) t GROUP BY t.orgId ) t1 - left join esua_epdc_admin.sys_dept d on d.id=t1.orgId + left join .sys_dept d on d.id=t1.orgId ) total GROUP BY total.orgId @@ -265,14 +265,14 @@ IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age, st.id AS orgId FROM - esua_epdc_admin.sys_dept st - left join esua_epdc_admin.sys_dept co on co.pid=st.id - left join esua_epdc_admin.sys_dept gr on gr.pid=co.id + .sys_dept st + left join .sys_dept co on co.pid=st.id + left join .sys_dept gr on gr.pid=co.id left join (select eu.id, eu.BIRTHDAY, eu.DEPT_ID AS orgId, eu.PARTY_FLAG - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG = '0' )e on gr.id=e.orgId WHERE st.DEL_FLAG = '0' @@ -280,13 +280,13 @@ and gr.DEL_FLAG = '0' and st.type_key='street_party' AND st.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) ) t GROUP BY t.orgId ) t1 - left join esua_epdc_admin.sys_dept d on d.id=t1.orgId + left join .sys_dept d on d.id=t1.orgId ) total GROUP BY total.orgId @@ -344,15 +344,15 @@ IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age, city.id AS orgId FROM - esua_epdc_admin.sys_dept city - left join esua_epdc_admin.sys_dept st on st.pid=city.id - left join esua_epdc_admin.sys_dept co on co.pid=st.id - left join esua_epdc_admin.sys_dept gr on gr.pid=co.id + .sys_dept city + left join .sys_dept st on st.pid=city.id + left join .sys_dept co on co.pid=st.id + left join .sys_dept gr on gr.pid=co.id left join (select eu.id, eu.BIRTHDAY, eu.DEPT_ID AS orgId, eu.PARTY_FLAG - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG = '0' )e on gr.id=e.orgId WHERE city.DEL_FLAG = '0' @@ -360,14 +360,14 @@ and co.DEL_FLAG = '0' and gr.DEL_FLAG = '0' AND city.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and city.type_key='district_party' ) t GROUP BY t.orgId ) t1 - left join esua_epdc_admin.sys_dept d on d.id=t1.orgId + left join .sys_dept d on d.id=t1.orgId ) total GROUP BY total.orgId @@ -394,7 +394,7 @@ IFNULL(shiftProjectTotal,0) AS shiftProjectRatioFm, IFNULL(resolvedProjectTotal,0) AS resolvedProjectRatioFm, IFNULL(issueSum,0) AS publishIssueRatioFm - FROM esua_epdc_admin.sys_dept gr + FROM .sys_dept gr left join (select total.GRID_ID, sum(total.issueSum) as issueSum, -- 议题总数 @@ -441,7 +441,7 @@ sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal, sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal, sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal - from esua_epdc_analysis.epdc_dept_event_person_time ed + from .epdc_dept_event_person_time ed where GRID_ID is not null group by ed.GRID_ID @@ -458,13 +458,13 @@ 0 as publishShiftProjectTotal, 0 as resolvedProjectTotal, 0 as publishResolvedProjectTotal - from esua_epdc_analysis.epdc_dept_group_person_time ed + from .epdc_dept_group_person_time ed where GRID_ID is not null group by ed.GRID_ID)total group by total.GRID_ID)t on gr.id=t.GRID_ID where gr.del_flag=0 AND gr.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and gr.type_key='grid_party' @@ -491,8 +491,8 @@ UNION ALL IFNULL(publishShiftProjectTotal,0) AS shiftProjectRatioFm, IFNULL(publishResolvedProjectTotal,0) AS resolvedProjectRatioFm, IFNULL(publishIssueSum,0) AS publishIssueRatioFm - FROM esua_epdc_admin.sys_dept co - LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid + FROM .sys_dept co + LEFT JOIN .sys_dept gr on co.id=gr.pid left join (select total.GRID_ID, sum(total.issueSum) as issueSum, -- 议题总数 @@ -539,7 +539,7 @@ UNION ALL sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal, sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal, sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal - from esua_epdc_analysis.epdc_dept_event_person_time ed + from .epdc_dept_event_person_time ed where GRID_ID is not null group by ed.GRID_ID @@ -556,7 +556,7 @@ UNION ALL 0 as publishShiftProjectTotal, 0 as resolvedProjectTotal, 0 as publishResolvedProjectTotal - from esua_epdc_analysis.epdc_dept_group_person_time ed + from .epdc_dept_group_person_time ed where GRID_ID is not null group by ed.GRID_ID)total group by total.GRID_ID)t on gr.id=t.GRID_ID @@ -564,7 +564,7 @@ UNION ALL and co.del_flag=0 and co.type_key='community_party' AND co.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY co.id @@ -590,9 +590,9 @@ union all IFNULL(publishShiftProjectTotal,0) AS shiftProjectRatioFm, IFNULL(publishResolvedProjectTotal,0) AS resolvedProjectRatioFm, IFNULL(publishIssueSum,0) AS publishIssueRatioFm - FROM esua_epdc_admin.sys_dept st - left join esua_epdc_admin.sys_dept co on co.pid=st.id - LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid + FROM .sys_dept st + left join .sys_dept co on co.pid=st.id + LEFT JOIN .sys_dept gr on co.id=gr.pid left join (select total.GRID_ID, sum(total.issueSum) as issueSum, -- 议题总数 @@ -639,7 +639,7 @@ union all sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal, sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal, sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal - from esua_epdc_analysis.epdc_dept_event_person_time ed + from .epdc_dept_event_person_time ed where GRID_ID is not null group by ed.GRID_ID @@ -656,7 +656,7 @@ union all 0 as publishShiftProjectTotal, 0 as resolvedProjectTotal, 0 as publishResolvedProjectTotal - from esua_epdc_analysis.epdc_dept_group_person_time ed + from .epdc_dept_group_person_time ed where GRID_ID is not null group by ed.GRID_ID)total group by total.GRID_ID)t on gr.id=t.GRID_ID @@ -665,7 +665,7 @@ union all and st.del_flag=0 and st.type_key='street_party' AND st.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY st.id @@ -691,10 +691,10 @@ union all IFNULL(publishShiftProjectTotal,0) AS shiftProjectRatioFm, IFNULL(publishResolvedProjectTotal,0) AS resolvedProjectRatioFm, IFNULL(publishIssueSum,0) AS publishIssueRatioFm - FROM esua_epdc_admin.sys_dept city - left join esua_epdc_admin.sys_dept st on st.pid=city.id - left join esua_epdc_admin.sys_dept co on co.pid=st.id - LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid + FROM .sys_dept city + left join .sys_dept st on st.pid=city.id + left join .sys_dept co on co.pid=st.id + LEFT JOIN .sys_dept gr on co.id=gr.pid left join (select total.GRID_ID, sum(total.issueSum) as issueSum, -- 议题总数 @@ -741,7 +741,7 @@ union all sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal, sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal, sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal - from esua_epdc_analysis.epdc_dept_event_person_time ed + from .epdc_dept_event_person_time ed where GRID_ID is not null group by ed.GRID_ID @@ -758,7 +758,7 @@ union all 0 as publishShiftProjectTotal, 0 as resolvedProjectTotal, 0 as publishResolvedProjectTotal - from esua_epdc_analysis.epdc_dept_group_person_time ed + from .epdc_dept_group_person_time ed where GRID_ID is not null group by ed.GRID_ID)total group by total.GRID_ID)t on gr.id=t.GRID_ID @@ -767,7 +767,7 @@ union all and st.del_flag=0 and city.DEL_FLAG=0 AND city.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and city.type_key='district_party' GROUP BY city.id @@ -784,22 +784,22 @@ select gr.id as orgId, IFNULL(dg.groupUserTotal,0) AS groupUserTotal, DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime, gr.area_code AS areaCode - from esua_epdc_admin.sys_dept gr + from .sys_dept gr left join (select eg.GRID_ID, count(eg.id) as createGroupTotal, sum(group_user.userCount) as groupUserTotal - from esua_epdc_group.epdc_group eg + from .epdc_group eg left join (select GROUP_ID, count(STATE = 10 OR NULL) AS userCount - from esua_epdc_group.epdc_user_group eu + from .epdc_user_group eu where eu.DEL_FLAG=0 group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id where eg.DEL_FLAG=0 and eg.STATE=10 group by eg.GRID_ID)dg on dg.GRID_ID=gr.id where gr.del_flag=0 AND gr.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and gr.type_key='grid_party' @@ -813,16 +813,16 @@ select gr.id as orgId, sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal, DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime, co.area_code AS areaCode - from esua_epdc_admin.sys_dept co - left join esua_epdc_admin.sys_dept gr on co.id=gr.pid + from .sys_dept co + left join .sys_dept gr on co.id=gr.pid left join (select eg.GRID_ID, count(eg.id) as createGroupTotal, sum(group_user.userCount) as groupUserTotal - from esua_epdc_group.epdc_group eg + from .epdc_group eg left join (select GROUP_ID, count(STATE = 10 OR NULL) AS userCount - from esua_epdc_group.epdc_user_group eu + from .epdc_user_group eu where eu.DEL_FLAG=0 group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id where eg.DEL_FLAG=0 and eg.STATE=10 @@ -830,7 +830,7 @@ select gr.id as orgId, where gr.del_flag=0 and co.del_flag=0 AND co.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and co.type_key='community_party' group by co.id @@ -845,17 +845,17 @@ select gr.id as orgId, sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal, DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime, st.area_code AS areaCode - from esua_epdc_admin.sys_dept st - left join esua_epdc_admin.sys_dept co on st.id=co.pid - left join esua_epdc_admin.sys_dept gr on co.id=gr.pid + from .sys_dept st + left join .sys_dept co on st.id=co.pid + left join .sys_dept gr on co.id=gr.pid left join (select eg.GRID_ID, count(eg.id) as createGroupTotal, sum(group_user.userCount) as groupUserTotal - from esua_epdc_group.epdc_group eg + from .epdc_group eg left join (select GROUP_ID, count(STATE = 10 OR NULL) AS userCount - from esua_epdc_group.epdc_user_group eu + from .epdc_user_group eu where eu.DEL_FLAG=0 group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id where eg.DEL_FLAG=0 and eg.STATE=10 @@ -876,18 +876,18 @@ select gr.id as orgId, sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal, DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime, city.area_code AS areaCode - from esua_epdc_admin.sys_dept city - left join esua_epdc_admin.sys_dept st on city.id=st.pid - left join esua_epdc_admin.sys_dept co on st.id=co.pid - left join esua_epdc_admin.sys_dept gr on co.id=gr.pid + from .sys_dept city + left join .sys_dept st on city.id=st.pid + left join .sys_dept co on st.id=co.pid + left join .sys_dept gr on co.id=gr.pid left join (select eg.GRID_ID, count(eg.id) as createGroupTotal, sum(group_user.userCount) as groupUserTotal - from esua_epdc_group.epdc_group eg + from .epdc_group eg left join (select GROUP_ID, count(STATE = 10 OR NULL) AS userCount - from esua_epdc_group.epdc_user_group eu + from .epdc_user_group eu where eu.DEL_FLAG=0 group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id where eg.DEL_FLAG=0 and eg.STATE=10 @@ -932,14 +932,14 @@ select gr.id as orgId, sd.PID parentId, sd.PIDS allParentIds , sd.NAME orgName, - (SELECT count( * ) partyTotal FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1') partyTotal, + (SELECT count( * ) partyTotal FROM .epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1') partyTotal, ( select count(*) groupTotal - from esua_epdc_group.epdc_group ws + from .epdc_group ws where ws.DEL_FLAG = '0' and date_format(ws.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ),'%Y-%m' ) ) groupTotal, - (select count(*) topicTotal from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) ) topicTotal, + (select count(*) topicTotal from .epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) ) topicTotal, ( SELECT count( t.a ) issueTotal @@ -949,7 +949,7 @@ select gr.id as orgId, count(id) as a, EVENT_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' AND date_format( mei.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) @@ -966,7 +966,7 @@ select gr.id as orgId, count(id) as a, EVENT_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' AND date_format( item.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) @@ -974,10 +974,10 @@ select gr.id as orgId, EVENT_ID )t ) projectTotal, - (select count(*) itemCloseTotal from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.ITEM_STATE = 10 ) itemCloseTotal, - (select count(*) itemSatisfiedTotal from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 1 ) itemSatisfiedTotal, - (select count(*) itemVeryTotal from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 2 ) itemVeryTotal - from esua_epdc_admin.sys_dept sd + (select count(*) itemCloseTotal from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.ITEM_STATE = 10 ) itemCloseTotal, + (select count(*) itemSatisfiedTotal from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 1 ) itemSatisfiedTotal, + (select count(*) itemVeryTotal from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 2 ) itemVeryTotal + from .sys_dept sd where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL and sd.TYPE_KEY = 'district_party' @@ -998,12 +998,12 @@ select gr.id as orgId, IFNULL(itemCloseCount.itemNum,0) itemCloseTotal, IFNULL(itemSatisfiedCount.itemNum,0) itemSatisfiedTotal, IFNULL(itemVeryCount.itemNum,0) itemVeryTotal - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join ( select sum(userNum.partyNum) partyNum , d2.PID DEPT_ID from (SELECT count( * ) partyNum, uu.DEPT_ID - FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' - GROUP BY uu.DEPT_ID) userNum left join esua_epdc_admin.sys_dept d1 on d1.ID = userNum.DEPT_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID + FROM .epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' + GROUP BY uu.DEPT_ID) userNum left join .sys_dept d1 on d1.ID = userNum.DEPT_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) user on user.DEPT_ID = sd.ID left join ( select @@ -1014,22 +1014,22 @@ select gr.id as orgId, sum( info.STATE = 10 ) as num, info.GRID_ID FROM - esua_epdc_group.epdc_group info + .epdc_group info GROUP BY info.GRID_ID ) daily - left join esua_epdc_admin.sys_dept dept on dept.id = daily.GRID_ID - left join esua_epdc_admin.sys_dept dept2 on dept2.id = dept.PID - left join esua_epdc_admin.sys_dept parent on parent.id = dept2.PID and parent.type_key= 'street_party' + left join .sys_dept dept on dept.id = daily.GRID_ID + left join .sys_dept dept2 on dept2.id = dept.PID + left join .sys_dept parent on parent.id = dept2.PID and parent.type_key= 'street_party' where dept2.type_key = 'street_party' or parent.type_key= 'street_party' GROUP BY IFNULL(parent.id,dept2.id) ) tto on tto.DEPT_ID = sd.ID left join ( select sum(topn.topNum) topNum ,d2.PID DEPT_ID from - ( select top.GRID_ID ,count(*) topNum from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' + ( select top.GRID_ID ,count(*) topNum from .epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) group by top.GRID_ID ) topn - left join esua_epdc_admin.sys_dept d1 on d1.ID = topn.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = topn.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) topCount on topCount.DEPT_ID = sd.ID left join ( @@ -1045,7 +1045,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' AND date_format( mei.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) @@ -1056,8 +1056,8 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) issuegrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = issuegrid.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = issuegrid.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) issueCount on issueCount.DEPT_ID = sd.ID left join ( @@ -1073,7 +1073,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' AND date_format( item.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) @@ -1084,32 +1084,32 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemCount on itemCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d2.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.ITEM_STATE = 10 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d2.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 1 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d2.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 2 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' @@ -1132,11 +1132,11 @@ select gr.id as orgId, IFNULL(itemCloseCount.itemNum,0) itemCloseTotal, IFNULL(itemSatisfiedCount.itemNum,0) itemSatisfiedTotal, IFNULL(itemVeryCount.itemNum,0) itemVeryTotal - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join ( select sum(userNum.partyNum) partyNum ,d1.PID DEPT_ID from (SELECT count( * ) partyNum, uu.DEPT_ID - FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' GROUP BY uu.DEPT_ID) userNum - left join esua_epdc_admin.sys_dept d1 on d1.ID = userNum.DEPT_ID group by d1.PID + FROM .epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' GROUP BY uu.DEPT_ID) userNum + left join .sys_dept d1 on d1.ID = userNum.DEPT_ID group by d1.PID ) user on user.DEPT_ID = sd.ID left join ( select @@ -1147,20 +1147,20 @@ select gr.id as orgId, sum( info.STATE = 10 ) as num, info.GRID_ID FROM - esua_epdc_group.epdc_group info + .epdc_group info GROUP BY info.GRID_ID ) daily - left join esua_epdc_admin.sys_dept dept on dept.id = daily.GRID_ID - left join esua_epdc_admin.sys_dept parent on parent.id = dept.PID and parent.type_key= 'community_party' + left join .sys_dept dept on dept.id = daily.GRID_ID + left join .sys_dept parent on parent.id = dept.PID and parent.type_key= 'community_party' where dept.type_key = 'community_party' or parent.type_key= 'community_party' GROUP BY IFNULL(parent.id,dept.id) ) tto on tto.DEPT_ID = sd.ID left join ( select sum(topn.topNum) topNum ,d1.PID DEPT_ID from - ( select top.GRID_ID ,count(*) topNum from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' + ( select top.GRID_ID ,count(*) topNum from .epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) group by top.GRID_ID ) topn - left join esua_epdc_admin.sys_dept d1 on d1.ID = topn.GRID_ID group by d1.PID + left join .sys_dept d1 on d1.ID = topn.GRID_ID group by d1.PID ) topCount on topCount.DEPT_ID = sd.ID left join ( select sum(issuegrid.issueNum) issueNum ,d1.PID DEPT_ID from @@ -1175,7 +1175,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' AND date_format( mei.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) @@ -1186,7 +1186,7 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) issuegrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = issuegrid.GRID_ID + left join .sys_dept d1 on d1.ID = issuegrid.GRID_ID group by d1.PID ) issueCount on issueCount.DEPT_ID = sd.ID left join ( @@ -1203,7 +1203,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' AND date_format( item.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) @@ -1214,31 +1214,31 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemCount on itemCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d1.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.ITEM_STATE = 10 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d1.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 1 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d1.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 2 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'community_party' union all @@ -1258,17 +1258,17 @@ select gr.id as orgId, IFNULL(itemCloseCount.itemNum,0) itemCloseTotal, IFNULL(itemSatisfiedCount.itemNum,0) itemSatisfiedTotal, IFNULL(itemVeryCount.itemNum,0) itemVeryTotal - from esua_epdc_admin.sys_dept sd - left join (select count(*) partyNum,uu.DEPT_ID from esua_epdc_user.epdc_user uu where uu.DEL_FLAG = '0' and uu.PARTY_FLAG = '1' group by uu.DEPT_ID) user on user.DEPT_ID = sd.ID + from .sys_dept sd + left join (select count(*) partyNum,uu.DEPT_ID from .epdc_user uu where uu.DEL_FLAG = '0' and uu.PARTY_FLAG = '1' group by uu.DEPT_ID) user on user.DEPT_ID = sd.ID left join ( select count(*) as TIMES_TOTAL, ws.GRID_ID as DEPT_ID - from esua_epdc_group.epdc_group ws + from .epdc_group ws where ws.DEL_FLAG = '0' and date_format(ws.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ),'%Y-%m' ) GROUP BY ws.GRID_ID ) tto on tto.DEPT_ID = sd.ID - left join (select top.GRID_ID DEPT_ID ,count(*) topNum from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) group by top.GRID_ID) topCount on topCount.DEPT_ID = sd.ID + left join (select top.GRID_ID DEPT_ID ,count(*) topNum from .epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) group by top.GRID_ID) topCount on topCount.DEPT_ID = sd.ID left join ( SELECT count( t.a ) issueNum, @@ -1280,7 +1280,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' AND date_format( mei.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) @@ -1302,7 +1302,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' AND date_format( item.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) @@ -1313,13 +1313,13 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) itemCount on itemCount.DEPT_ID = sd.ID - left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.ITEM_STATE = 10 group by item.GRID_ID) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID - left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 1 group by item.GRID_ID) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID - left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 2 group by item.GRID_ID) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID + left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.ITEM_STATE = 10 group by item.GRID_ID) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID + left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 1 group by item.GRID_ID) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID + left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 2 group by item.GRID_ID) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'grid_party' ) t @@ -1343,14 +1343,14 @@ select gr.id as orgId, user.FIRST_NAME name, sd.NAME gridName, sd.area_code as areaCode - from esua_epdc_user.epdc_user user - left join esua_epdc_admin.sys_dept sd on sd.ID = user.DEPT_ID - left join esua_epdc_admin.sys_dept sd2 on sd2.ID = sd.PID + from .epdc_user user + left join .sys_dept sd on sd.ID = user.DEPT_ID + left join .sys_dept sd2 on sd2.ID = sd.PID where user.DEL_FLAG = '0' and sd.DEL_FLAG = '0' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) AND sd.id IS NOT NULL and user.POINTS > 0 @@ -1364,7 +1364,7 @@ select gr.id as orgId, dd.PID parentId, ee.GRID orgName, ee.EVENT_ID eventId, - (select ii.IMG_URL from esua_epdc_events.epdc_img ii where ii.DEL_FLAG = '0' and ii.REFERENCE_ID = ee.EVENT_ID LIMIT 1) eventImgUrl, + (select ii.IMG_URL from .epdc_img ii where ii.DEL_FLAG = '0' and ii.REFERENCE_ID = ee.EVENT_ID LIMIT 1) eventImgUrl, ee.ALL_DEPT_NAMES eventSource, ee.ITEM_CONTENT eventContent, (ee.SPEND_TIME * 60) eventCostTime, @@ -1378,13 +1378,13 @@ select gr.id as orgId, IFNULL(ee.HANDLE_TOTAL,0) eventHandledCount, dd.area_code as areaCode FROM - esua_epdc_analysis.epdc_difficult_item ee - left join esua_epdc_admin.sys_dept dd on dd.ID = ee.GRID_ID + .epdc_difficult_item ee + left join .sys_dept dd on dd.ID = ee.GRID_ID WHERE ee.DEL_FLAG = '0' and dd.DEL_FLAG = '0' AND dd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and ee.CREATED_TIME >= date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y-%m-%d' ) @@ -1419,7 +1419,7 @@ select gr.id as orgId, IFNULL(behave.joinUser,0) joinUser, IFNULL(behave.issueJoinUser,0) issueJoinUser, IFNULL(issueNumber.issueNum,0) issueNum - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join ( select sum(be.joinUser) joinUser, @@ -1461,16 +1461,16 @@ select gr.id as orgId, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag FROM - esua_epdc_analysis.epdc_user_behavior_log behavior - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' - WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) + .epdc_user_behavior_log behavior + LEFT JOIN .epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' + WHERE behavior.USER_ID in ( select meu.ID from .epdc_user meu ) AND date_format(behavior.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) GROUP BY USER_ID, USER.DEPT_ID ) behaviorCount GROUP BY behaviorCount.DEPT_ID) be - left join esua_epdc_admin.sys_dept d1 on d1.ID = be.DEPT_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID - left join esua_epdc_admin.sys_dept d3 on d2.PID = d3.ID + left join .sys_dept d1 on d1.ID = be.DEPT_ID + left join .sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d3 on d2.PID = d3.ID group by d3.PID ) behave on behave.DEPT_ID = sd.ID left join ( @@ -1481,18 +1481,18 @@ select gr.id as orgId, ( select eisu.GRID_ID DEPT_ID, count(*) issueNum - from esua_epdc_events.epdc_issue eisu + from .epdc_issue eisu where eisu.DEL_FLAG = '0' AND date_format(eisu.DISTRIBUTE_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) GROUP BY eisu.GRID_ID ) isuCount - left join esua_epdc_admin.sys_dept d1 on d1.ID = isuCount.DEPT_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID - left join esua_epdc_admin.sys_dept d3 on d2.PID = d3.ID group by d3.PID + left join .sys_dept d1 on d1.ID = isuCount.DEPT_ID + left join .sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d3 on d2.PID = d3.ID group by d3.PID ) issueNumber on issueNumber.dept_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'district_party' @@ -1510,7 +1510,7 @@ select gr.id as orgId, IFNULL(behave.joinUser,0) joinUser, IFNULL(behave.issueJoinUser,0) issueJoinUser, IFNULL(issueNumber.issueNum,0) issueNum - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join ( select sum(be.joinUser) joinUser, @@ -1551,15 +1551,15 @@ select gr.id as orgId, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag - FROM esua_epdc_analysis.epdc_user_behavior_log behavior - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' - WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) + FROM .epdc_user_behavior_log behavior + LEFT JOIN .epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' + WHERE behavior.USER_ID in ( select meu.ID from .epdc_user meu ) AND date_format(behavior.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) GROUP BY USER_ID, USER.DEPT_ID ) behaviorCount GROUP BY behaviorCount.DEPT_ID) be - left join esua_epdc_admin.sys_dept d1 on d1.ID = be.DEPT_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID + left join .sys_dept d1 on d1.ID = be.DEPT_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) behave on behave.DEPT_ID = sd.ID left join ( select @@ -1569,17 +1569,17 @@ select gr.id as orgId, ( select eisu.GRID_ID DEPT_ID, count(*) issueNum - from esua_epdc_events.epdc_issue eisu + from .epdc_issue eisu where eisu.DEL_FLAG = '0' AND date_format(eisu.DISTRIBUTE_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) GROUP BY eisu.GRID_ID ) isuCount - left join esua_epdc_admin.sys_dept d1 on d1.ID = isuCount.DEPT_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID + left join .sys_dept d1 on d1.ID = isuCount.DEPT_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) issueNumber on issueNumber.dept_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'street_party' @@ -1597,7 +1597,7 @@ select gr.id as orgId, IFNULL(behave.joinUser,0) joinUser, IFNULL(behave.issueJoinUser,0) issueJoinUser, IFNULL(issueNumber.issueNum,0) issueNumber - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join ( select sum(be.joinUser) joinUser, @@ -1633,14 +1633,14 @@ select gr.id as orgId, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag - FROM esua_epdc_analysis.epdc_user_behavior_log behavior - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' - WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) + FROM .epdc_user_behavior_log behavior + LEFT JOIN .epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' + WHERE behavior.USER_ID in ( select meu.ID from .epdc_user meu ) AND date_format(behavior.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) GROUP BY USER_ID, USER.DEPT_ID ) behaviorCount GROUP BY behaviorCount.DEPT_ID) be - left join esua_epdc_admin.sys_dept d1 on d1.ID = be.DEPT_ID group by d1.PID + left join .sys_dept d1 on d1.ID = be.DEPT_ID group by d1.PID ) behave on behave.DEPT_ID = sd.ID left join ( select @@ -1650,16 +1650,16 @@ select gr.id as orgId, ( select eisu.GRID_ID DEPT_ID, count(*) issueNum - from esua_epdc_events.epdc_issue eisu + from .epdc_issue eisu where eisu.DEL_FLAG = '0' AND date_format(eisu.DISTRIBUTE_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) GROUP BY eisu.GRID_ID ) isuCount - left join esua_epdc_admin.sys_dept d1 on d1.ID = isuCount.DEPT_ID group by d1.PID + left join .sys_dept d1 on d1.ID = isuCount.DEPT_ID group by d1.PID ) issueNumber on issueNumber.dept_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'community_party' @@ -1677,7 +1677,7 @@ select gr.id as orgId, IFNULL(behave.joinUser,0) joinUser, IFNULL(behave.issueJoinUser,0) issueJoinUser, IFNULL(issueNumber.issueNum,0) issueNum - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join (SELECT behaviorCount.DEPT_ID, count( behaviorCount.voiceOpposeFlag + behaviorCount.voiceLikesFlag + behaviorCount.groupPublishFlag @@ -1705,10 +1705,10 @@ select gr.id as orgId, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag - FROM esua_epdc_analysis.epdc_user_behavior_log behavior - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID + FROM .epdc_user_behavior_log behavior + LEFT JOIN .epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' - WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) + WHERE behavior.USER_ID in ( select meu.ID from .epdc_user meu ) AND date_format(behavior.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) GROUP BY USER_ID, USER.DEPT_ID ) behaviorCount @@ -1718,14 +1718,14 @@ select gr.id as orgId, select eisu.GRID_ID dept_ID, count(*) issueNum - from esua_epdc_events.epdc_issue eisu + from .epdc_issue eisu where eisu.DEL_FLAG = '0' AND date_format(eisu.DISTRIBUTE_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) GROUP BY eisu.GRID_ID ) issueNumber on issueNumber.dept_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'grid_party' @@ -1745,7 +1745,7 @@ SELECT gr.id as orgId, IFNULL(t.topicTotal,0) AS topicTotal, IFNULL(t.projectTotal,0) AS projectTotal, DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime - FROM esua_epdc_admin.sys_dept gr + FROM .sys_dept gr left join (select total.GRID_ID, sum(total.regUserTotal) as regUserTotal, @@ -1760,7 +1760,7 @@ SELECT gr.id as orgId, 0 as issueTotal, 0 as topicTotal, 0 as projectTotal - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG=0 group by eu.DEPT_ID union all @@ -1796,10 +1796,10 @@ SELECT gr.id as orgId, SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag - FROM esua_epdc_analysis.epdc_user_behavior_log behavior + FROM .epdc_user_behavior_log behavior GROUP BY USER_ID ) behaviorCount - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behaviorCount.USER_ID AND USER.DEL_FLAG = '0' + LEFT JOIN .epdc_user USER ON USER.ID = behaviorCount.USER_ID AND USER.DEL_FLAG = '0' GROUP BY USER.DEPT_ID) be group by be.DEPT_ID @@ -1819,7 +1819,7 @@ SELECT gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' GROUP BY @@ -1836,7 +1836,7 @@ SELECT gr.id as orgId, 0 as issueTotal, count(id) as topicTotal, 0 as projectTotal - from esua_epdc_group.epdc_topic + from .epdc_topic where DEL_FLAG=0 group by GRID_ID @@ -1854,7 +1854,7 @@ SELECT gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' GROUP BY @@ -1866,7 +1866,7 @@ SELECT gr.id as orgId, where gr.del_flag=0 and gr.type_key='grid_party' AND gr.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) UNION ALL @@ -1882,8 +1882,8 @@ UNION ALL SUM(IFNULL(t.topicTotal,0)) AS topicTotal, SUM(IFNULL(t.projectTotal,0)) AS projectTotal, DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime - FROM esua_epdc_admin.sys_dept co - LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid + FROM .sys_dept co + LEFT JOIN .sys_dept gr on co.id=gr.pid left join (select total.GRID_ID, sum(total.regUserTotal) as regUserTotal, @@ -1898,7 +1898,7 @@ UNION ALL 0 as issueTotal, 0 as topicTotal, 0 as projectTotal - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG=0 group by eu.DEPT_ID @@ -1935,10 +1935,10 @@ UNION ALL SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag - FROM esua_epdc_analysis.epdc_user_behavior_log behavior + FROM .epdc_user_behavior_log behavior GROUP BY USER_ID ) behaviorCount - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behaviorCount.USER_ID AND USER.DEL_FLAG = '0' + LEFT JOIN .epdc_user USER ON USER.ID = behaviorCount.USER_ID AND USER.DEL_FLAG = '0' GROUP BY USER.DEPT_ID) be group by be.DEPT_ID @@ -1957,7 +1957,7 @@ UNION ALL EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' GROUP BY @@ -1974,7 +1974,7 @@ UNION ALL 0 as issueTotal, count(id) as topicTotal, 0 as projectTotal - from esua_epdc_group.epdc_topic + from .epdc_topic where DEL_FLAG=0 group by GRID_ID @@ -1992,7 +1992,7 @@ UNION ALL EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' GROUP BY @@ -2005,7 +2005,7 @@ UNION ALL and co.del_flag=0 and co.type_key='community_party' AND co.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY co.id @@ -2022,9 +2022,9 @@ union all SUM(IFNULL(t.topicTotal,0)) AS topicTotal, SUM(IFNULL(t.projectTotal,0)) AS projectTotal, DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime - FROM esua_epdc_admin.sys_dept st - left join esua_epdc_admin.sys_dept co on co.pid=st.id - LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid + FROM .sys_dept st + left join .sys_dept co on co.pid=st.id + LEFT JOIN .sys_dept gr on co.id=gr.pid left join (select total.GRID_ID, sum(total.regUserTotal) as regUserTotal, @@ -2039,7 +2039,7 @@ union all 0 as issueTotal, 0 as topicTotal, 0 as projectTotal - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG=0 group by eu.DEPT_ID @@ -2076,10 +2076,10 @@ union all SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag - FROM esua_epdc_analysis.epdc_user_behavior_log behavior + FROM .epdc_user_behavior_log behavior GROUP BY USER_ID ) behaviorCount - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behaviorCount.USER_ID AND USER.DEL_FLAG = '0' + LEFT JOIN .epdc_user USER ON USER.ID = behaviorCount.USER_ID AND USER.DEL_FLAG = '0' GROUP BY USER.DEPT_ID) be group by be.DEPT_ID @@ -2098,7 +2098,7 @@ union all EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' GROUP BY @@ -2115,7 +2115,7 @@ union all 0 as issueTotal, count(id) as topicTotal, 0 as projectTotal - from esua_epdc_group.epdc_topic + from .epdc_topic where DEL_FLAG=0 group by GRID_ID @@ -2133,7 +2133,7 @@ union all EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' GROUP BY @@ -2147,7 +2147,7 @@ union all and st.del_flag=0 and st.type_key='street_party' AND st.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY st.id @@ -2164,10 +2164,10 @@ union all SUM(IFNULL(t.topicTotal,0)) AS topicTotal, SUM(IFNULL(t.projectTotal,0)) AS projectTotal, DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime - FROM esua_epdc_admin.sys_dept city - left join esua_epdc_admin.sys_dept st on st.pid=city.id - left join esua_epdc_admin.sys_dept co on co.pid=st.id - LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid + FROM .sys_dept city + left join .sys_dept st on st.pid=city.id + left join .sys_dept co on co.pid=st.id + LEFT JOIN .sys_dept gr on co.id=gr.pid left join (select total.GRID_ID, sum(total.regUserTotal) as regUserTotal, @@ -2182,7 +2182,7 @@ union all 0 as issueTotal, 0 as topicTotal, 0 as projectTotal - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG=0 group by eu.DEPT_ID @@ -2219,10 +2219,10 @@ union all SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag - FROM esua_epdc_analysis.epdc_user_behavior_log behavior + FROM .epdc_user_behavior_log behavior GROUP BY USER_ID ) behaviorCount - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behaviorCount.USER_ID AND USER.DEL_FLAG = '0' + LEFT JOIN .epdc_user USER ON USER.ID = behaviorCount.USER_ID AND USER.DEL_FLAG = '0' GROUP BY USER.DEPT_ID) be group by be.DEPT_ID @@ -2241,7 +2241,7 @@ union all EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' GROUP BY @@ -2258,7 +2258,7 @@ union all 0 as issueTotal, count(id) as topicTotal, 0 as projectTotal - from esua_epdc_group.epdc_topic + from .epdc_topic where DEL_FLAG=0 group by GRID_ID @@ -2276,7 +2276,7 @@ union all EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' GROUP BY @@ -2290,7 +2290,7 @@ union all and st.del_flag=0 and city.DEL_FLAG=0 AND gr.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and city.type_key='district_party' GROUP BY city.id @@ -2320,7 +2320,7 @@ union all - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join (select d3.PID DEPT_ID, @@ -2339,21 +2339,21 @@ union all from ( SELECT *, - ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) ) mee - LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID - left join esua_epdc_admin.sys_dept d1 on d1.ID = mee.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID - left join esua_epdc_admin.sys_dept d3 on d2.PID = d3.ID + LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + left join .sys_dept d1 on d1.ID = mee.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d3 on d2.PID = d3.ID group by d3.PID ) rr on rr.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'district_party' union all @@ -2378,7 +2378,7 @@ union all IFNULL(rr.governRatioFm,0) governRatioFm, IFNULL(rr.satisfactionRatioFz,0) satisfactionRatioFz, IFNULL(rr.satisfactionRatioFm,0) satisfactionRatioFm - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join (select d2.PID DEPT_ID, @@ -2396,20 +2396,20 @@ union all count(mei.EVALUATION_SCORE is not null or null) as satisfactionRatioFm from ( SELECT *, - ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) ) mee - LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID - left join esua_epdc_admin.sys_dept d1 on d1.ID = mee.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + left join .sys_dept d1 on d1.ID = mee.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) rr on rr.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'street_party' @@ -2435,7 +2435,7 @@ union all IFNULL(rr.governRatioFm,0) governRatioFm, IFNULL(rr.satisfactionRatioFz,0) satisfactionRatioFz, IFNULL(rr.satisfactionRatioFm,0) satisfactionRatioFm - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join (select d1.PID DEPT_ID, @@ -2454,12 +2454,12 @@ union all from ( SELECT *, - ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) ) mee - LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID - left join esua_epdc_admin.sys_dept d1 on d1.ID = mee.GRID_ID + LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + left join .sys_dept d1 on d1.ID = mee.GRID_ID group by d1.PID ) rr on rr.DEPT_ID = sd.ID @@ -2467,7 +2467,7 @@ union all sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'community_party' @@ -2493,7 +2493,7 @@ union all IFNULL(rr.governRatioFm,0) governRatioFm, IFNULL(rr.satisfactionRatioFz,0) satisfactionRatioFz, IFNULL(rr.satisfactionRatioFm,0) satisfactionRatioFm - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join (select mee.GRID_ID DEPT_ID, @@ -2511,17 +2511,17 @@ union all count(mei.EVALUATION_SCORE is not null or null) as satisfactionRatioFm from ( SELECT *, - ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) ) mee - LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID GROUP BY mee.GRID_ID) rr on rr.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'grid_party' @@ -2540,7 +2540,7 @@ union all IFNULL(t.projectTotal,0) as projectTotal, 0 as companyTotal, DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, gr.area_code AS areaCode - FROM esua_epdc_admin.sys_dept gr + FROM .sys_dept gr left join (select total.GRID_ID, sum(total.userTotal+total.companyTotal) as userTotal, @@ -2557,7 +2557,7 @@ union all 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG=0 group by eu.DEPT_ID @@ -2572,7 +2572,7 @@ union all 0 as topicTotal, 0 as projectTotal, count(id) as companyTotal FROM - esua_epdc_custom.epdc_enterprise_info + .epdc_enterprise_info WHERE DEL_FLAG = 0 GROUP BY @@ -2587,7 +2587,7 @@ union all 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_group.epdc_group + from .epdc_group where DEL_FLAG=0 and STATE=10 group by GRID_ID @@ -2606,7 +2606,7 @@ union all EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' GROUP BY @@ -2624,7 +2624,7 @@ union all 0 as issueTotal, count(id) as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_group.epdc_topic + from .epdc_topic where DEL_FLAG=0 group by GRID_ID @@ -2643,7 +2643,7 @@ union all EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' GROUP BY @@ -2654,7 +2654,7 @@ union all group by total.GRID_ID)t on gr.id=t.GRID_ID where gr.del_flag=0 AND gr.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and gr.type_key='grid_party' @@ -2672,8 +2672,8 @@ UNION ALL SUM(IFNULL(t.projectTotal,0)) as projectTotal, 0 as companyTotal, DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, co.area_code AS areaCode - FROM esua_epdc_admin.sys_dept co - LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid + FROM .sys_dept co + LEFT JOIN .sys_dept gr on co.id=gr.pid left join (select total.GRID_ID, sum(total.userTotal+total.companyTotal) as userTotal, @@ -2690,7 +2690,7 @@ UNION ALL 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG=0 group by eu.DEPT_ID @@ -2704,7 +2704,7 @@ UNION ALL 0 as topicTotal, 0 as projectTotal, count(id) as companyTotal FROM - esua_epdc_custom.epdc_enterprise_info + .epdc_enterprise_info WHERE DEL_FLAG = 0 GROUP BY @@ -2719,7 +2719,7 @@ UNION ALL 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_group.epdc_group + from .epdc_group where DEL_FLAG=0 and STATE=10 group by GRID_ID @@ -2738,7 +2738,7 @@ UNION ALL EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' GROUP BY @@ -2756,7 +2756,7 @@ UNION ALL 0 as issueTotal, count(id) as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_group.epdc_topic + from .epdc_topic where DEL_FLAG=0 group by GRID_ID @@ -2775,7 +2775,7 @@ UNION ALL EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' GROUP BY @@ -2787,7 +2787,7 @@ UNION ALL where gr.del_flag=0 and co.del_flag=0 AND co.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and co.type_key='community_party' GROUP BY co.id @@ -2806,9 +2806,9 @@ union all SUM(IFNULL(t.projectTotal,0)) as projectTotal, 0 as companyTotal, DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, st.area_code AS areaCode - FROM esua_epdc_admin.sys_dept st - left join esua_epdc_admin.sys_dept co on co.pid=st.id - LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid + FROM .sys_dept st + left join .sys_dept co on co.pid=st.id + LEFT JOIN .sys_dept gr on co.id=gr.pid left join (select total.GRID_ID, sum(total.userTotal+total.companyTotal) as userTotal, @@ -2825,7 +2825,7 @@ union all 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG=0 group by eu.DEPT_ID UNION all @@ -2838,7 +2838,7 @@ union all 0 as topicTotal, 0 as projectTotal, count(id) as companyTotal FROM - esua_epdc_custom.epdc_enterprise_info + .epdc_enterprise_info WHERE DEL_FLAG = 0 GROUP BY @@ -2853,7 +2853,7 @@ union all 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_group.epdc_group + from .epdc_group where DEL_FLAG=0 and STATE=10 group by GRID_ID @@ -2872,7 +2872,7 @@ union all EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' GROUP BY @@ -2890,7 +2890,7 @@ union all 0 as issueTotal, count(id) as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_group.epdc_topic + from .epdc_topic where DEL_FLAG=0 group by GRID_ID @@ -2909,7 +2909,7 @@ union all EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' GROUP BY @@ -2923,7 +2923,7 @@ union all and st.del_flag=0 and st.type_key='street_party' AND st.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY st.id @@ -2941,10 +2941,10 @@ union all SUM(IFNULL(t.projectTotal,0)) as projectTotal, 0 as companyTotal, DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, city.area_code AS areaCode - FROM esua_epdc_admin.sys_dept city - left join esua_epdc_admin.sys_dept st on st.pid=city.id - left join esua_epdc_admin.sys_dept co on co.pid=st.id - LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid + FROM .sys_dept city + left join .sys_dept st on st.pid=city.id + left join .sys_dept co on co.pid=st.id + LEFT JOIN .sys_dept gr on co.id=gr.pid left join (select total.GRID_ID, sum(total.userTotal+total.companyTotal) as userTotal, @@ -2961,7 +2961,7 @@ union all 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_user.epdc_user eu + from .epdc_user eu where eu.DEL_FLAG=0 group by eu.DEPT_ID UNION all @@ -2974,7 +2974,7 @@ union all 0 as topicTotal, 0 as projectTotal, count(id) as companyTotal FROM - esua_epdc_custom.epdc_enterprise_info + .epdc_enterprise_info WHERE DEL_FLAG = 0 GROUP BY @@ -2989,7 +2989,7 @@ union all 0 as issueTotal, 0 as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_group.epdc_group + from .epdc_group where DEL_FLAG=0 and STATE=10 group by GRID_ID @@ -3008,7 +3008,7 @@ union all EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' GROUP BY @@ -3026,7 +3026,7 @@ union all 0 as issueTotal, count(id) as topicTotal, 0 as projectTotal, 0 as companyTotal - from esua_epdc_group.epdc_topic + from .epdc_topic where DEL_FLAG=0 group by GRID_ID @@ -3045,7 +3045,7 @@ union all EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' GROUP BY @@ -3059,7 +3059,7 @@ union all and st.del_flag=0 and city.DEL_FLAG=0 AND city.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and city.type_key='district_party' GROUP BY city.id From 5b9b63bffc9a06c82751bd94a7bf46c19b623c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Wed, 3 Mar 2021 14:05:00 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenProjectDataController.java | 9 +- .../ScreenPublicDataController.java | 41 +- .../screen/dao/ScreenProjectDataDao.java | 4 +- .../screen/dao/ScreenPublicDataDao.java | 7 +- .../service/ScreenProjectDataService.java | 4 +- .../service/ScreenPublicDataService.java | 6 +- .../impl/ScreenProjectDataServiceImpl.java | 21 +- .../impl/ScreenPublicDataServiceImpl.java | 27 +- .../mapper/screen/ScreenProjectDataDao.xml | 16 +- .../mapper/screen/ScreenPublicDataDao.xml | 367 +++++++++--------- 10 files changed, 267 insertions(+), 235 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java index cf40b1e..59949dd 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenProjectDataController.java @@ -1,6 +1,7 @@ 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.ScreenJobFormDTO; import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO; import com.elink.esua.epdc.modules.screen.service.ScreenProjectDataService; import org.springframework.beans.factory.annotation.Autowired; @@ -78,8 +79,8 @@ public class ScreenProjectDataController { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("quantity-grid-monthly") - private Result quantityGridMonthly(){ - return screenProjectDataService.quantityGridMonthly(); + private Result quantityGridMonthly(@RequestBody ScreenJobFormDTO formDto){ + return screenProjectDataService.quantityGridMonthly(formDto.getYearMonth()); } /** @@ -90,7 +91,7 @@ public class ScreenProjectDataController { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("quantity-org-monthly") - private Result quantityOrgMonthly(){ - return screenProjectDataService.quantityOrgMonthly(); + private Result quantityOrgMonthly(@RequestBody ScreenJobFormDTO formDto){ + return screenProjectDataService.quantityOrgMonthly(formDto.getYearMonth()); } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java index 0677690..c4b5045 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.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.ScreenJobFormDTO; import com.elink.esua.epdc.modules.screen.service.ScreenPublicDataService; 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; @@ -57,22 +59,23 @@ public class ScreenPublicDataController { } /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 001、基层党建-党员基本情况 * @author wk * @date 2020/8/19 17:25 * @params [] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("cpcbasedata") public Result cpcbasedata() { return screenPublicDataService.cpcbasedata(); } + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 002、党建引领-先锋模范数据 * @author wangtong * @date 2020/8/20 18:02 * @params [] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("pioneerdata") public Result pioneerdata() { @@ -80,29 +83,33 @@ public class ScreenPublicDataController { } /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 003、党建引领-党员联系群众数据 * @author wangtong * @date 2020/8/20 14:25 * @params [] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("partylinkmassesdata") public Result partylinkmassesdata() { return screenPublicDataService.partylinkmassesdata(); } + /** * 004、党建引领-先进排行榜单-先进支部排行 + * * @Params: * @Return: OrgrankdataResultDTO * @Author: wanggongfeng * @Date: 2020/08/19 */ @PostMapping("orgrankdata") - public Result orgrankdata() { - return screenPublicDataService.getOrgrankdata(); + public Result orgrankdata(@RequestBody ScreenJobFormDTO formDto) { + return screenPublicDataService.getOrgrankdata(formDto.getYearMonth()); } + /** * 005、党建引领|基层治理-居民（党员）积分排行榜 + * * @Params: * @Return: PartyuserrankdataResultDTO * @Author: wk @@ -110,11 +117,13 @@ public class ScreenPublicDataController { */ @PostMapping("partyuserrankdata") public Result partyuserrankdata() { - return screenPublicDataService.getPartyuserrankdata(); + return screenPublicDataService.getPartyuserrankdata(); } + /** - * 006、基层治理-难点赌点项目上报 + * 006、基层治理-难点赌点项目上报 + * * @Params: * @Return: DifficultydataResultDTO * @Author: wk @@ -124,46 +133,52 @@ public class ScreenPublicDataController { public Result difficultydata() { return screenPublicDataService.getDifficultydata(); } + /** * 007、基层治理-公众参与 + * * @Params: * @Return: UserjoinResultDTO * @Author: wanggongfeng * @Date: 2020/08/20 */ @PostMapping("userjoin") - public Result userjoin() { - return screenPublicDataService.getUserjoin(); + public Result userjoin(@RequestBody ScreenJobFormDTO formDto) { + return screenPublicDataService.getUserjoin(formDto.getYearMonth()); } + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 008、公众参与各类总数 * @author wangtong * @date 2020/8/24 18:27 * @params [] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("publicpartitotaldata") public Result publicpartitotaldata() { return screenPublicDataService.publicpartitotaldata(); } + /** * 009、基层治理-治理能力数据 + * * @Params: * @Return: GovernrankdataResultDTO * @Author: wanggongfeng * @Date: 2020/08/19 */ @PostMapping("governrankdata") - public Result governrankdata() { - return screenPublicDataService.getGovernrankdata(); + public Result governrankdata(@RequestBody ScreenJobFormDTO formDto) { + return screenPublicDataService.getGovernrankdata(formDto.getYearMonth()); } + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 010、中央区各类总数 * @author wk * @date 2020/8/21 10:32 * @params [] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("usertotaldata") public Result usertotaldata() { diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java index 86b8953..e4c94a1 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenProjectDataDao.java @@ -57,7 +57,7 @@ public interface ScreenProjectDataDao extends BaseDao */ - List selectQuantityGridMonthly(@Param("lastMonth") String lastMonth); + List selectQuantityGridMonthly(@Param("yearMonth") String yearMonth); /** * @describe: 【事件/项目分析】组织内月度数量统计 @@ -66,5 +66,5 @@ public interface ScreenProjectDataDao extends BaseDao */ - List selectQuantityOrgMonthly(@Param("lastMonth") String lastMonth); + List selectQuantityOrgMonthly(@Param("yearMonth") String yearMonth); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java index d6970da..c1507eb 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java @@ -3,6 +3,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.result.*; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -72,7 +73,7 @@ public interface ScreenPublicDataDao extends BaseDao * @Author: wanggongfeng * @Date: 2020/08/19 */ - List getOrgrankdata(); + List getOrgrankdata(@Param("yearMonth")String yearMonth); /** * 005、党建引领|基层治理-居民（党员）积分排行榜 * @Params: @@ -97,7 +98,7 @@ public interface ScreenPublicDataDao extends BaseDao * @Author: wanggongfeng * @Date: 2020/08/20 */ - List getUserjoin(); + List getUserjoin(@Param("yearMonth")String yearMonth); /** * @describe: 008、公众参与各类总数 @@ -114,7 +115,7 @@ public interface ScreenPublicDataDao extends BaseDao * @Author: wanggongfeng * @Date: 2020/08/19 */ - List getGovernrankdata(); + List getGovernrankdata(@Param("yearMonth")String yearMonth); /** diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java index 004eac2..8f211d4 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenProjectDataService.java @@ -56,7 +56,7 @@ public interface ScreenProjectDataService { * @params [] * @return com.elink.esua.epdc.commons.tools.utils.Result */ - Result quantityGridMonthly(); + Result quantityGridMonthly(String yearMonth); /** * @describe: 【事件/项目分析】组织内月度数量统计 @@ -65,5 +65,5 @@ public interface ScreenProjectDataService { * @params [] * @return com.elink.esua.epdc.commons.tools.utils.Result */ - Result quantityOrgMonthly(); + Result quantityOrgMonthly(String yearMonth); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java index 27f543c..02c33f7 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenPublicDataService.java @@ -72,7 +72,7 @@ public interface ScreenPublicDataService { * @Author: wanggongfeng * @Date: 2020/08/19 */ - Result getOrgrankdata(); + Result getOrgrankdata(String yearMonth); /** * 005、党建引领|基层治理-居民（党员）积分排行榜 @@ -102,7 +102,7 @@ public interface ScreenPublicDataService { * @Author: wanggongfeng * @Date: 2020/08/20 */ - Result getUserjoin(); + Result getUserjoin(String yearMonth); /** * @return com.elink.esua.epdc.commons.tools.utils.Result @@ -121,7 +121,7 @@ public interface ScreenPublicDataService { * @Author: wanggongfeng * @Date: 2020/08/19 */ - Result getGovernrankdata(); + Result getGovernrankdata(String yearMonth); /** * @return com.elink.esua.epdc.commons.tools.utils.Result diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java index c552d1d..ff8c5aa 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.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.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO; import com.elink.esua.epdc.dto.screen.result.*; @@ -10,9 +11,11 @@ import com.elink.esua.epdc.modules.screen.dao.ScreenProjectDataDao; import com.elink.esua.epdc.modules.screen.service.ScreenProjectDataService; import com.elink.esua.epdc.utils.EpmetUtils; import com.elink.esua.epdc.utils.ScreenDataUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -101,24 +104,26 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl data = baseDao.selectQuantityGridMonthly(lastMonth); + List data = baseDao.selectQuantityGridMonthly(yearMonth); // 数据格式化 - String dataJson = ScreenDataUtils.getScreenDataMonthJson(data, null,true); + String dataJson = ScreenDataUtils.getScreenDataMonthJson(data, yearMonth,true); // 数据上报 epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_GRID_MONTHLY, dataJson); return new Result(); } @Override - public Result quantityOrgMonthly() { - String lastMonth = ScreenDataUtils.getLastMonthDate(); + public Result quantityOrgMonthly(String yearMonth) { + // 如果统计月份为空，则统计上个月的数据 + yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth; // 数据统计 - List data = baseDao.selectQuantityOrgMonthly(lastMonth); + List data = baseDao.selectQuantityOrgMonthly(yearMonth); // 数据格式化 - String dataJson = ScreenDataUtils.getScreenDataMonthJson(data, null,true); + String dataJson = ScreenDataUtils.getScreenDataMonthJson(data, yearMonth,true); // 数据上报 epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_ORG_MONTHLY, dataJson); return new Result(); diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java index 5e419ec..249195a 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java @@ -3,16 +3,19 @@ package com.elink.esua.epdc.modules.screen.service.impl; import com.alibaba.fastjson.JSONObject; 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.DateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.screen.result.*; import com.elink.esua.epdc.modules.screen.dao.ScreenPublicDataDao; import com.elink.esua.epdc.modules.screen.service.ScreenPublicDataService; import com.elink.esua.epdc.utils.EpmetUtils; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Date; import java.util.List; @@ -122,13 +125,15 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl list = baseDao.getOrgrankdata(); + public Result getOrgrankdata(String yearMonth) { + // 如果统计月份为空，则统计上个月的数据 + yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth; + List list = baseDao.getOrgrankdata(yearMonth); // 将list转换为json格式 if(list != null && list.size()>0){ OrgrankdataDTO result = new OrgrankdataDTO(); result.setDataList(list); - result.setMonthId(list.get(0).getMonthId()); + result.setMonthId(yearMonth); String json = JSONObject.toJSONString(result); String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_ORG_RANK, json); log.info(body); @@ -192,13 +197,15 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl list = baseDao.getUserjoin(); + public Result getUserjoin(String yearMonth) { + // 如果统计月份为空，则统计上个月的数据 + yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth; + List list = baseDao.getUserjoin(yearMonth); // 将list转换为json格式 if(list != null && list.size()>0) { UserjoinDTO result = new UserjoinDTO(); result.setDataList(list); - result.setMonthId(list.get(0).getMonthId()); + result.setMonthId(yearMonth); String json = JSONObject.toJSONString(result); String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_USER_JOIN, json); log.info(body); @@ -233,13 +240,15 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl list = baseDao.getGovernrankdata(); + public Result getGovernrankdata(String yearMonth) { + // 如果统计月份为空，则统计上个月的数据 + yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth; + List list = baseDao.getGovernrankdata(yearMonth); // 将list转换为json格式 if(list != null && list.size()>0){ GovernrankdataDTO result = new GovernrankdataDTO(); result.setDataList(list); - result.setMonthId(list.get(0).getMonthId()); + result.setMonthId(yearMonth); String json = JSONObject.toJSONString(result); String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_GOVERN_RANK, json); log.info(body); diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 05d442a..95f3d10 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -243,7 +243,7 @@ from (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) = #{lastMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) = #{yearMonth} group by lin.EVENT_ID)li group by li.GRID_ID)it on it.GRID_ID=sd.id left join (select al.GRID_ID, @@ -253,7 +253,7 @@ from (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) <= #{lastMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) <= #{yearMonth} group by lin.EVENT_ID)al group by al.GRID_ID)li2 on li2.GRID_ID=sd.id WHERE sd.`del_flag`= 0 @@ -285,7 +285,7 @@ from (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{lastMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{yearMonth} group by lin.EVENT_ID)li group by li.GRID_ID)it on it.GRID_ID=sd.id left join (select al.GRID_ID, @@ -295,7 +295,7 @@ from (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{lastMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{yearMonth} group by lin.EVENT_ID)al group by al.GRID_ID)li2 on li2.GRID_ID=sd.id WHERE sd.`del_flag`= 0 @@ -324,7 +324,7 @@ from (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{lastMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{yearMonth} group by lin.EVENT_ID)li group by li.GRID_ID)it on it.GRID_ID=sd.id left join (select al.GRID_ID, @@ -334,7 +334,7 @@ from (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{lastMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{yearMonth} group by lin.EVENT_ID)al group by al.GRID_ID)li2 on li2.GRID_ID=sd.id WHERE sd.`del_flag`= 0 @@ -364,7 +364,7 @@ from (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{lastMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{yearMonth} group by lin.EVENT_ID)li group by li.GRID_ID)it on it.GRID_ID=sd.id left join (select al.GRID_ID, @@ -374,7 +374,7 @@ from (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{lastMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{yearMonth} group by lin.EVENT_ID)al group by al.GRID_ID)li2 on li2.GRID_ID=sd.id WHERE sd.`del_flag`= 0 diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index ee93128..6927ad8 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -925,21 +925,21 @@ select gr.id as orgId, IFNULL(t.projectTotal,0) as satisfactionRatioFm from ( select - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y' ) yearId, - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y%m' ) monthId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y-%m'),'%Y%m') AS monthId, 'agency' as orgType, sd.ID orgId, sd.PID parentId, sd.PIDS allParentIds , sd.NAME orgName, - (SELECT count( * ) partyTotal FROM .epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1') partyTotal, + (SELECT count( * ) partyTotal FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1') partyTotal, ( select count(*) groupTotal - from .epdc_group ws - where ws.DEL_FLAG = '0' and date_format(ws.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ),'%Y-%m' ) + from esua_epdc_group.epdc_group ws + where ws.DEL_FLAG = '0' and date_format(ws.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) groupTotal, - (select count(*) topicTotal from .epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) ) topicTotal, + (select count(*) topicTotal from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) topicTotal, ( SELECT count( t.a ) issueTotal @@ -949,10 +949,10 @@ select gr.id as orgId, count(id) as a, EVENT_ID FROM - .epdc_issue mei + esua_epdc_events.epdc_issue mei WHERE mei.DEL_FLAG = '0' - AND date_format( mei.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + AND date_format( mei.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY EVENT_ID )t @@ -966,25 +966,25 @@ select gr.id as orgId, count(id) as a, EVENT_ID FROM - .epdc_item item + esua_epdc_events.epdc_item item WHERE item.DEL_FLAG = '0' - AND date_format( item.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + AND date_format( item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY EVENT_ID )t ) projectTotal, - (select count(*) itemCloseTotal from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.ITEM_STATE = 10 ) itemCloseTotal, - (select count(*) itemSatisfiedTotal from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 1 ) itemSatisfiedTotal, - (select count(*) itemVeryTotal from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 2 ) itemVeryTotal - from .sys_dept sd + (select count(*) itemCloseTotal from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.ITEM_STATE = 10 ) itemCloseTotal, + (select count(*) itemSatisfiedTotal from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 1 ) itemSatisfiedTotal, + (select count(*) itemVeryTotal from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 2 ) itemVeryTotal + from esua_epdc_admin.sys_dept sd where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL and sd.TYPE_KEY = 'district_party' union all select - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y' ) yearId, - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y%m' ) monthId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y-%m'),'%Y%m') AS monthId, 'agency' as orgType, sd.ID orgId, sd.PID parentId, @@ -998,12 +998,12 @@ select gr.id as orgId, IFNULL(itemCloseCount.itemNum,0) itemCloseTotal, IFNULL(itemSatisfiedCount.itemNum,0) itemSatisfiedTotal, IFNULL(itemVeryCount.itemNum,0) itemVeryTotal - from .sys_dept sd + from esua_epdc_admin.sys_dept sd left join ( select sum(userNum.partyNum) partyNum , d2.PID DEPT_ID from (SELECT count( * ) partyNum, uu.DEPT_ID - FROM .epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' - GROUP BY uu.DEPT_ID) userNum left join .sys_dept d1 on d1.ID = userNum.DEPT_ID - left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID + FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' + GROUP BY uu.DEPT_ID) userNum left join esua_epdc_admin.sys_dept d1 on d1.ID = userNum.DEPT_ID + left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID ) user on user.DEPT_ID = sd.ID left join ( select @@ -1014,22 +1014,22 @@ select gr.id as orgId, sum( info.STATE = 10 ) as num, info.GRID_ID FROM - .epdc_group info + esua_epdc_group.epdc_group info GROUP BY info.GRID_ID ) daily - left join .sys_dept dept on dept.id = daily.GRID_ID - left join .sys_dept dept2 on dept2.id = dept.PID - left join .sys_dept parent on parent.id = dept2.PID and parent.type_key= 'street_party' + left join esua_epdc_admin.sys_dept dept on dept.id = daily.GRID_ID + left join esua_epdc_admin.sys_dept dept2 on dept2.id = dept.PID + left join esua_epdc_admin.sys_dept parent on parent.id = dept2.PID and parent.type_key= 'street_party' where dept2.type_key = 'street_party' or parent.type_key= 'street_party' GROUP BY IFNULL(parent.id,dept2.id) ) tto on tto.DEPT_ID = sd.ID left join ( select sum(topn.topNum) topNum ,d2.PID DEPT_ID from - ( select top.GRID_ID ,count(*) topNum from .epdc_topic top where top.DEL_FLAG = '0' - and date_format(top.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) group by top.GRID_ID ) topn - left join .sys_dept d1 on d1.ID = topn.GRID_ID - left join .sys_dept d2 on d1.PID = d2.ID + ( select top.GRID_ID ,count(*) topNum from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' + and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth} group by top.GRID_ID ) topn + left join esua_epdc_admin.sys_dept d1 on d1.ID = topn.GRID_ID + left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID ) topCount on topCount.DEPT_ID = sd.ID left join ( @@ -1045,10 +1045,10 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - .epdc_issue mei + esua_epdc_events.epdc_issue mei WHERE mei.DEL_FLAG = '0' - AND date_format( mei.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + AND date_format( mei.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY EVENT_ID, GRID_ID @@ -1056,8 +1056,8 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) issuegrid - left join .sys_dept d1 on d1.ID = issuegrid.GRID_ID - left join .sys_dept d2 on d1.PID = d2.ID + left join esua_epdc_admin.sys_dept d1 on d1.ID = issuegrid.GRID_ID + left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID ) issueCount on issueCount.DEPT_ID = sd.ID left join ( @@ -1073,10 +1073,10 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - .epdc_item item + esua_epdc_events.epdc_item item WHERE item.DEL_FLAG = '0' - AND date_format( item.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + AND date_format( item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY EVENT_ID, GRID_ID @@ -1084,32 +1084,32 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) itemgrid - left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join .sys_dept d2 on d1.PID = d2.ID + left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemCount on itemCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d2.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' - and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.ITEM_STATE = 10 group by item.GRID_ID ) itemgrid - left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join .sys_dept d2 on d1.PID = d2.ID + ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.ITEM_STATE = 10 group by item.GRID_ID ) itemgrid + left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d2.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' - and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 1 group by item.GRID_ID ) itemgrid - left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join .sys_dept d2 on d1.PID = d2.ID + ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 1 group by item.GRID_ID ) itemgrid + left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d2.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' - and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 2 group by item.GRID_ID ) itemgrid - left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join .sys_dept d2 on d1.PID = d2.ID + ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 2 group by item.GRID_ID ) itemgrid + left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' @@ -1117,8 +1117,8 @@ select gr.id as orgId, and sd.TYPE_KEY = 'street_party' union all select - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y' ) yearId, - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y%m' ) monthId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y-%m'),'%Y%m') AS monthId, 'agency' as orgType, sd.ID orgId, sd.PID parentId, @@ -1132,11 +1132,11 @@ select gr.id as orgId, IFNULL(itemCloseCount.itemNum,0) itemCloseTotal, IFNULL(itemSatisfiedCount.itemNum,0) itemSatisfiedTotal, IFNULL(itemVeryCount.itemNum,0) itemVeryTotal - from .sys_dept sd + from esua_epdc_admin.sys_dept sd left join ( select sum(userNum.partyNum) partyNum ,d1.PID DEPT_ID from (SELECT count( * ) partyNum, uu.DEPT_ID - FROM .epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' GROUP BY uu.DEPT_ID) userNum - left join .sys_dept d1 on d1.ID = userNum.DEPT_ID group by d1.PID + FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' GROUP BY uu.DEPT_ID) userNum + left join esua_epdc_admin.sys_dept d1 on d1.ID = userNum.DEPT_ID group by d1.PID ) user on user.DEPT_ID = sd.ID left join ( select @@ -1147,20 +1147,20 @@ select gr.id as orgId, sum( info.STATE = 10 ) as num, info.GRID_ID FROM - .epdc_group info + esua_epdc_group.epdc_group info GROUP BY info.GRID_ID ) daily - left join .sys_dept dept on dept.id = daily.GRID_ID - left join .sys_dept parent on parent.id = dept.PID and parent.type_key= 'community_party' + left join esua_epdc_admin.sys_dept dept on dept.id = daily.GRID_ID + left join esua_epdc_admin.sys_dept parent on parent.id = dept.PID and parent.type_key= 'community_party' where dept.type_key = 'community_party' or parent.type_key= 'community_party' GROUP BY IFNULL(parent.id,dept.id) ) tto on tto.DEPT_ID = sd.ID left join ( select sum(topn.topNum) topNum ,d1.PID DEPT_ID from - ( select top.GRID_ID ,count(*) topNum from .epdc_topic top where top.DEL_FLAG = '0' - and date_format(top.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) group by top.GRID_ID ) topn - left join .sys_dept d1 on d1.ID = topn.GRID_ID group by d1.PID + ( select top.GRID_ID ,count(*) topNum from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' + and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth} group by top.GRID_ID ) topn + left join esua_epdc_admin.sys_dept d1 on d1.ID = topn.GRID_ID group by d1.PID ) topCount on topCount.DEPT_ID = sd.ID left join ( select sum(issuegrid.issueNum) issueNum ,d1.PID DEPT_ID from @@ -1175,10 +1175,10 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - .epdc_issue mei + esua_epdc_events.epdc_issue mei WHERE mei.DEL_FLAG = '0' - AND date_format( mei.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + AND date_format( mei.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY EVENT_ID, GRID_ID @@ -1186,7 +1186,7 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) issuegrid - left join .sys_dept d1 on d1.ID = issuegrid.GRID_ID + left join esua_epdc_admin.sys_dept d1 on d1.ID = issuegrid.GRID_ID group by d1.PID ) issueCount on issueCount.DEPT_ID = sd.ID left join ( @@ -1203,10 +1203,10 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - .epdc_item item + esua_epdc_events.epdc_item item WHERE item.DEL_FLAG = '0' - AND date_format( item.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + AND date_format( item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY EVENT_ID, GRID_ID @@ -1214,37 +1214,37 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) itemgrid - left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemCount on itemCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d1.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' - and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.ITEM_STATE = 10 group by item.GRID_ID ) itemgrid - left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID + ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.ITEM_STATE = 10 group by item.GRID_ID ) itemgrid + left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d1.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' - and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 1 group by item.GRID_ID ) itemgrid - left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID + ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 1 group by item.GRID_ID ) itemgrid + left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d1.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' - and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 2 group by item.GRID_ID ) itemgrid - left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID + ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 2 group by item.GRID_ID ) itemgrid + left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'community_party' union all select - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y' ) yearId, - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y%m' ) monthId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y-%m'),'%Y%m') AS monthId, 'grid' as orgType, sd.ID orgId, sd.PID parentId, @@ -1258,17 +1258,17 @@ select gr.id as orgId, IFNULL(itemCloseCount.itemNum,0) itemCloseTotal, IFNULL(itemSatisfiedCount.itemNum,0) itemSatisfiedTotal, IFNULL(itemVeryCount.itemNum,0) itemVeryTotal - from .sys_dept sd - left join (select count(*) partyNum,uu.DEPT_ID from .epdc_user uu where uu.DEL_FLAG = '0' and uu.PARTY_FLAG = '1' group by uu.DEPT_ID) user on user.DEPT_ID = sd.ID + from esua_epdc_admin.sys_dept sd + left join (select count(*) partyNum,uu.DEPT_ID from esua_epdc_user.epdc_user uu where uu.DEL_FLAG = '0' and uu.PARTY_FLAG = '1' group by uu.DEPT_ID) user on user.DEPT_ID = sd.ID left join ( select count(*) as TIMES_TOTAL, ws.GRID_ID as DEPT_ID - from .epdc_group ws - where ws.DEL_FLAG = '0' and date_format(ws.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ),'%Y-%m' ) + from esua_epdc_group.epdc_group ws + where ws.DEL_FLAG = '0' and date_format(ws.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY ws.GRID_ID ) tto on tto.DEPT_ID = sd.ID - left join (select top.GRID_ID DEPT_ID ,count(*) topNum from .epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) group by top.GRID_ID) topCount on topCount.DEPT_ID = sd.ID + left join (select top.GRID_ID DEPT_ID ,count(*) topNum from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth} group by top.GRID_ID) topCount on topCount.DEPT_ID = sd.ID left join ( SELECT count( t.a ) issueNum, @@ -1280,10 +1280,10 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - .epdc_issue mei + esua_epdc_events.epdc_issue mei WHERE mei.DEL_FLAG = '0' - AND date_format( mei.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + AND date_format( mei.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY EVENT_ID, GRID_ID @@ -1302,10 +1302,10 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - .epdc_item item + esua_epdc_events.epdc_item item WHERE item.DEL_FLAG = '0' - AND date_format( item.CREATED_TIME, '%Y-%m' ) = date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + AND date_format( item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY EVENT_ID, GRID_ID @@ -1313,13 +1313,13 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) itemCount on itemCount.DEPT_ID = sd.ID - left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.ITEM_STATE = 10 group by item.GRID_ID) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID - left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 1 group by item.GRID_ID) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID - left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) and item.EVALUATION_SCORE = 2 group by item.GRID_ID) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID + left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.ITEM_STATE = 10 group by item.GRID_ID) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID + left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 1 group by item.GRID_ID) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID + left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 2 group by item.GRID_ID) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'grid_party' ) t @@ -1359,7 +1359,7 @@ select gr.id as orgId, select - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y' ) yearId, - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y%m' ) monthId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y-%m'),'%Y%m') AS monthId, 'agency' as orgType, sd.ID orgId, sd.PID parentId, @@ -2320,7 +2321,7 @@ union all - from .sys_dept sd + from esua_epdc_admin.sys_dept sd left join (select d3.PID DEPT_ID, @@ -2339,28 +2340,28 @@ union all from ( SELECT *, - ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) mee - LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID - left join .sys_dept d1 on d1.ID = mee.GRID_ID - left join .sys_dept d2 on d1.PID = d2.ID - left join .sys_dept d3 on d2.PID = d3.ID + LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + left join esua_epdc_admin.sys_dept d1 on d1.ID = mee.GRID_ID + left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join esua_epdc_admin.sys_dept d3 on d2.PID = d3.ID group by d3.PID ) rr on rr.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'district_party' union all select - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y' ) yearId, - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y%m' ) monthId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y-%m'),'%Y%m') AS monthId, 'agency' as orgType, sd.ID orgId, sd.PID parentId, @@ -2378,7 +2379,7 @@ union all IFNULL(rr.governRatioFm,0) governRatioFm, IFNULL(rr.satisfactionRatioFz,0) satisfactionRatioFz, IFNULL(rr.satisfactionRatioFm,0) satisfactionRatioFm - from .sys_dept sd + from esua_epdc_admin.sys_dept sd left join (select d2.PID DEPT_ID, @@ -2396,28 +2397,28 @@ union all count(mei.EVALUATION_SCORE is not null or null) as satisfactionRatioFm from ( SELECT *, - ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) mee - LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID - left join .sys_dept d1 on d1.ID = mee.GRID_ID - left join .sys_dept d2 on d1.PID = d2.ID + LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + left join esua_epdc_admin.sys_dept d1 on d1.ID = mee.GRID_ID + left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID ) rr on rr.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'street_party' union all select - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y' ) yearId, - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y%m' ) monthId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y-%m'),'%Y%m') AS monthId, 'agency' as orgType, sd.ID orgId, sd.PID parentId, @@ -2435,7 +2436,7 @@ union all IFNULL(rr.governRatioFm,0) governRatioFm, IFNULL(rr.satisfactionRatioFz,0) satisfactionRatioFz, IFNULL(rr.satisfactionRatioFm,0) satisfactionRatioFm - from .sys_dept sd + from esua_epdc_admin.sys_dept sd left join (select d1.PID DEPT_ID, @@ -2454,12 +2455,12 @@ union all from ( SELECT *, - ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) mee - LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID - left join .sys_dept d1 on d1.ID = mee.GRID_ID + LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + left join esua_epdc_admin.sys_dept d1 on d1.ID = mee.GRID_ID group by d1.PID ) rr on rr.DEPT_ID = sd.ID @@ -2467,15 +2468,15 @@ union all sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'community_party' union all select - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y' ) yearId, - date_format( date_add( now( ), INTERVAL - 1 DAY ), '%Y%m' ) monthId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, + DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y-%m'),'%Y%m') AS monthId, 'grid' as orgType, sd.ID orgId, sd.PID parentId, @@ -2493,7 +2494,7 @@ union all IFNULL(rr.governRatioFm,0) governRatioFm, IFNULL(rr.satisfactionRatioFz,0) satisfactionRatioFz, IFNULL(rr.satisfactionRatioFm,0) satisfactionRatioFm - from .sys_dept sd + from esua_epdc_admin.sys_dept sd left join (select mee.GRID_ID DEPT_ID, @@ -2511,17 +2512,17 @@ union all count(mei.EVALUATION_SCORE is not null or null) as satisfactionRatioFm from ( SELECT *, - ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = date_format(date_add( now( ), INTERVAL - 1 DAY ), '%Y-%m' ) + ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) mee - LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID GROUP BY mee.GRID_ID) rr on rr.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'grid_party' From 98cee282733f0514ab19e2de97cc670e567426d4 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, 4 Mar 2021 10:15:45 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenProjectDataDao.xml | 36 +-- .../mapper/screen/ScreenPublicDataDao.xml | 260 +++++++++--------- epdc-cloud-client-yushan | 2 +- 3 files changed, 149 insertions(+), 149 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 95f3d10..16bd992 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -46,7 +46,7 @@ t3.CREATED_TIME as closeCaseTime from (select * from(select * from .epdc_item where DEL_FLAG = '0' and GRID_ID not in ( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) order by ID)a group by a.EVENT_ID) t1 left join .epdc_img t2 on t1.EVENT_ID = t2.REFERENCE_ID and t1.DEL_FLAG = '0' @@ -105,7 +105,7 @@ where date_format(t1.UPDATED_TIME, '%Y-%m-%d') >= STR_TO_DATE(#{yearMonthDay}, '%Y-%m-%d') and date_format(t1.UPDATED_TIME, '%Y-%m-%d') <= date_sub(curdate(),interval 1 day) and t1.DEL_FLAG = '0' and t1.HANDLER_DEPT_ID not in ( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) group by t1.ID )t @@ -127,7 +127,7 @@ count( it.EVALUATION_SCORE=0 or null) as badTotal, ifnull(format(round(count(it.EVALUATION_SCORE=0 or null)/count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null),4),4),'0.0000') as badRatio - FROM `esua_epdc_admin`.`sys_dept` sd + FROM .`sys_dept` sd left join (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 AND date_format( lin.CREATED_TIME, '%Y-%m-%d' ) <= #{yesterDayDate} @@ -135,7 +135,7 @@ WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) group by sd.id @@ -153,10 +153,10 @@ count( it.EVALUATION_SCORE=0 or null) as badTotal, ifnull(format(round(count(it.EVALUATION_SCORE=0 or null)/count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null),4),4),'0.0000') as badRatio - FROM `esua_epdc_admin`.`sys_dept` sd - left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid - left join `esua_epdc_admin`.`sys_dept` st on st.id=co.pid - left join `esua_epdc_admin`.`sys_dept` di on di.id=st.pid + FROM .`sys_dept` sd + left join .`sys_dept` co on co.id=sd.pid + left join .`sys_dept` st on st.id=co.pid + left join .`sys_dept` di on di.id=st.pid left join (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 AND date_format( lin.CREATED_TIME, '%Y-%m-%d' ) <=#{yesterDayDate} @@ -164,7 +164,7 @@ WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) group by di.id @@ -183,9 +183,9 @@ count( it.EVALUATION_SCORE=0 or null) as badTotal, ifnull(format(round(count(it.EVALUATION_SCORE=0 or null)/count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null),4),4),'0.0000') as badRatio - FROM `esua_epdc_admin`.`sys_dept` sd - left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid - left join `esua_epdc_admin`.`sys_dept` st on st.id=co.pid + FROM .`sys_dept` sd + left join .`sys_dept` co on co.id=sd.pid + left join .`sys_dept` st on st.id=co.pid left join (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 AND date_format( lin.CREATED_TIME, '%Y-%m-%d' ) <=#{yesterDayDate} @@ -193,7 +193,7 @@ WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) group by st.id @@ -212,8 +212,8 @@ count( it.EVALUATION_SCORE=0 or null) as badTotal, ifnull(format(round(count(it.EVALUATION_SCORE=0 or null)/count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null),4),4),'0.0000') as badRatio - FROM `esua_epdc_admin`.`sys_dept` sd - left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid + FROM .`sys_dept` sd + left join .`sys_dept` co on co.id=sd.pid left join (select lin.* from (select * from .epdc_item order by id) lin where lin.DEL_FLAG=0 AND date_format( lin.CREATED_TIME, '%Y-%m-%d' ) <=#{yesterDayDate} @@ -221,7 +221,7 @@ WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) group by co.id @@ -236,7 +236,7 @@ ifnull(li2.unClosedTotal,0) as unClosedTotal, ifnull(li2.closedTotal,0) as closedTotal - FROM `esua_epdc_admin`.`sys_dept` sd + FROM .`sys_dept` sd left join (select li.GRID_ID, count(li.id) as projectIncr, count((li.ITEM_STATE= 5 or li.ITEM_STATE = 10) or null) as closedIncr @@ -259,7 +259,7 @@ WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) group by sd.id diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index 6927ad8..0852ad5 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -932,14 +932,14 @@ select gr.id as orgId, sd.PID parentId, sd.PIDS allParentIds , sd.NAME orgName, - (SELECT count( * ) partyTotal FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1') partyTotal, + (SELECT count( * ) partyTotal FROM .epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1') partyTotal, ( select count(*) groupTotal - from esua_epdc_group.epdc_group ws + from .epdc_group ws where ws.DEL_FLAG = '0' and date_format(ws.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) groupTotal, - (select count(*) topicTotal from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) topicTotal, + (select count(*) topicTotal from .epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) topicTotal, ( SELECT count( t.a ) issueTotal @@ -949,7 +949,7 @@ select gr.id as orgId, count(id) as a, EVENT_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' AND date_format( mei.CREATED_TIME, '%Y-%m' ) = #{yearMonth} @@ -966,7 +966,7 @@ select gr.id as orgId, count(id) as a, EVENT_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' AND date_format( item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} @@ -974,10 +974,10 @@ select gr.id as orgId, EVENT_ID )t ) projectTotal, - (select count(*) itemCloseTotal from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.ITEM_STATE = 10 ) itemCloseTotal, - (select count(*) itemSatisfiedTotal from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 1 ) itemSatisfiedTotal, - (select count(*) itemVeryTotal from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 2 ) itemVeryTotal - from esua_epdc_admin.sys_dept sd + (select count(*) itemCloseTotal from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.ITEM_STATE = 10 ) itemCloseTotal, + (select count(*) itemSatisfiedTotal from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 1 ) itemSatisfiedTotal, + (select count(*) itemVeryTotal from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 2 ) itemVeryTotal + from .sys_dept sd where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL and sd.TYPE_KEY = 'district_party' @@ -998,12 +998,12 @@ select gr.id as orgId, IFNULL(itemCloseCount.itemNum,0) itemCloseTotal, IFNULL(itemSatisfiedCount.itemNum,0) itemSatisfiedTotal, IFNULL(itemVeryCount.itemNum,0) itemVeryTotal - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join ( select sum(userNum.partyNum) partyNum , d2.PID DEPT_ID from (SELECT count( * ) partyNum, uu.DEPT_ID - FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' - GROUP BY uu.DEPT_ID) userNum left join esua_epdc_admin.sys_dept d1 on d1.ID = userNum.DEPT_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID + FROM .epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' + GROUP BY uu.DEPT_ID) userNum left join .sys_dept d1 on d1.ID = userNum.DEPT_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) user on user.DEPT_ID = sd.ID left join ( select @@ -1014,22 +1014,22 @@ select gr.id as orgId, sum( info.STATE = 10 ) as num, info.GRID_ID FROM - esua_epdc_group.epdc_group info + .epdc_group info GROUP BY info.GRID_ID ) daily - left join esua_epdc_admin.sys_dept dept on dept.id = daily.GRID_ID - left join esua_epdc_admin.sys_dept dept2 on dept2.id = dept.PID - left join esua_epdc_admin.sys_dept parent on parent.id = dept2.PID and parent.type_key= 'street_party' + left join .sys_dept dept on dept.id = daily.GRID_ID + left join .sys_dept dept2 on dept2.id = dept.PID + left join .sys_dept parent on parent.id = dept2.PID and parent.type_key= 'street_party' where dept2.type_key = 'street_party' or parent.type_key= 'street_party' GROUP BY IFNULL(parent.id,dept2.id) ) tto on tto.DEPT_ID = sd.ID left join ( select sum(topn.topNum) topNum ,d2.PID DEPT_ID from - ( select top.GRID_ID ,count(*) topNum from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' + ( select top.GRID_ID ,count(*) topNum from .epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth} group by top.GRID_ID ) topn - left join esua_epdc_admin.sys_dept d1 on d1.ID = topn.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = topn.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) topCount on topCount.DEPT_ID = sd.ID left join ( @@ -1045,7 +1045,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' AND date_format( mei.CREATED_TIME, '%Y-%m' ) = #{yearMonth} @@ -1056,8 +1056,8 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) issuegrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = issuegrid.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = issuegrid.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) issueCount on issueCount.DEPT_ID = sd.ID left join ( @@ -1073,7 +1073,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' AND date_format( item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} @@ -1084,32 +1084,32 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemCount on itemCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d2.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.ITEM_STATE = 10 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d2.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 1 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d2.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 2 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' @@ -1132,11 +1132,11 @@ select gr.id as orgId, IFNULL(itemCloseCount.itemNum,0) itemCloseTotal, IFNULL(itemSatisfiedCount.itemNum,0) itemSatisfiedTotal, IFNULL(itemVeryCount.itemNum,0) itemVeryTotal - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join ( select sum(userNum.partyNum) partyNum ,d1.PID DEPT_ID from (SELECT count( * ) partyNum, uu.DEPT_ID - FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' GROUP BY uu.DEPT_ID) userNum - left join esua_epdc_admin.sys_dept d1 on d1.ID = userNum.DEPT_ID group by d1.PID + FROM .epdc_user uu WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' GROUP BY uu.DEPT_ID) userNum + left join .sys_dept d1 on d1.ID = userNum.DEPT_ID group by d1.PID ) user on user.DEPT_ID = sd.ID left join ( select @@ -1147,20 +1147,20 @@ select gr.id as orgId, sum( info.STATE = 10 ) as num, info.GRID_ID FROM - esua_epdc_group.epdc_group info + .epdc_group info GROUP BY info.GRID_ID ) daily - left join esua_epdc_admin.sys_dept dept on dept.id = daily.GRID_ID - left join esua_epdc_admin.sys_dept parent on parent.id = dept.PID and parent.type_key= 'community_party' + left join .sys_dept dept on dept.id = daily.GRID_ID + left join .sys_dept parent on parent.id = dept.PID and parent.type_key= 'community_party' where dept.type_key = 'community_party' or parent.type_key= 'community_party' GROUP BY IFNULL(parent.id,dept.id) ) tto on tto.DEPT_ID = sd.ID left join ( select sum(topn.topNum) topNum ,d1.PID DEPT_ID from - ( select top.GRID_ID ,count(*) topNum from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' + ( select top.GRID_ID ,count(*) topNum from .epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth} group by top.GRID_ID ) topn - left join esua_epdc_admin.sys_dept d1 on d1.ID = topn.GRID_ID group by d1.PID + left join .sys_dept d1 on d1.ID = topn.GRID_ID group by d1.PID ) topCount on topCount.DEPT_ID = sd.ID left join ( select sum(issuegrid.issueNum) issueNum ,d1.PID DEPT_ID from @@ -1175,7 +1175,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' AND date_format( mei.CREATED_TIME, '%Y-%m' ) = #{yearMonth} @@ -1186,7 +1186,7 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) issuegrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = issuegrid.GRID_ID + left join .sys_dept d1 on d1.ID = issuegrid.GRID_ID group by d1.PID ) issueCount on issueCount.DEPT_ID = sd.ID left join ( @@ -1203,7 +1203,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' AND date_format( item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} @@ -1214,31 +1214,31 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemCount on itemCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d1.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.ITEM_STATE = 10 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d1.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 1 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID left join ( select sum(itemgrid.itemNum) itemNum ,d1.PID DEPT_ID from - ( select item.GRID_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' + ( select item.GRID_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 2 group by item.GRID_ID ) itemgrid - left join esua_epdc_admin.sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID + left join .sys_dept d1 on d1.ID = itemgrid.GRID_ID group by d1.PID ) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'community_party' union all @@ -1258,17 +1258,17 @@ select gr.id as orgId, IFNULL(itemCloseCount.itemNum,0) itemCloseTotal, IFNULL(itemSatisfiedCount.itemNum,0) itemSatisfiedTotal, IFNULL(itemVeryCount.itemNum,0) itemVeryTotal - from esua_epdc_admin.sys_dept sd - left join (select count(*) partyNum,uu.DEPT_ID from esua_epdc_user.epdc_user uu where uu.DEL_FLAG = '0' and uu.PARTY_FLAG = '1' group by uu.DEPT_ID) user on user.DEPT_ID = sd.ID + from .sys_dept sd + left join (select count(*) partyNum,uu.DEPT_ID from .epdc_user uu where uu.DEL_FLAG = '0' and uu.PARTY_FLAG = '1' group by uu.DEPT_ID) user on user.DEPT_ID = sd.ID left join ( select count(*) as TIMES_TOTAL, ws.GRID_ID as DEPT_ID - from esua_epdc_group.epdc_group ws + from .epdc_group ws where ws.DEL_FLAG = '0' and date_format(ws.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY ws.GRID_ID ) tto on tto.DEPT_ID = sd.ID - left join (select top.GRID_ID DEPT_ID ,count(*) topNum from esua_epdc_group.epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth} group by top.GRID_ID) topCount on topCount.DEPT_ID = sd.ID + left join (select top.GRID_ID DEPT_ID ,count(*) topNum from .epdc_topic top where top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth} group by top.GRID_ID) topCount on topCount.DEPT_ID = sd.ID left join ( SELECT count( t.a ) issueNum, @@ -1280,7 +1280,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_issue mei + .epdc_issue mei WHERE mei.DEL_FLAG = '0' AND date_format( mei.CREATED_TIME, '%Y-%m' ) = #{yearMonth} @@ -1302,7 +1302,7 @@ select gr.id as orgId, EVENT_ID, GRID_ID FROM - esua_epdc_events.epdc_item item + .epdc_item item WHERE item.DEL_FLAG = '0' AND date_format( item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} @@ -1313,13 +1313,13 @@ select gr.id as orgId, GROUP BY t.GRID_ID ) itemCount on itemCount.DEPT_ID = sd.ID - left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.ITEM_STATE = 10 group by item.GRID_ID) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID - left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 1 group by item.GRID_ID) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID - left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from esua_epdc_events.epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 2 group by item.GRID_ID) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID + left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.ITEM_STATE = 10 group by item.GRID_ID) itemCloseCount on itemCloseCount.DEPT_ID = sd.ID + left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 1 group by item.GRID_ID) itemSatisfiedCount on itemSatisfiedCount.DEPT_ID = sd.ID + left join (select item.GRID_ID DEPT_ID ,count(*) itemNum from .epdc_item item where item.DEL_FLAG = '0' and date_format(item.CREATED_TIME, '%Y-%m' ) = #{yearMonth} and item.EVALUATION_SCORE = 2 group by item.GRID_ID) itemVeryCount on itemVeryCount.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'grid_party' ) t @@ -1420,7 +1420,7 @@ select gr.id as orgId, IFNULL(behave.joinUser,0) joinUser, IFNULL(behave.issueJoinUser,0) issueJoinUser, IFNULL(issueNumber.issueNum,0) issueNum - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join ( select sum(be.joinUser) joinUser, @@ -1462,16 +1462,16 @@ select gr.id as orgId, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag FROM - esua_epdc_analysis.epdc_user_behavior_log behavior - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' - WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) + .epdc_user_behavior_log behavior + LEFT JOIN .epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' + WHERE behavior.USER_ID in ( select meu.ID from .epdc_user meu ) AND date_format(behavior.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY USER_ID, USER.DEPT_ID ) behaviorCount GROUP BY behaviorCount.DEPT_ID) be - left join esua_epdc_admin.sys_dept d1 on d1.ID = be.DEPT_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID - left join esua_epdc_admin.sys_dept d3 on d2.PID = d3.ID + left join .sys_dept d1 on d1.ID = be.DEPT_ID + left join .sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d3 on d2.PID = d3.ID group by d3.PID ) behave on behave.DEPT_ID = sd.ID left join ( @@ -1482,18 +1482,18 @@ select gr.id as orgId, ( select eisu.GRID_ID DEPT_ID, count(*) issueNum - from esua_epdc_events.epdc_issue eisu + from .epdc_issue eisu where eisu.DEL_FLAG = '0' AND date_format(eisu.DISTRIBUTE_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY eisu.GRID_ID ) isuCount - left join esua_epdc_admin.sys_dept d1 on d1.ID = isuCount.DEPT_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID - left join esua_epdc_admin.sys_dept d3 on d2.PID = d3.ID group by d3.PID + left join .sys_dept d1 on d1.ID = isuCount.DEPT_ID + left join .sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d3 on d2.PID = d3.ID group by d3.PID ) issueNumber on issueNumber.dept_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'district_party' @@ -1511,7 +1511,7 @@ select gr.id as orgId, IFNULL(behave.joinUser,0) joinUser, IFNULL(behave.issueJoinUser,0) issueJoinUser, IFNULL(issueNumber.issueNum,0) issueNum - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join ( select sum(be.joinUser) joinUser, @@ -1552,15 +1552,15 @@ select gr.id as orgId, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag - FROM esua_epdc_analysis.epdc_user_behavior_log behavior - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' - WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) + FROM .epdc_user_behavior_log behavior + LEFT JOIN .epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' + WHERE behavior.USER_ID in ( select meu.ID from .epdc_user meu ) AND date_format(behavior.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY USER_ID, USER.DEPT_ID ) behaviorCount GROUP BY behaviorCount.DEPT_ID) be - left join esua_epdc_admin.sys_dept d1 on d1.ID = be.DEPT_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID + left join .sys_dept d1 on d1.ID = be.DEPT_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) behave on behave.DEPT_ID = sd.ID left join ( select @@ -1570,17 +1570,17 @@ select gr.id as orgId, ( select eisu.GRID_ID DEPT_ID, count(*) issueNum - from esua_epdc_events.epdc_issue eisu + from .epdc_issue eisu where eisu.DEL_FLAG = '0' AND date_format(eisu.DISTRIBUTE_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY eisu.GRID_ID ) isuCount - left join esua_epdc_admin.sys_dept d1 on d1.ID = isuCount.DEPT_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID group by d2.PID + left join .sys_dept d1 on d1.ID = isuCount.DEPT_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) issueNumber on issueNumber.dept_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'street_party' @@ -1598,7 +1598,7 @@ select gr.id as orgId, IFNULL(behave.joinUser,0) joinUser, IFNULL(behave.issueJoinUser,0) issueJoinUser, IFNULL(issueNumber.issueNum,0) issueNumber - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join ( select sum(be.joinUser) joinUser, @@ -1634,14 +1634,14 @@ select gr.id as orgId, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag - FROM esua_epdc_analysis.epdc_user_behavior_log behavior - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' - WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) + FROM .epdc_user_behavior_log behavior + LEFT JOIN .epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' + WHERE behavior.USER_ID in ( select meu.ID from .epdc_user meu ) AND date_format(behavior.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY USER_ID, USER.DEPT_ID ) behaviorCount GROUP BY behaviorCount.DEPT_ID) be - left join esua_epdc_admin.sys_dept d1 on d1.ID = be.DEPT_ID group by d1.PID + left join .sys_dept d1 on d1.ID = be.DEPT_ID group by d1.PID ) behave on behave.DEPT_ID = sd.ID left join ( select @@ -1651,16 +1651,16 @@ select gr.id as orgId, ( select eisu.GRID_ID DEPT_ID, count(*) issueNum - from esua_epdc_events.epdc_issue eisu + from .epdc_issue eisu where eisu.DEL_FLAG = '0' AND date_format(eisu.DISTRIBUTE_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY eisu.GRID_ID ) isuCount - left join esua_epdc_admin.sys_dept d1 on d1.ID = isuCount.DEPT_ID group by d1.PID + left join .sys_dept d1 on d1.ID = isuCount.DEPT_ID group by d1.PID ) issueNumber on issueNumber.dept_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'community_party' @@ -1678,7 +1678,7 @@ select gr.id as orgId, IFNULL(behave.joinUser,0) joinUser, IFNULL(behave.issueJoinUser,0) issueJoinUser, IFNULL(issueNumber.issueNum,0) issueNum - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join (SELECT behaviorCount.DEPT_ID, count( behaviorCount.voiceOpposeFlag + behaviorCount.voiceLikesFlag + behaviorCount.groupPublishFlag @@ -1706,10 +1706,10 @@ select gr.id as orgId, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag - FROM esua_epdc_analysis.epdc_user_behavior_log behavior - LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID + FROM .epdc_user_behavior_log behavior + LEFT JOIN .epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' - WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) + WHERE behavior.USER_ID in ( select meu.ID from .epdc_user meu ) AND date_format(behavior.CREATED_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY USER_ID, USER.DEPT_ID ) behaviorCount @@ -1719,14 +1719,14 @@ select gr.id as orgId, select eisu.GRID_ID dept_ID, count(*) issueNum - from esua_epdc_events.epdc_issue eisu + from .epdc_issue eisu where eisu.DEL_FLAG = '0' AND date_format(eisu.DISTRIBUTE_TIME, '%Y-%m' ) = #{yearMonth} GROUP BY eisu.GRID_ID ) issueNumber on issueNumber.dept_ID = sd.ID where sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'grid_party' @@ -2321,7 +2321,7 @@ union all - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join (select d3.PID DEPT_ID, @@ -2340,21 +2340,21 @@ union all from ( SELECT *, - ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} + ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) mee - LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID - left join esua_epdc_admin.sys_dept d1 on d1.ID = mee.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID - left join esua_epdc_admin.sys_dept d3 on d2.PID = d3.ID + LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + left join .sys_dept d1 on d1.ID = mee.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID + left join .sys_dept d3 on d2.PID = d3.ID group by d3.PID ) rr on rr.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'district_party' union all @@ -2379,7 +2379,7 @@ union all IFNULL(rr.governRatioFm,0) governRatioFm, IFNULL(rr.satisfactionRatioFz,0) satisfactionRatioFz, IFNULL(rr.satisfactionRatioFm,0) satisfactionRatioFm - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join (select d2.PID DEPT_ID, @@ -2397,20 +2397,20 @@ union all count(mei.EVALUATION_SCORE is not null or null) as satisfactionRatioFm from ( SELECT *, - ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} + ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) mee - LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID - left join esua_epdc_admin.sys_dept d1 on d1.ID = mee.GRID_ID - left join esua_epdc_admin.sys_dept d2 on d1.PID = d2.ID + LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + left join .sys_dept d1 on d1.ID = mee.GRID_ID + left join .sys_dept d2 on d1.PID = d2.ID group by d2.PID ) rr on rr.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'street_party' @@ -2436,7 +2436,7 @@ union all IFNULL(rr.governRatioFm,0) governRatioFm, IFNULL(rr.satisfactionRatioFz,0) satisfactionRatioFz, IFNULL(rr.satisfactionRatioFm,0) satisfactionRatioFm - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join (select d1.PID DEPT_ID, @@ -2455,12 +2455,12 @@ union all from ( SELECT *, - ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} + ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) mee - LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID - left join esua_epdc_admin.sys_dept d1 on d1.ID = mee.GRID_ID + LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + left join .sys_dept d1 on d1.ID = mee.GRID_ID group by d1.PID ) rr on rr.DEPT_ID = sd.ID @@ -2468,7 +2468,7 @@ union all sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'community_party' @@ -2494,7 +2494,7 @@ union all IFNULL(rr.governRatioFm,0) governRatioFm, IFNULL(rr.satisfactionRatioFz,0) satisfactionRatioFz, IFNULL(rr.satisfactionRatioFm,0) satisfactionRatioFm - from esua_epdc_admin.sys_dept sd + from .sys_dept sd left join (select mee.GRID_ID DEPT_ID, @@ -2512,17 +2512,17 @@ union all count(mei.EVALUATION_SCORE is not null or null) as satisfactionRatioFm from ( SELECT *, - ( SELECT CREATED_TIME FROM esua_epdc_events.epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME - FROM esua_epdc_events.epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} + ( SELECT CREATED_TIME FROM .epdc_issue_handle WHERE DEL_FLAG = '0' AND STATE = '1' AND ISSUE_ID = issue.id ORDER BY CREATED_TIME DESC, id DESC LIMIT 1) AS HANDLE_CREATED_TIME + FROM .epdc_issue issue where issue.DEL_FLAG = '0' and date_format(issue.CREATED_TIME, '%Y-%m' ) = #{yearMonth} ) mee - LEFT JOIN esua_epdc_events.epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' - left join (select count(*) as deptCount,ITEM_ID from esua_epdc_events.epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID + LEFT JOIN .epdc_item mei ON mee.id = mei.ISSUE_ID and mei.DEL_FLAG = '0' + left join (select count(*) as deptCount,ITEM_ID from .epdc_item_dept where DEL_FLAG = '0' group by ITEM_ID) ide on ide.ITEM_ID = mei.ID GROUP BY mee.GRID_ID) rr on rr.DEPT_ID = sd.ID where sd.DEL_FLAG = '0' and sd.id IS NOT NULL AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM `esua_epdc_admin`.`sys_dept_config` t + FROM .`sys_dept_config` t WHERE t.`del_flag`= 0) and sd.TYPE_KEY = 'grid_party' diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 43f964b..6fa0f3b 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 43f964b23834db67899f4dac0f97ab99d25e225a +Subproject commit 6fa0f3b61df300d75facd3e7a402e0195633d145 From d37e93c082ad612bd5da6962ab83f5f3a13d5b14 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 4 Mar 2021 14:10:49 +0800 Subject: [PATCH 07/12] bug --- .../src/main/resources/logback-spring.xml | 2 +- .../resources/mapper/common/EpdcTableName.xml | 36 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/logback-spring.xml b/epdc-cloud-analysis-pc/src/main/resources/logback-spring.xml index e704170..d50d35f 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/logback-spring.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/logback-spring.xml @@ -151,7 +151,7 @@ - + diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml index 85c4c55..c51cb56 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml @@ -5,25 +5,25 @@ - yushan_esua_epdc_admin - yushan_esua_epdc_analysis - yushan_esua_epdc_api - yushan_esua_epdc_custom - yushan_esua_epdc_events - yushan_esua_epdc_group - yushan_esua_epdc_mutuality - yushan_esua_epdc_news - yushan_esua_epdc_user + + + + + + + + + - - - - - - - - - + esua_epdc_admin + esua_epdc_analysis + esua_epdc_api + esua_epdc_custom + esua_epdc_events + esua_epdc_group + esua_epdc_mutuality + esua_epdc_news + esua_epdc_user From 4690e700fabd66fbe53a7ff7777b339df7ae0685 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Mar 2021 10:11:23 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=90=AC=E8=BF=81=E5=AD=94=E6=9D=91?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenPublicDataController.java | 39 +- .../screen/dao/ScreenPublicDataDao.java | 22 +- .../mapper/screen/ScreenBasicDataDao.xml | 216 +- .../mapper/screen/ScreenIndexDataDao.xml | 168 +- .../mapper/screen/ScreenProjectDataDao.xml | 114 +- .../mapper/screen/ScreenPublicDataDao.xml | 5476 +++++++++-------- 6 files changed, 3013 insertions(+), 3022 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java index c4b5045..16d1e1b 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenPublicDataController.java @@ -58,24 +58,25 @@ public class ScreenPublicDataController { return screenPublicDataService.customerDept(); } + + /** - * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 001、基层党建-党员基本情况 * @author wk * @date 2020/8/19 17:25 * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("cpcbasedata") public Result cpcbasedata() { return screenPublicDataService.cpcbasedata(); } - /** - * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 002、党建引领-先锋模范数据 * @author wangtong * @date 2020/8/20 18:02 * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("pioneerdata") public Result pioneerdata() { @@ -83,20 +84,18 @@ public class ScreenPublicDataController { } /** - * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 003、党建引领-党员联系群众数据 * @author wangtong * @date 2020/8/20 14:25 * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("partylinkmassesdata") public Result partylinkmassesdata() { return screenPublicDataService.partylinkmassesdata(); } - /** * 004、党建引领-先进排行榜单-先进支部排行 - * * @Params: * @Return: OrgrankdataResultDTO * @Author: wanggongfeng @@ -104,12 +103,10 @@ public class ScreenPublicDataController { */ @PostMapping("orgrankdata") public Result orgrankdata(@RequestBody ScreenJobFormDTO formDto) { - return screenPublicDataService.getOrgrankdata(formDto.getYearMonth()); + return screenPublicDataService.getOrgrankdata(formDto.getYearMonth()); } - /** * 005、党建引领|基层治理-居民（党员）积分排行榜 - * * @Params: * @Return: PartyuserrankdataResultDTO * @Author: wk @@ -117,13 +114,11 @@ public class ScreenPublicDataController { */ @PostMapping("partyuserrankdata") public Result partyuserrankdata() { - return screenPublicDataService.getPartyuserrankdata(); + return screenPublicDataService.getPartyuserrankdata(); } - /** - * 006、基层治理-难点赌点项目上报 - * + * 006、基层治理-难点赌点项目上报 * @Params: * @Return: DifficultydataResultDTO * @Author: wk @@ -131,12 +126,10 @@ public class ScreenPublicDataController { */ @PostMapping("difficultydata") public Result difficultydata() { - return screenPublicDataService.getDifficultydata(); + return screenPublicDataService.getDifficultydata(); } - /** * 007、基层治理-公众参与 - * * @Params: * @Return: UserjoinResultDTO * @Author: wanggongfeng @@ -144,25 +137,22 @@ public class ScreenPublicDataController { */ @PostMapping("userjoin") public Result userjoin(@RequestBody ScreenJobFormDTO formDto) { - return screenPublicDataService.getUserjoin(formDto.getYearMonth()); + return screenPublicDataService.getUserjoin(formDto.getYearMonth()); } - /** - * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 008、公众参与各类总数 * @author wangtong * @date 2020/8/24 18:27 * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("publicpartitotaldata") public Result publicpartitotaldata() { return screenPublicDataService.publicpartitotaldata(); } - /** * 009、基层治理-治理能力数据 - * * @Params: * @Return: GovernrankdataResultDTO * @Author: wanggongfeng @@ -170,20 +160,17 @@ public class ScreenPublicDataController { */ @PostMapping("governrankdata") public Result governrankdata(@RequestBody ScreenJobFormDTO formDto) { - return screenPublicDataService.getGovernrankdata(formDto.getYearMonth()); + return screenPublicDataService.getGovernrankdata(formDto.getYearMonth()); } - /** - * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 010、中央区各类总数 * @author wk * @date 2020/8/21 10:32 * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("usertotaldata") public Result usertotaldata() { return screenPublicDataService.usertotaldata(); } - - } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java index c1507eb..fdaee39 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenPublicDataDao.java @@ -41,6 +41,15 @@ public interface ScreenPublicDataDao extends BaseDao */ List customerDept(); + /** + * @describe: 中央区各类总数 + * @author wk + * @date 2020/8/21 10:32 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List usertotaldata(); + /** * @describe: 001、基层党建-党员基本情况 * @author wk @@ -72,6 +81,7 @@ public interface ScreenPublicDataDao extends BaseDao * @Return: OrgrankdataResultDTO * @Author: wanggongfeng * @Date: 2020/08/19 + * @param yearMonth */ List getOrgrankdata(@Param("yearMonth")String yearMonth); /** @@ -97,6 +107,7 @@ public interface ScreenPublicDataDao extends BaseDao * @Return: UserjoinResultDTO * @Author: wanggongfeng * @Date: 2020/08/20 + * @param yearMonth */ List getUserjoin(@Param("yearMonth")String yearMonth); @@ -114,16 +125,7 @@ public interface ScreenPublicDataDao extends BaseDao * @Return: GovernrankdataResultDTO * @Author: wanggongfeng * @Date: 2020/08/19 + * @param yearMonth */ List getGovernrankdata(@Param("yearMonth")String yearMonth); - - - /** - * @describe: 中央区各类总数 - * @author wk - * @date 2020/8/21 10:32 - * @params [] - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ - List usertotaldata(); } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml index 547d959..0ebb044 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml @@ -18,22 +18,22 @@ t8.vounteerCount FROM( SELECT COUNT(sd.id) AS gridCount - FROM .sys_dept sd + FROM `esua_epdc_admin`.sys_dept sd WHERE sd.del_flag= 0 AND sd.type_key= 'grid_party' AND sd.`ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t0, ( SELECT COUNT(tmp.GRID_ID) AS openedGridCount FROM( SELECT edmc.`GRID_ID` - FROM .epdc_dept_ma_code edmc + FROM esua_epdc_admin.epdc_dept_ma_code edmc WHERE edmc.DEL_FLAG= '0' AND edmc.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY edmc.GRID_ID) tmp) t1, ( @@ -43,66 +43,66 @@ OR t.`DEPT_ID`= 0 OR t.`DEPT_ID`= '' THEN( SELECT t1.`GRID_ID` - FROM .`epdc_user_grid_relation` t1 + FROM `esua_epdc_user`.`epdc_user_grid_relation` t1 WHERE t1.`DEL_FLAG`= '0' AND t1.`USER_ID`= t.`ID` ORDER BY t1.`CREATED_TIME` LIMIT 1) ELSE t.`DEPT_ID` END AS GRID_ID - FROM .`epdc_user` t + FROM `esua_epdc_user`.`epdc_user` t WHERE t.`DEL_FLAG`= '0') tmp WHERE tmp.GRID_ID NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t2, ( SELECT COUNT(ei.`ID`) AS issueCount, SUM(ei.`ISSUE_STATE`= 4) AS projectCount - FROM .`epdc_issue` ei + FROM `esua_epdc_events`.`epdc_issue` ei WHERE ei.`DEL_FLAG`= '0' AND ei.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t3, ( SELECT COUNT(eg.`ID`) AS groupCount - FROM .`epdc_group` eg + FROM `esua_epdc_group`.`epdc_group` eg WHERE eg.`DEL_FLAG`= '0' AND eg.`STATE` IN(10, 15) AND eg.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t4, ( SELECT COUNT(et.`ID`) AS topicCount - FROM .`epdc_topic` et + FROM `esua_epdc_group`.`epdc_topic` et WHERE et.`DEL_FLAG`= '0' AND et.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t5, ( SELECT COUNT(en.`ID`) AS newsCount, SUM(en.`READING_AMOUNT`) AS readCount - FROM .`epdc_news` en + FROM `esua_epdc_news`.`epdc_news` en WHERE en.`DEL_FLAG`= '0' AND en.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t6, ( SELECT COUNT(eai.`ID`) AS actCount - FROM .`epdc_act_info` eai + FROM `esua_epdc_mutuality`.`epdc_act_info` eai WHERE eai.`DEL_FLAG`= '0' AND eai.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t7, ( SELECT COUNT(evi.`ID`) AS vounteerCount - FROM .`epdc_volunteer_info` evi + FROM `esua_epdc_user`.`epdc_volunteer_info` evi WHERE evi.`DEL_FLAG`= '0' AND evi.`AUDIT_STATUS` ]]> '2' AND evi.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t8 @@ -122,43 +122,43 @@ IFNULL(t0.issueCount, 0) AS passedCount, IFNULL(t0.itemCount, 0) AS shiftToProjectCount, IFNULL(t2.avgAuditTime, 0) AS avgAuditTime - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT ei.`GRID_ID` AS gridId, COUNT(ei.`ID`) AS issueCount, SUM(ei.`ISSUE_STATE`= 0) AS processingCount, SUM(ei.`ISSUE_STATE`= 2) AS closedCount, SUM(ei.`ISSUE_STATE`= 4) AS itemCount, SUM(ee.`BROWSE_NUM`) AS issueViewCount, SUM(ee.`APPROVE_NUM`+ ee.`OPPOSE_NUM`+ ee.`COMMENT_NUM`) AS voteCount - FROM .`epdc_issue` ei - LEFT JOIN .`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` + FROM `esua_epdc_events`.`epdc_issue` ei + LEFT JOIN `esua_epdc_events`.`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` AND ee.`DEL_FLAG`= '0' WHERE ei.`DEL_FLAG`= '0' AND ei.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY ei.`GRID_ID`) t0 ON t0.gridId= sd.`id` LEFT JOIN( SELECT ee.`GRID_ID`, COUNT(ee.`ID`) AS reportCount, SUM(ee.`EVENT_STATE`= 0) AS pendingCount, SUM(ee.`EVENT_STATE`= 2) AS rejectedCount - FROM .`epdc_events` ee + FROM `esua_epdc_events`.`epdc_events` ee WHERE ee.`DEL_FLAG`= '0' AND ee.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY ee.`GRID_ID`) t1 ON t1.GRID_ID= sd.`id` LEFT JOIN( SELECT ei.`GRID_ID`, round(SUM(TIMESTAMPDIFF(MINUTE, ee.`CREATED_TIME`, ei.`CREATED_TIME`)) / COUNT(ei.`ID`), 2) AS 'avgAuditTime' - FROM .`epdc_issue` ei - LEFT JOIN .`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` + FROM `esua_epdc_events`.`epdc_issue` ei + LEFT JOIN `esua_epdc_events`.`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` AND ee.`DEL_FLAG`= '0' WHERE ei.`DEL_FLAG`= '0' AND ei.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY ei.`GRID_ID`) t2 ON t2.GRID_ID= sd.`id` WHERE sd.`del_flag`= '0' AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -168,22 +168,22 @@ sd.`name` AS gridName, sd.`pid` AS parentAgencyId, IFNULL(t0.reportCount, 0) AS reportCount - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT ee.`GRID_ID`, COUNT(ee.`ID`) AS reportCount - FROM .`epdc_events` ee + FROM `esua_epdc_events`.`epdc_events` ee WHERE ee.`DEL_FLAG`= '0' AND DATE_FORMAT(ee.`CREATED_TIME`, '%Y-%m')= #{yearMonth} AND ee.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY ee.`GRID_ID`) t0 ON t0.GRID_ID= sd.`id` WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -203,7 +203,7 @@ IFNULL(t0.ageLevel6, 0) AS ageLevel6, IFNULL(t0.malePartyUserCount, 0) AS malePartyUserCount, IFNULL(t0.femalePartyUserCount, 0) AS femalePartyUserCount - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT tmp.GRID_ID, COUNT(tmp.ID) AS visitorCount, SUM(tmp.PARTY_FLAG= '1') AS partyCount, SUM(tmp.PARTY_FLAG= '1' AND tmp.age 20) AS ageLevel1, SUM(tmp.PARTY_FLAG= '1' @@ -223,13 +223,13 @@ OR t.`DEPT_ID`= 0 OR t.`DEPT_ID`= '' THEN( SELECT t1.`GRID_ID` - FROM .`epdc_user_grid_relation` t1 + FROM `esua_epdc_user`.`epdc_user_grid_relation` t1 WHERE t1.`DEL_FLAG`= '0' AND t1.`USER_ID`= t.`ID` ORDER BY t1.`CREATED_TIME` LIMIT 1) ELSE t.`DEPT_ID` END AS GRID_ID - FROM .`epdc_user` t - LEFT JOIN .`epdc_user_grid_relation` t1 ON t1.`USER_ID`= t.`ID` + FROM `esua_epdc_user`.`epdc_user` t + LEFT JOIN `esua_epdc_user`.`epdc_user_grid_relation` t1 ON t1.`USER_ID`= t.`ID` AND t1.`DEL_FLAG`= '0' WHERE t.`DEL_FLAG`= '0' GROUP BY t.`ID`) tmp @@ -238,7 +238,7 @@ AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -254,16 +254,16 @@ eu.`POINTS` AS points FROM( SELECT evi.`ID`, evi.`GRID_ID`, evi.`USER_ID`, evi.`REAL_NAME`, evi.`KINDNESS_TIME` - FROM .`epdc_volunteer_info` evi + FROM `esua_epdc_user`.`epdc_volunteer_info` evi WHERE evi.`DEL_FLAG`= '0' AND evi.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) ORDER BY evi.`KINDNESS_TIME` DESC, evi.`PARTICIPATION_NUM` DESC, evi.`CREATED_TIME` LIMIT #{pageSize}) tmp - LEFT JOIN .`sys_dept` sd ON sd.`id`= tmp.GRID_ID - LEFT JOIN .`epdc_user` eu ON eu.`ID`= tmp.USER_ID + LEFT JOIN `esua_epdc_admin`.`sys_dept` sd ON sd.`id`= tmp.GRID_ID + LEFT JOIN `esua_epdc_user`.`epdc_user` eu ON eu.`ID`= tmp.USER_ID @@ -318,39 +318,39 @@ SELECT COUNT(*) AS actCount, SUM(tmp.actPoints) AS rewardPointCount FROM( SELECT(eai.`REWARD` * SUM(eaur.`STATUS`= '5')) AS actPoints - FROM .`epdc_act_info` eai - LEFT JOIN .`epdc_act_user_relation` eaur ON eaur.`ACT_ID`= eai.`ID` + FROM `esua_epdc_mutuality`.`epdc_act_info` eai + LEFT JOIN `esua_epdc_mutuality`.`epdc_act_user_relation` eaur ON eaur.`ACT_ID`= eai.`ID` AND eaur.`DEL_FLAG`= '0' WHERE eai.`DEL_FLAG`= '0' AND eai.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY eai.`ID`) tmp) t0, ( SELECT COUNT(evi.`ID`) AS volunteerCount, SUM(evi.`KINDNESS_TIME`) AS heartTime - FROM .`epdc_volunteer_info` evi + FROM `esua_epdc_user`.`epdc_volunteer_info` evi WHERE evi.`DEL_FLAG`= '0' AND evi.`AUDIT_STATUS` ]]> '2' AND evi.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0)) t1, ( SELECT COUNT(eaur.`ID`) AS partiUserCount - FROM .`epdc_act_user_relation` eaur + FROM `esua_epdc_mutuality`.`epdc_act_user_relation` eaur WHERE eaur.`DEL_FLAG`= '0' AND eaur.`STATUS` IN('1', '2', '5', '6')) t2 @@ -367,7 +367,7 @@ IFNULL(t0.ageLevel6, 0) AS ageLevel6, IFNULL(t0.maleCount, 0) AS maleCount, IFNULL(t0.femaleCount, 0) AS femaleCount - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT tmp.GRID_ID, SUM(tmp.age 20) AS ageLevel1, SUM(tmp.age = ]]> 20 AND tmp.age 30) AS ageLevel2, SUM(tmp.age = ]]> 30 @@ -376,14 +376,14 @@ AND tmp.age 60) AS ageLevel5, SUM(tmp.age = ]]> 60) AS ageLevel6, SUM(tmp.SEX= '1') AS maleCount, SUM(tmp.SEX= '0') AS femaleCount FROM( SELECT evi.`GRID_ID`, evi.`SEX`, IFNULL(TIMESTAMPDIFF(YEAR, evi.BIRTHDAY, CURDATE()), 0) AS age - FROM .`epdc_volunteer_info` evi + FROM `esua_epdc_user`.`epdc_volunteer_info` evi WHERE evi.`DEL_FLAG`= '0') tmp GROUP BY tmp.GRID_ID) t0 ON t0.GRID_ID= sd.`id` WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -400,13 +400,13 @@ IFNULL(t0.projectViewCount, 0) AS projectViewCount, IFNULL(t0.voteCount, 0) AS voteCount, IFNULL(t2.avgClosedCaseTime, 0) AS avgClosedCaseTime - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT tmp.GRID_ID, COUNT(*) AS projectCount, SUM(tmp.`ITEM_STATE`= 0) AS processingCount, SUM(tmp.`ITEM_STATE`= 5) AS closedCount, SUM(tmp.`ITEM_STATE`= 10) AS closedCaseCount, SUM(tmp.`BROWSE_NUM`) AS projectViewCount, SUM(tmp.`voteCount`) AS voteCount FROM( SELECT ei.`GRID_ID`, ei.`ITEM_STATE`, ee.`BROWSE_NUM`,(ee.`APPROVE_NUM`+ ee.`OPPOSE_NUM`+ ee.`COMMENT_NUM`) AS voteCount - FROM .`epdc_item` ei - LEFT JOIN .`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` + FROM `esua_epdc_events`.`epdc_item` ei + LEFT JOIN `esua_epdc_events`.`epdc_events` ee ON ee.`ID`= ei.`EVENT_ID` WHERE ei.`DEL_FLAG`= '0' GROUP BY ei.`ISSUE_ID`) tmp GROUP BY tmp.GRID_ID) t0 ON t0.GRID_ID= sd.`id` @@ -414,29 +414,29 @@ SELECT tmp.GRID_ID, SUM(tmp.moveCount) AS moveCount FROM( SELECT eid.`ITEM_ID`, ei.`GRID_ID`,(COUNT(eid.`ID`) - 1) AS moveCount - FROM .`epdc_item_dept` eid - LEFT JOIN .`epdc_item` ei ON ei.`ID`= eid.`ITEM_ID` + FROM `esua_epdc_events`.`epdc_item_dept` eid + LEFT JOIN `esua_epdc_events`.`epdc_item` ei ON ei.`ID`= eid.`ITEM_ID` GROUP BY eid.`ITEM_ID`) tmp GROUP BY tmp.GRID_ID) t1 ON t1.GRID_ID= sd.`id` LEFT JOIN( SELECT ei.`GRID_ID`, round(SUM(tmp.itemTime) / COUNT(tmp.ITEM_ID), 2) AS avgClosedCaseTime FROM( SELECT t.`ITEM_ID`, TIMESTAMPDIFF(MINUTE, MIN(t.`CREATED_TIME`), MAX(t.`CREATED_TIME`)) AS itemTime - FROM .`epdc_item_handle_process` t + FROM `esua_epdc_events`.`epdc_item_handle_process` t WHERE t.`ITEM_ID` IN( SELECT eihp.`ITEM_ID` - FROM .`epdc_item_handle_process` eihp + FROM `esua_epdc_events`.`epdc_item_handle_process` eihp WHERE eihp.`DEL_FLAG`= '0' AND eihp.`STATE`= 10) GROUP BY t.`ITEM_ID` ORDER BY `CREATED_TIME`) tmp - LEFT JOIN .`epdc_item` ei ON ei.`ID`= tmp.ITEM_ID + LEFT JOIN `esua_epdc_events`.`epdc_item` ei ON ei.`ID`= tmp.ITEM_ID GROUP BY ei.`GRID_ID`) t2 ON t2.GRID_ID= sd.`id` WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -450,15 +450,15 @@ COUNT(tmp.ID) AS projectCount FROM( SELECT ei.`ID`, ei.`GRID_ID`, ei.`FIRST_CATEGORY_CODE` - FROM .`epdc_item` ei + FROM `esua_epdc_events`.`epdc_item` ei WHERE ei.`DEL_FLAG`= '0' AND ei.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY ei.`ISSUE_ID`) tmp - LEFT JOIN .`epdc_category` ec ON ec.`category_code`= tmp.FIRST_CATEGORY_CODE - LEFT JOIN .`sys_dept` sd ON sd.`id`= tmp.GRID_ID + LEFT JOIN `esua_epdc_events`.`epdc_category` ec ON ec.`category_code`= tmp.FIRST_CATEGORY_CODE + LEFT JOIN `esua_epdc_admin`.`sys_dept` sd ON sd.`id`= tmp.GRID_ID GROUP BY tmp.GRID_ID, tmp.FIRST_CATEGORY_CODE @@ -471,10 +471,10 @@ IFNULL(t0.disSatisfaction, 0) AS disSatisfaction, IFNULL(t0.goodSatisfaction, 0) AS goodSatisfaction, IFNULL(t0.greatSatisfaction, 0) AS greatSatisfaction - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT ei.`GRID_ID`, SUM(ei.`EVALUATION_SCORE`= 0) AS disSatisfaction, SUM(ei.`EVALUATION_SCORE`= 1) AS goodSatisfaction, SUM(ei.`EVALUATION_SCORE`= 2) AS greatSatisfaction - FROM .`epdc_item` ei + FROM `esua_epdc_events`.`epdc_item` ei WHERE ei.`DEL_FLAG`= '0' AND DATE_FORMAT(ei.`EVALUATION_TIME`, '%Y-%m')= #{yearMonth} GROUP BY ei.`GRID_ID`) t0 ON t0.GRID_ID= sd.`id` @@ -482,7 +482,7 @@ AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -491,12 +491,12 @@ SUM(en.`READING_AMOUNT`) AS readCount, SUM(en.`LIKE_NUMBER`) AS likeCount, SUM(en.`COMMENT_NUM`) AS commentCount - FROM .`epdc_news` en + FROM `esua_epdc_news`.`epdc_news` en WHERE en.`DEL_FLAG`= '0' AND en.`NEWS_RELEASE_STATE`= '0' AND en.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -504,30 +504,30 @@ SELECT(t0.commentNum+ t1.attitudeNum) AS partiCount FROM( SELECT COUNT(enc.`ID`) AS commentNum - FROM .`epdc_news_comment` enc + FROM `esua_epdc_news`.`epdc_news_comment` enc WHERE enc.`DEL_FLAG`= '0' AND DATE_FORMAT(enc.`CREATED_TIME`, '%Y-%m')= #{yearMonth} AND enc.`NEWS_ID` IN( SELECT t.`ID` - FROM .`epdc_news` t + FROM `esua_epdc_news`.`epdc_news` t WHERE t.`DEL_FLAG`= '0' AND t.`NEWS_RELEASE_STATE`= '0' AND t.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0))) t0,( SELECT COUNT(enua.`ID`) attitudeNum - FROM .`epdc_news_user_attitude` enua + FROM `esua_epdc_news`.`epdc_news_user_attitude` enua WHERE enua.`DEL_FLAG`= '0' AND DATE_FORMAT(enua.`CREATED_TIME`, '%Y-%m')= #{yearMonth} AND enua.`EPDC_NEWS_ID` IN( SELECT t.`ID` - FROM .`epdc_news` t + FROM `esua_epdc_news`.`epdc_news` t WHERE t.`DEL_FLAG`= '0' AND t.`NEWS_RELEASE_STATE`= '0' AND t.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0))) t1 @@ -535,13 +535,13 @@ SELECT en.`ID` AS newsId, en.`NEWS_TITLE` AS newsTitle, (en.`LIKE_NUMBER`+ en.`UN_LIKE_NUMBER`+ en.`COMMENT_NUM`) AS hotCount - FROM .`epdc_news` en + FROM `esua_epdc_news`.`epdc_news` en WHERE en.`DEL_FLAG`= '0' AND en.`NEWS_RELEASE_STATE`= '0' AND en.`NEWS_UP_DOWN_STATE`= '0' AND en.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) ORDER BY hotCount DESC, en.`CREATED_TIME` DESC @@ -555,13 +555,13 @@ SUM(en.`READING_AMOUNT`) AS readCount, SUM(en.`LIKE_NUMBER`) AS likeCount, SUM(en.`UN_LIKE_NUMBER`) AS disLikeCount - FROM .`epdc_news` en - LEFT JOIN .`epdc_news_category` enc ON enc.`ID`= en.`NEWS_CATERORY_ID` + FROM `esua_epdc_news`.`epdc_news` en + LEFT JOIN `esua_epdc_news`.`epdc_news_category` enc ON enc.`ID`= en.`NEWS_CATERORY_ID` WHERE en.`DEL_FLAG`= '0' AND en.`NEWS_RELEASE_STATE`= '0' AND en.`DEPT_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY en.`NEWS_CATERORY_ID` @@ -576,11 +576,11 @@ IFNULL(t1.topicCount, 0) AS topicCount, IFNULL(t1.partiCount, 0) AS partiCount, IFNULL(t1.shiftIssueCount, 0) AS shiftIssueCount - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd LEFT JOIN( SELECT eg.`GRID_ID`, COUNT(DISTINCT eg.`ID`) AS groupCount, COUNT(DISTINCT eug.`ID`) AS memberCount - FROM .`epdc_group` eg - LEFT JOIN .`epdc_user_group` eug ON eug.`GROUP_ID`= eg.`ID` + FROM `esua_epdc_group`.`epdc_group` eg + LEFT JOIN `esua_epdc_group`.`epdc_user_group` eug ON eug.`GROUP_ID`= eg.`ID` AND eug.`DEL_FLAG`= '0' AND eug.`STATE`= 10 WHERE eg.`DEL_FLAG`= '0' @@ -589,8 +589,8 @@ LEFT JOIN( SELECT eg.`GRID_ID`, COUNT(DISTINCT et.`ID`) AS topicCount, SUM(et.`COMMENT_NUM`) AS partiCount, SUM(et.`STATE`= 10 OR et.`STATE`= 15) AS shiftIssueCount - FROM .`epdc_group` eg - LEFT JOIN .`epdc_topic` et ON et.`GROUP_ID`= eg.`ID` + FROM `esua_epdc_group`.`epdc_group` eg + LEFT JOIN `esua_epdc_group`.`epdc_topic` et ON et.`GROUP_ID`= eg.`ID` AND et.`DEL_FLAG`= '0' WHERE eg.`DEL_FLAG`= '0' AND eg.`STATE` IN(10, 15) @@ -599,7 +599,7 @@ AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -617,25 +617,25 @@ FROM( SELECT eg.`GRID_ID`, eg.`ID`, eg.`GROUP_NAME`, eug.`NICKNAME`,( SELECT COUNT(t.`ID`) - FROM .`epdc_user_group` t + FROM `esua_epdc_group`.`epdc_user_group` t WHERE t.`DEL_FLAG`= '0' AND t.`STATE`= 10 AND t.`GROUP_ID`= eg.`ID`) AS memberCount, COUNT(et.`ID`) AS topicCount, SUM(et.`STATE`= 10 OR et.`STATE`= 15) AS shiftIssueCount - FROM .`epdc_group` eg - LEFT JOIN .`epdc_user_group` eug ON eug.`GROUP_ID`= eg.`ID` + FROM `esua_epdc_group`.`epdc_group` eg + LEFT JOIN `esua_epdc_group`.`epdc_user_group` eug ON eug.`GROUP_ID`= eg.`ID` AND eug.`DEL_FLAG`= '0' AND eug.`STATE`= 10 AND eug.`LORD_FLAG`= '1' - LEFT JOIN .`epdc_topic` et ON et.`GROUP_ID`= eg.`ID` + LEFT JOIN `esua_epdc_group`.`epdc_topic` et ON et.`GROUP_ID`= eg.`ID` AND et.`DEL_FLAG`= '0' WHERE eg.`DEL_FLAG`= '0' AND eg.`GRID_ID` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) GROUP BY eg.`ID`) t0 - LEFT JOIN .`sys_dept` sd ON sd.`id`= t0.GRID_ID + LEFT JOIN `esua_epdc_admin`.`sys_dept` sd ON sd.`id`= t0.GRID_ID @@ -678,20 +678,20 @@ OR t.`DEPT_ID`= 0 OR t.`DEPT_ID`= '' THEN( SELECT t1.`GRID_ID` - FROM .`epdc_user_grid_relation` t1 + FROM `esua_epdc_user`.`epdc_user_grid_relation` t1 WHERE t1.`DEL_FLAG`= '0' AND t1.`USER_ID`= t.`ID` ORDER BY t1.`CREATED_TIME` LIMIT 1) ELSE t.`DEPT_ID` END AS GRID_ID - FROM .`epdc_user` t + FROM `esua_epdc_user`.`epdc_user` t WHERE t.`DEL_FLAG`= '0' ORDER BY t.`POINTS` DESC LIMIT #{pageSize}) t0 - LEFT JOIN .`sys_dept` sd ON sd.`id`= t0.GRID_ID - LEFT JOIN .`sys_dept` sd1 ON sd1.`id`= sd.`pid` + LEFT JOIN `esua_epdc_admin`.`sys_dept` sd ON sd.`id`= t0.GRID_ID + LEFT JOIN `esua_epdc_admin`.`sys_dept` sd1 ON sd1.`id`= sd.`pid` WHERE t0.GRID_ID NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml index 0619d9c..28807ad 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml @@ -24,14 +24,14 @@ IFNULL( partyGroup.groupActiveUserCount, 0 ) AS groupActiveUserCount, 0 joinThreeMeetsCount FROM - .sys_dept d - LEFT JOIN .sys_dept co on co.id=d.pid - LEFT JOIN .epdc_user us ON us.DEPT_ID = d.id + esua_epdc_admin.sys_dept d + LEFT JOIN esua_epdc_admin.sys_dept co on co.id=d.pid + LEFT JOIN esua_epdc_user.epdc_user us ON us.DEPT_ID = d.id LEFT JOIN ( SELECT USER_ID, count( et.id ) AS createTopicCount - FROM .epdc_topic et + FROM esua_epdc_group.epdc_topic et WHERE et.DEL_FLAG = '0' AND et.PARTY_MEMBER = '1' @@ -43,7 +43,7 @@ SELECT USER_ID, count( et.id ) AS createTopicCount - FROM .epdc_topic_comment et + FROM esua_epdc_group.epdc_topic_comment et WHERE et.DEL_FLAG = '0' AND et.PARTY_FLAG = '1' @@ -56,7 +56,7 @@ USER_ID, count( et.id ) AS shiftIssueCount FROM - .epdc_topic et + esua_epdc_group.epdc_topic et WHERE et.DEL_FLAG = '0' AND et.PARTY_MEMBER = '1' @@ -70,7 +70,7 @@ USER_ID, count( et.id ) AS shiftProjectCount FROM - .epdc_item et + esua_epdc_events.epdc_item et WHERE et.DEL_FLAG = '0' AND et.IS_PARTY_MEMBER = '1' @@ -83,7 +83,7 @@ USER_ID, round( ( count( ISSUE_STATE = 4 ) / count( id ) ) * 100, 2 ) AS topicToIssueRatio FROM - .epdc_issue ei + esua_epdc_events.epdc_issue ei WHERE DEL_FLAG = '0' AND ei.IS_PARTY_MEMBER = '1' @@ -101,22 +101,22 @@ eg.id AS GROUP_ID, eug.USER_ID FROM - .epdc_group eg - LEFT JOIN .epdc_user_group eug ON eug.GROUP_ID = eg.id + esua_epdc_group.epdc_group eg + LEFT JOIN esua_epdc_group.epdc_user_group eug ON eug.GROUP_ID = eg.id WHERE eg.DEL_FLAG = '0' AND eug.LORD_FLAG = '1' AND eg.STATE = 10 GROUP BY eg.id ) meGroup LEFT JOIN( SELECT GROUP_ID, count( id ) AS userCount - FROM .epdc_user_group WHERE DEL_FLAG = '0' AND STATE = 10 GROUP BY GROUP_ID + FROM esua_epdc_group.epdc_user_group WHERE DEL_FLAG = '0' AND STATE = 10 GROUP BY GROUP_ID ) userCount ON userCount.GROUP_ID = meGroup.GROUP_ID LEFT JOIN ( SELECT GROUP_ID, count( id ) AS topicCount FROM - .epdc_topic + esua_epdc_group.epdc_topic WHERE DEL_FLAG = '0' AND date_format( CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} @@ -135,8 +135,8 @@ eg.id AS GROUP_ID, et.USER_ID FROM - .epdc_group eg - LEFT JOIN .epdc_topic et ON et.GROUP_ID = eg.id + esua_epdc_group.epdc_group eg + LEFT JOIN esua_epdc_group.epdc_topic et ON et.GROUP_ID = eg.id WHERE eg.DEL_FLAG = '0' AND eg.STATE = 10 @@ -147,9 +147,9 @@ eg.id AS GROUP_ID, etc.USER_ID FROM - .epdc_group eg - LEFT JOIN .epdc_topic et ON et.GROUP_ID = eg.id - LEFT JOIN .epdc_topic_comment etc ON etc.TOPIC_ID = et.id + esua_epdc_group.epdc_group eg + LEFT JOIN esua_epdc_group.epdc_topic et ON et.GROUP_ID = eg.id + LEFT JOIN esua_epdc_group.epdc_topic_comment etc ON etc.TOPIC_ID = et.id WHERE eg.DEL_FLAG = '0' AND eg.STATE = 10 @@ -161,10 +161,10 @@ eg.id AS GROUP_ID, cua.USER_ID FROM - . epdc_group eg - LEFT JOIN .epdc_topic et ON et.GROUP_ID = eg.id - LEFT JOIN .epdc_topic_comment etc ON etc.TOPIC_ID = et.id - LEFT JOIN .epdc_topic_comment_user_attitude cua ON cua.COMMENT_ID = etc.id + esua_epdc_group. epdc_group eg + LEFT JOIN esua_epdc_group.epdc_topic et ON et.GROUP_ID = eg.id + LEFT JOIN esua_epdc_group.epdc_topic_comment etc ON etc.TOPIC_ID = et.id + LEFT JOIN esua_epdc_group.epdc_topic_comment_user_attitude cua ON cua.COMMENT_ID = etc.id WHERE eg.DEL_FLAG = '0' AND eg.STATE = 10 @@ -185,7 +185,7 @@ AND us.DEL_FLAG = '0' AND us.PARTY_FLAG = '1' AND d.id NOT IN ( - SELECT t.DEPT_ID FROM .`sys_dept_config` t WHERE t.DEL_FLAG = '0' + SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) ORDER BY d.TYPE_KEY @@ -214,13 +214,13 @@ IFNULL(issue.issNum, 0) issueTotal, 0 createThreeMeetsCount, 0 joinThreeMeetsCount - FROM .sys_dept sd + FROM esua_epdc_admin.sys_dept sd LEFT JOIN ( SELECT count(*) userNum, count(uu.PARTY_FLAG = '1' OR NULL) partyNum, uu.DEPT_ID - FROM .epdc_user uu + FROM esua_epdc_user.epdc_user uu WHERE uu.DEL_FLAG = '0' GROUP BY uu.DEPT_ID ) users ON ( users.DEPT_ID = sd.ID ) @@ -229,8 +229,8 @@ SELECT top.GRID_ID, count(*) topNum - FROM .epdc_topic top - LEFT JOIN .epdc_issue mei ON mei.TOPIC_ID = top.ID AND mei.DEL_FLAG = '0' + FROM esua_epdc_group.epdc_topic top + LEFT JOIN esua_epdc_events.epdc_issue mei ON mei.TOPIC_ID = top.ID AND mei.DEL_FLAG = '0' WHERE top.DEL_FLAG = '0' and date_format(top.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} GROUP BY top.GRID_ID @@ -241,7 +241,7 @@ count(et.IS_PARTY_MEMBER = '1' OR NULL) partyToItemNum, count(et.IS_PARTY_MEMBER = '0' OR NULL) userToItemNum FROM - .epdc_item et + esua_epdc_events.epdc_item et WHERE et.DEL_FLAG = '0' AND date_format( et.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} @@ -255,15 +255,15 @@ SELECT g.GRID_ID DEPT_ID, ug.USER_ID,count(*) createGroupNum - FROM .epdc_group g - LEFT JOIN .epdc_user_group ug ON ug.GROUP_ID = g.ID AND ug.DEL_FLAG = '0' AND ug.LORD_FLAG = '1' AND ug.PARTY_MEMBER = '1' + FROM esua_epdc_group.epdc_group g + LEFT JOIN esua_epdc_group.epdc_user_group ug ON ug.GROUP_ID = g.ID AND ug.DEL_FLAG = '0' AND ug.LORD_FLAG = '1' AND ug.PARTY_MEMBER = '1' WHERE g.DEL_FLAG = '0' AND ug.USER_ID IS NOT NULL GROUP BY ug.USER_ID ) cg GROUP BY cg.DEPT_ID ) groupUser on groupUser.DEPT_ID = sd.ID LEFT JOIN ( SELECT count(*) newNum , n.DEPT_ID - FROM .epdc_news n + FROM esua_epdc_news.epdc_news n WHERE n.DEL_FLAG = '0' AND n.NEWS_RELEASE_STATE = '0' AND n.NEWS_UP_DOWN_STATE = '0' and date_format(n.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} GROUP BY n.DEPT_ID @@ -272,7 +272,7 @@ SELECT iss.GRID_ID, count(*) issNum - FROM .epdc_issue iss + FROM esua_epdc_events.epdc_issue iss WHERE iss.DEL_FLAG = '0' and date_format(iss.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} GROUP BY iss.GRID_ID @@ -282,7 +282,7 @@ sd.DEL_FLAG = '0' AND sd.id IS NOT NULL AND sd.id NOT IN ( - SELECT t.DEPT_ID FROM .`sys_dept_config` t WHERE t.DEL_FLAG = '0' + SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) AND sd.TYPE_KEY = 'grid_party' @@ -301,20 +301,20 @@ WHEN 'street_party' THEN 'street' WHEN 'district_party' THEN 'district' END AS dataType, IFNULL(news.publishArticleCount, 0) AS publishArticleCount - FROM .sys_dept d + FROM esua_epdc_admin.sys_dept d LEFT JOIN (SELECT DEPT_ID, count(ID) publishArticleCount - FROM .epdc_news + FROM esua_epdc_news.epdc_news where DEL_FLAG='0' AND NEWS_RELEASE_STATE = '0' AND NEWS_UP_DOWN_STATE = '0' AND date_format(CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} GROUP BY DEPT_ID)news on news.DEPT_ID=d.id - WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party') + WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party' OR d.TYPE_KEY = 'district_party') AND d.DEL_FLAG=0 AND d.id NOT IN ( - SELECT t.DEPT_ID FROM .`sys_dept_config` t WHERE t.DEL_FLAG = '0' + SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) ORDER BY d.TYPE_KEY @@ -335,12 +335,12 @@ IFNULL(actInfo.volunteerNum,0) volunteerTotal, IFNULL(actInfo.volunteerNum,0) volunteerUserTotal, IFNULL(actInfo.userNum,0) regUserTotal - from .sys_dept sd + from esua_epdc_admin.sys_dept sd left join ( select DEPT_ID, count(*) actNum - from .epdc_act_info + from esua_epdc_mutuality.epdc_act_info where DEL_FLAG = '0' and ACT_STATUS = '1' and SIGNUP_END_TIME <= now() @@ -362,9 +362,9 @@ count((vol.AUDIT_STATUS = '1' or vol.AUDIT_STATUS = '0') or null) volunteerNum, count(((vol.AUDIT_STATUS = '1' or vol.AUDIT_STATUS = '0') and ur.PARTY_FLAG = '1') or null) partyVolunteerNum from - .epdc_act_info act - left join .epdc_act_user_relation ur on ur.ACT_ID = act.ID and ur.DEL_FLAG = '0' and ur.`STATUS` = '1' - left join .epdc_volunteer_info vol on vol.USER_ID = ur.USER_ID and vol.DEL_FLAG = '0' + esua_epdc_mutuality.epdc_act_info act + left join esua_epdc_mutuality.epdc_act_user_relation ur on ur.ACT_ID = act.ID and ur.DEL_FLAG = '0' and ur.`STATUS` = '1' + left join esua_epdc_user.epdc_volunteer_info vol on vol.USER_ID = ur.USER_ID and vol.DEL_FLAG = '0' where act.DEL_FLAG = '0' and act.ACT_STATUS = '1' and act.SIGNUP_END_TIME <= now() @@ -376,7 +376,7 @@ where sd.DEL_FLAG = '0' and sd.id not in ( - select t.DEPT_ID from .`sys_dept_config` t where t.DEL_FLAG = '0' + select t.DEPT_ID from `esua_epdc_admin`.`sys_dept_config` t where t.DEL_FLAG = '0' ) and sd.TYPE_KEY = 'grid_party' @@ -395,12 +395,12 @@ WHEN 'street_party' THEN 'street' WHEN 'district_party' THEN 'district' END AS dataType, IFNULL(actInfo.actNum,0) activityCount - FROM .sys_dept sd + FROM esua_epdc_admin.sys_dept sd LEFT JOIN ( SELECT act.DEPT_ID, count(*) actNum - FROM .epdc_act_info act + FROM esua_epdc_mutuality.epdc_act_info act WHERE act.DEL_FLAG = '0' AND act.ACT_STATUS = '1' @@ -411,9 +411,9 @@ WHERE sd.DEL_FLAG = '0' AND sd.id NOT IN ( - SELECT t.DEPT_ID FROM .`sys_dept_config` t WHERE t.DEL_FLAG = '0' + SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) - AND (sd.TYPE_KEY = 'community_party' OR sd.TYPE_KEY = 'street_party') + AND (sd.TYPE_KEY = 'community_party' OR sd.TYPE_KEY = 'street_party' OR sd.TYPE_KEY = 'district_party') @@ -500,17 +500,17 @@ IFNULL(tr.satisfactionRatio,0.00) AS satisfactionRatio, 0.00 AS overdueProjectRatio, IF( d.TYPE_KEY = 'street_party', IFNULL(tr.handleProjectRatio,0.00),0.00) AS handleProjectRatio, - IFNULL(tr.respProjectRatioFz,0) AS respProjectRatioFz, - IFNULL(tr.respProjectRatioFm,0) AS respProjectRatioFm, - IFNULL(tr.closedProjectRatioFz,0) AS closedProjectRatioFz, - IFNULL(tr.closedProjectRatioFm,0) AS closedProjectRatioFm, - IFNULL(tr.satisfactionRatioFz,0) AS satisfactionRatioFz, - IFNULL(tr.satisfactionRatioFm,0) AS satisfactionRatioFm, + IFNULL(tr.respProjectRatioFz,0) as respProjectRatioFz, + IFNULL(tr.respProjectRatioFm,0) as respProjectRatioFm, + IFNULL(tr.closedProjectRatioFz,0) as closedProjectRatioFz, + IFNULL(tr.closedProjectRatioFm,0) as closedProjectRatioFm, + IFNULL(tr.satisfactionRatioFz,0) as satisfactionRatioFz, + IFNULL(tr.satisfactionRatioFm,0) as satisfactionRatioFm, 0 AS overdueProjectRatioFz, 0 AS overdueProjectRatioFm, - IF( d.TYPE_KEY = 'street_party', IFNULL(tr.handleProjectRatioFz,0), 0) handleProjectRatioFz, - IF( d.TYPE_KEY = 'street_party', IFNULL(tr.handleProjectRatioFm,0), 0) handleProjectRatioFm - FROM .sys_dept d + IFNULL(IF( d.TYPE_KEY = 'street_party', tr.handleProjectRatioFz, 0),0) handleProjectRatioFz, + IFNULL(IF( d.TYPE_KEY = 'street_party', tr.handleProjectRatioFm, 0),0) handleProjectRatioFm + FROM esua_epdc_admin.sys_dept d left join ( select t.DEPT_ID, @@ -539,21 +539,21 @@ TIMESTAMPDIFF(HOUR,ei.CREATED_TIME,now()) ) ) respProject - from .epdc_item_dept ei - left join .epdc_item_handle_process hp on hp.id=ei.ITEM_HANDLE_ID and hp.DEL_FLAG = '0' + from esua_epdc_events.epdc_item_dept ei + left join esua_epdc_events.epdc_item_handle_process hp on hp.id=ei.ITEM_HANDLE_ID and hp.DEL_FLAG = '0' where ei.DEL_FLAG = '0' and date_format(ei.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} group by ei.DEPT_ID,ei.ITEM_ID )t - left join .epdc_item me on t.ITEM_ID=me.id and me.DEL_FLAG = '0' - left join .epdc_item_handle_process eih on eih.ITEM_ID=me.id - left join .epdc_category c ON me.CATEGORY_CODE = c.CATEGORY_CODE + left join esua_epdc_events.epdc_item me on t.ITEM_ID=me.id and me.DEL_FLAG = '0' + left join esua_epdc_events.epdc_item_handle_process eih on eih.ITEM_ID=me.id + left join esua_epdc_events.epdc_category c ON me.CATEGORY_CODE = c.CATEGORY_CODE group by t.DEPT_ID )tr on tr.DEPT_ID=d.id - WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party') + WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party' OR d.TYPE_KEY = 'district_party') and d.DEL_FLAG = '0' and d.id not in ( - SELECT t.DEPT_ID FROM .`sys_dept_config` t WHERE t.DEL_FLAG = '0' + SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) ORDER BY d.TYPE_KEY @@ -573,15 +573,15 @@ IFNULL(tr.closedProjectRatio,0.00) AS closedProjectRatio, IFNULL(tr.satisfactionRatio,0.00) AS satisfactionRatio, IFNULL(tr.handleProjectRatio,0.00) AS handleProjectRatio, - IFNULL(tr.respProjectRatioFz,0) AS respProjectRatioFz, - IFNULL(tr.respProjectRatioFm,0) AS respProjectRatioFm, - IFNULL(tr.handleProjectRatioFz,0) AS handleProjectRatioFz, - IFNULL(tr.handleProjectRatioFm,0) AS handleProjectRatioFm, - IFNULL(tr.closedProjectRatioFz,0) AS closedProjectRatioFz, - IFNULL(tr.closedProjectRatioFm,0) AS closedProjectRatioFm, - IFNULL(tr.satisfactionRatioFz,0) AS satisfactionRatioFz, - IFNULL(tr.satisfactionRatioFm,0) AS satisfactionRatioFm - FROM .sys_dept d + IFNULL(tr.respProjectRatioFz,0) AS respProjectRatioFz, + IFNULL(tr.respProjectRatioFm,0) AS respProjectRatioFm, + IFNULL(tr.handleProjectRatioFz,0) AS handleProjectRatioFz, + IFNULL(tr.handleProjectRatioFm,0) AS handleProjectRatioFm, + IFNULL(tr.closedProjectRatioFz,0) AS closedProjectRatioFz, + IFNULL(tr.closedProjectRatioFm,0) AS closedProjectRatioFm, + IFNULL(tr.satisfactionRatioFz,0) AS satisfactionRatioFz, + IFNULL(tr.satisfactionRatioFm,0) AS satisfactionRatioFm + FROM esua_epdc_admin.sys_dept d left join (select t.DEPT_ID, sum(t.transferedCount) as transferedCount, @@ -606,21 +606,21 @@ sum(if(hp.CREATED_TIME is not null, TIMESTAMPDIFF(HOUR,ei.CREATED_TIME,hp.CREATED_TIME), TIMESTAMPDIFF(HOUR,ei.CREATED_TIME,now()))) respProject - from .epdc_item_dept ei - left join .epdc_item_handle_process hp on hp.id=ei.ITEM_HANDLE_ID and hp.DEL_FLAG=0 + from esua_epdc_events.epdc_item_dept ei + left join esua_epdc_events.epdc_item_handle_process hp on hp.id=ei.ITEM_HANDLE_ID and hp.DEL_FLAG=0 where ei.DEL_FLAG = '0' and date_format(ei.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR} group by ei.DEPT_ID,ei.ITEM_ID )t - left join .epdc_item me on t.ITEM_ID=me.id and me.DEL_FLAG = '0' - left join .epdc_item_handle_process eih on eih.ITEM_ID=me.id - LEFT JOIN .epdc_category c ON me.CATEGORY_CODE = c.CATEGORY_CODE + left join esua_epdc_events.epdc_item me on t.ITEM_ID=me.id and me.DEL_FLAG = '0' + left join esua_epdc_events.epdc_item_handle_process eih on eih.ITEM_ID=me.id + LEFT JOIN esua_epdc_events.epdc_category c ON me.CATEGORY_CODE = c.CATEGORY_CODE group by t.DEPT_ID )tr on tr.DEPT_ID=d.id - WHERE d.TYPE_KEY IN ('street_dept', 'district_dept') + WHERE d.TYPE_KEY = 'district_dept' and d.DEL_FLAG = '0' and d.id not in ( - SELECT t.DEPT_ID FROM .`sys_dept_config` t WHERE t.DEL_FLAG = '0' + SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) ORDER BY d.TYPE_KEY diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 16bd992..e726ff0 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -44,13 +44,13 @@ t1.CATEGORY_FULL_NAME as allCategoryName, t2.IMG_URL as projectImgUrl, t3.CREATED_TIME as closeCaseTime - from (select * from(select * from .epdc_item where DEL_FLAG = '0' + from (select * from(select * from esua_epdc_events.epdc_item where DEL_FLAG = '0' and GRID_ID not in ( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) order by ID)a group by a.EVENT_ID) t1 - left join .epdc_img t2 on t1.EVENT_ID = t2.REFERENCE_ID and t1.DEL_FLAG = '0' - left join .epdc_item_handle_process t3 on t3.ITEM_ID = t1.ID and t3.DEL_FLAG = '0' and t3.STATE = 10 + left join esua_epdc_events.epdc_img t2 on t1.EVENT_ID = t2.REFERENCE_ID and t1.DEL_FLAG = '0' + left join esua_epdc_events.epdc_item_handle_process t3 on t3.ITEM_ID = t1.ID and t3.DEL_FLAG = '0' and t3.STATE = 10 where date_format(t1.UPDATED_TIME, '%Y-%m-%d') >= STR_TO_DATE(#{yearMonthDay}, '%Y-%m-%d') and date_format(t1.UPDATED_TIME, '%Y-%m-%d') <= date_sub(curdate(),interval 1 day) order by t2.CREATED_TIME @@ -91,25 +91,25 @@ t1.HANDLER_DEPT_ID as handlerId, 'unknown' as handlerType, case - when (t4.ID is not null and t1.STATE = 0 and t1.CREATED_TIME != (select min(t.CREATED_TIME) from .epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'transfer' - when (t4.ID is null and t1.STATE = 0 and t1.CREATED_TIME != (select min(t.CREATED_TIME) from .epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'response' - when (t1.STATE = 0 and t1.CREATED_TIME = (select min(t.CREATED_TIME) from .epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'created' + when (t4.ID is not null and t1.STATE = 0 and t1.CREATED_TIME != (select min(t.CREATED_TIME) from esua_epdc_events.epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'transfer' + when (t4.ID is null and t1.STATE = 0 and t1.CREATED_TIME != (select min(t.CREATED_TIME) from esua_epdc_events.epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'response' + when (t1.STATE = 0 and t1.CREATED_TIME = (select min(t.CREATED_TIME) from esua_epdc_events.epdc_item_handle_process t where t.DEL_FLAG = '0' and t1.ITEM_ID = t.ITEM_ID group by t.ITEM_ID)) then 'created' when t1.STATE = 5 then 'close' when t1.STATE = 10 then 'closed_case' else '' END as operation, t1.OUT_HANDLE_ADVICE as publicReply, t1.HANDLE_ADVICE as internalRemark, t1.CREATED_TIME as processTime - from .epdc_item_handle_process t1 - left join .epdc_item_dept t4 on t4.ITEM_HANDLE_ID = t1.ID and t4.DEL_FLAG = '0' + from esua_epdc_events.epdc_item_handle_process t1 + left join esua_epdc_events.epdc_item_dept t4 on t4.ITEM_HANDLE_ID = t1.ID and t4.DEL_FLAG = '0' where date_format(t1.UPDATED_TIME, '%Y-%m-%d') >= STR_TO_DATE(#{yearMonthDay}, '%Y-%m-%d') and date_format(t1.UPDATED_TIME, '%Y-%m-%d') <= date_sub(curdate(),interval 1 day) and t1.DEL_FLAG = '0' and t1.HANDLER_DEPT_ID not in ( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) group by t1.ID )t - left join .epdc_img t3 on t3.REFERENCE_ID = t.processId and t3.DEL_FLAG = '0' + left join esua_epdc_events.epdc_img t3 on t3.REFERENCE_ID = t.processId and t3.DEL_FLAG = '0' order by t3.CREATED_TIME @@ -153,18 +153,18 @@ count( it.EVALUATION_SCORE=0 or null) as badTotal, ifnull(format(round(count(it.EVALUATION_SCORE=0 or null)/count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null),4),4),'0.0000') as badRatio - FROM .`sys_dept` sd - left join .`sys_dept` co on co.id=sd.pid - left join .`sys_dept` st on st.id=co.pid - left join .`sys_dept` di on di.id=st.pid - left join (select lin.* from (select * from .epdc_item order by id) lin + FROM `esua_epdc_admin`.`sys_dept` sd + left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid + left join `esua_epdc_admin`.`sys_dept` st on st.id=co.pid + left join `esua_epdc_admin`.`sys_dept` di on di.id=st.pid + left join (select lin.* from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 AND date_format( lin.CREATED_TIME, '%Y-%m-%d' ) <=#{yesterDayDate} group by lin.EVENT_ID) it on it.GRID_ID=sd.id WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) group by di.id @@ -183,17 +183,17 @@ count( it.EVALUATION_SCORE=0 or null) as badTotal, ifnull(format(round(count(it.EVALUATION_SCORE=0 or null)/count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null),4),4),'0.0000') as badRatio - FROM .`sys_dept` sd - left join .`sys_dept` co on co.id=sd.pid - left join .`sys_dept` st on st.id=co.pid - left join (select lin.* from (select * from .epdc_item order by id) lin + FROM `esua_epdc_admin`.`sys_dept` sd + left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid + left join `esua_epdc_admin`.`sys_dept` st on st.id=co.pid + left join (select lin.* from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 AND date_format( lin.CREATED_TIME, '%Y-%m-%d' ) <=#{yesterDayDate} group by lin.EVENT_ID) it on it.GRID_ID=sd.id WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) group by st.id @@ -212,16 +212,16 @@ count( it.EVALUATION_SCORE=0 or null) as badTotal, ifnull(format(round(count(it.EVALUATION_SCORE=0 or null)/count( (it.EVALUATION_SCORE=0 or it.EVALUATION_SCORE=1 or it.EVALUATION_SCORE=2) or null),4),4),'0.0000') as badRatio - FROM .`sys_dept` sd - left join .`sys_dept` co on co.id=sd.pid - left join (select lin.* from (select * from .epdc_item order by id) lin + FROM `esua_epdc_admin`.`sys_dept` sd + left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid + left join (select lin.* from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 AND date_format( lin.CREATED_TIME, '%Y-%m-%d' ) <=#{yesterDayDate} group by lin.EVENT_ID) it on it.GRID_ID=sd.id WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) group by co.id @@ -236,12 +236,12 @@ ifnull(li2.unClosedTotal,0) as unClosedTotal, ifnull(li2.closedTotal,0) as closedTotal - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd left join (select li.GRID_ID, count(li.id) as projectIncr, count((li.ITEM_STATE= 5 or li.ITEM_STATE = 10) or null) as closedIncr from (select lin.* - from (select * from .epdc_item order by id) lin + from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 AND date_format( lin.CREATED_TIME, '%Y-%m' ) = #{yearMonth} group by lin.EVENT_ID)li @@ -251,7 +251,7 @@ count(al.ITEM_STATE= 0 or null) as unClosedTotal, count((al.ITEM_STATE= 5 or al.ITEM_STATE = 10) or null) as closedTotal from (select lin.* - from (select * from .epdc_item order by id) lin + from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 AND date_format( lin.CREATED_TIME, '%Y-%m' ) <= #{yearMonth} group by lin.EVENT_ID)al @@ -259,7 +259,7 @@ WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) group by sd.id @@ -275,17 +275,17 @@ ifnull(li2.unClosedTotal,0) as unClosedTotal, ifnull(li2.closedTotal,0) as closedTotal - FROM .`sys_dept` sd - left join .`sys_dept` co on co.id=sd.pid - left join .`sys_dept` st on st.id=co.pid - left join .`sys_dept` di on di.id=st.pid + FROM `esua_epdc_admin`.`sys_dept` sd + left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid + left join `esua_epdc_admin`.`sys_dept` st on st.id=co.pid + left join `esua_epdc_admin`.`sys_dept` di on di.id=st.pid left join (select li.GRID_ID, count(li.id) as projectIncr, count((li.ITEM_STATE= 5 or li.ITEM_STATE = 10) or null) as closedIncr from (select lin.* - from (select * from .epdc_item order by id) lin + from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{yearMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{yearMonth} group by lin.EVENT_ID)li group by li.GRID_ID)it on it.GRID_ID=sd.id left join (select al.GRID_ID, @@ -293,15 +293,15 @@ count(al.ITEM_STATE= 0 or null) as unClosedTotal, count((al.ITEM_STATE= 5 or al.ITEM_STATE = 10) or null) as closedTotal from (select lin.* - from (select * from .epdc_item order by id) lin + from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{yearMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{yearMonth} group by lin.EVENT_ID)al group by al.GRID_ID)li2 on li2.GRID_ID=sd.id WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) group by di.id union all @@ -315,16 +315,16 @@ ifnull(li2.unClosedTotal,0) as unClosedTotal, ifnull(li2.closedTotal,0) as closedTotal - FROM .`sys_dept` sd - left join .`sys_dept` co on co.id=sd.pid - left join .`sys_dept` st on st.id=co.pid + FROM `esua_epdc_admin`.`sys_dept` sd + left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid + left join `esua_epdc_admin`.`sys_dept` st on st.id=co.pid left join (select li.GRID_ID, count(li.id) as projectIncr, count((li.ITEM_STATE= 5 or li.ITEM_STATE = 10) or null) as closedIncr from (select lin.* - from (select * from .epdc_item order by id) lin + from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{yearMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{yearMonth} group by lin.EVENT_ID)li group by li.GRID_ID)it on it.GRID_ID=sd.id left join (select al.GRID_ID, @@ -332,15 +332,15 @@ count(al.ITEM_STATE= 0 or null) as unClosedTotal, count((al.ITEM_STATE= 5 or al.ITEM_STATE = 10) or null) as closedTotal from (select lin.* - from (select * from .epdc_item order by id) lin + from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{yearMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{yearMonth} group by lin.EVENT_ID)al group by al.GRID_ID)li2 on li2.GRID_ID=sd.id WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) group by st.id @@ -356,15 +356,15 @@ ifnull(li2.unClosedTotal,0) as unClosedTotal, ifnull(li2.closedTotal,0) as closedTotal - FROM .`sys_dept` sd - left join .`sys_dept` co on co.id=sd.pid + FROM `esua_epdc_admin`.`sys_dept` sd + left join `esua_epdc_admin`.`sys_dept` co on co.id=sd.pid left join (select li.GRID_ID, count(li.id) as projectIncr, count((li.ITEM_STATE= 5 or li.ITEM_STATE = 10) or null) as closedIncr from (select lin.* - from (select * from .epdc_item order by id) lin + from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{yearMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) =#{yearMonth} group by lin.EVENT_ID)li group by li.GRID_ID)it on it.GRID_ID=sd.id left join (select al.GRID_ID, @@ -372,15 +372,15 @@ count(al.ITEM_STATE= 0 or null) as unClosedTotal, count((al.ITEM_STATE= 5 or al.ITEM_STATE = 10) or null) as closedTotal from (select lin.* - from (select * from .epdc_item order by id) lin + from (select * from esua_epdc_events.epdc_item order by id) lin where lin.DEL_FLAG=0 - AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{yearMonth} + AND date_format( lin.CREATED_TIME, '%Y-%m' ) <=#{yearMonth} group by lin.EVENT_ID)al group by al.GRID_ID)li2 on li2.GRID_ID=sd.id WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) group by co.id diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index 0852ad5..99c05b8 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -6,8 +6,8 @@ @@ -37,12 +38,12 @@ '' AS partyMark, DATE_FORMAT(NOW(), '%Y%m%d') AS dataEndTime, sd.area_code - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd WHERE sd.`del_flag`= 0 AND sd.`type_key`= 'grid_party' AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) @@ -55,419 +56,146 @@ '' AS deptMark, DATE_FORMAT(NOW(), '%Y%m%d') AS dataEndTime, sd.area_code - FROM .`sys_dept` sd + FROM `esua_epdc_admin`.`sys_dept` sd WHERE sd.`del_flag`= 0 AND sd.`type_key` IN ('street_dept', 'district_dept') AND sd.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t + FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.`del_flag`= 0) - - - SELECT - total.orgId, - total.orgName, - total.parentId, + SELECT gr.id as orgId, + gr.name as orgName, + gr.pid as parentId, 'grid' as orgType, - SUM( total.USER_TOTAL) AS registerUserCount, - SUM( total.RESIDENTS_TOTAL ) AS resiTotal, - SUM( total.PARTY_TOTAL ) AS partyMemberCount, - SUM( total.ageLevel1 ) AS ageLevel1, - SUM( total.ageLevel2 ) AS ageLevel2, - SUM( total.ageLevel3 ) AS ageLevel3, - SUM( total.ageLevel4 ) AS ageLevel4, - SUM( total.ageLevel5 ) AS ageLevel5, - SUM( total.ageLevel6 ) AS ageLevel6, - DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, - total.area_code AS areaCode - FROM - (SELECT - t1.orgId, - d.name as orgName, - d.pid as parentId, - d.area_code as area_code, - t1.USER_TOTAL, - IFNULL(( t1.USER_TOTAL - t1.PARTY_TOTAL ),0) AS RESIDENTS_TOTAL, - t1.PARTY_TOTAL, - t1.ageLevel1, - t1.ageLevel2, - t1.ageLevel3, - t1.ageLevel4, - t1.ageLevel5, - t1.ageLevel6 - FROM - (SELECT - t.orgId, - COUNT( t.ID ) AS USER_TOTAL, - count( t.PARTY_FLAG = '1' OR NULL ) AS PARTY_TOTAL, - count( ( t.age < 20 AND t.PARTY_FLAG = '1' ) OR NULL ) AS ageLevel1, - count( ( 20 <= t.age AND t.age <= 30 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel2, - count( ( 31 <= t.age AND t.age <= 40 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel3, - count( ( 41 <= t.age AND t.age <= 50 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel4, - count( ( 51 <= t.age AND t.age <= 60 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel5, - count( ( 60 < t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6 - FROM - (SELECT - e.ID, - e.PARTY_FLAG, - IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age, - d.id as orgId - FROM - .`sys_dept` d - left join (select eu.id, - eu.BIRTHDAY, - eu.DEPT_ID AS orgId, - eu.PARTY_FLAG - from .epdc_user eu - where eu.DEL_FLAG = '0' )e on d.id=e.orgId - WHERE - d.DEL_FLAG = '0' - and d.type_key='grid_party' - AND d.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t - WHERE t.`del_flag`= 0) - ) t - GROUP BY - t.orgId - ) t1 - left join .sys_dept d on d.id=t1.orgId - ) total - GROUP BY - total.orgId + IFNULL(t.userTotal,0) AS userTotal, + IFNULL(t.partyTotal,0) AS partyTotal, + IFNULL(t.groupTotal,0) AS groupTotal, + IFNULL(t.issueTotal,0) AS issueTotal, + IFNULL(t.topicTotal,0) AS topicTotal, + IFNULL(t.projectTotal,0) as projectTotal, 0 as companyTotal, + DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, + gr.area_code AS areaCode + FROM esua_epdc_admin.sys_dept gr + left join + (select total.GRID_ID, + sum(total.userTotal+total.companyTotal) as userTotal, + sum(total.partyTotal) as partyTotal, + sum(total.groupTotal) as groupTotal, + sum(total.issueTotal) as issueTotal, + sum(total.topicTotal) as topicTotal, + sum(total.projectTotal) as projectTotal, 0 as companyTotal + from + (select eu.DEPT_ID AS GRID_ID, + count(eu.id) as userTotal, + count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal, + 0 as groupTotal, + 0 as issueTotal, + 0 as topicTotal, + 0 as projectTotal, 0 as companyTotal + from esua_epdc_user.epdc_user eu + where eu.DEL_FLAG=0 + group by eu.DEPT_ID - union all + UNION all + SELECT + DEPT_ID AS GRID_ID, + 0 as userTotal, + 0 AS partyTotal, + 0 as groupTotal, + 0 as issueTotal, + 0 as topicTotal, + 0 as projectTotal, count(id) as companyTotal + FROM + esua_epdc_custom.epdc_enterprise_info + WHERE + DEL_FLAG = 0 + GROUP BY + DEPT_ID - SELECT - total.orgId, - total.orgName, - total.parentId, - 'agency' as orgType, - SUM( total.USER_TOTAL) AS registerUserCount, - SUM( total.RESIDENTS_TOTAL ) AS resiTotal, - SUM( total.PARTY_TOTAL ) AS partyMemberCount, - SUM( total.ageLevel1 ) AS ageLevel1, - SUM( total.ageLevel2 ) AS ageLevel2, - SUM( total.ageLevel3 ) AS ageLevel3, - SUM( total.ageLevel4 ) AS ageLevel4, - SUM( total.ageLevel5 ) AS ageLevel5, - SUM( total.ageLevel6 ) AS ageLevel6, - DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, - total.area_code AS areaCode - FROM - (SELECT - t1.orgId, - d.name as orgName, - d.pid as parentId, - d.area_code, - t1.USER_TOTAL, - IFNULL(( t1.USER_TOTAL - t1.PARTY_TOTAL ),0) AS RESIDENTS_TOTAL, - t1.PARTY_TOTAL, - t1.ageLevel1, - t1.ageLevel2, - t1.ageLevel3, - t1.ageLevel4, - t1.ageLevel5, - t1.ageLevel6 + UNION ALL + + select GRID_ID, + 0 as userTotal, + 0 AS partyTotal, + count(id) as groupTotal, + 0 as issueTotal, + 0 as topicTotal, + 0 as projectTotal, 0 as companyTotal + from esua_epdc_group.epdc_group + where DEL_FLAG=0 and STATE=10 + group by GRID_ID + + union all + + select GRID_ID, + 0 as userTotal, + 0 AS partyTotal, + 0 as groupTotal, + count(t.a) as issueTotal, + 0 as topicTotal, + 0 as projectTotal, 0 as companyTotal + from ( + SELECT + count( id ) AS a, + EVENT_ID, + GRID_ID FROM - (SELECT - t.orgId, - COUNT( t.ID ) AS USER_TOTAL, - count( t.PARTY_FLAG = '1' OR NULL ) AS PARTY_TOTAL, - count( ( t.age < 20 AND t.PARTY_FLAG = '1' ) OR NULL ) AS ageLevel1, - count( ( 20 <= t.age AND t.age <= 30 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel2, - count( ( 31 <= t.age AND t.age <= 40 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel3, - count( ( 41 <= t.age AND t.age <= 50 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel4, - count( ( 51 <= t.age AND t.age <= 60 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel5, - count( ( 60 < t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6 - FROM - (SELECT - e.ID, - e.PARTY_FLAG, - IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age, - co.id AS orgId - FROM - .sys_dept co - left join .sys_dept gr on gr.pid=co.id - left join (select eu.id, - eu.BIRTHDAY, - eu.DEPT_ID AS orgId, - eu.PARTY_FLAG - from .epdc_user eu - where eu.DEL_FLAG = '0' )e on gr.id=e.orgId - WHERE - co.DEL_FLAG = '0' - and gr.DEL_FLAG = '0' - and co.type_key='community_party' - AND co.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t - WHERE t.`del_flag`= 0) - ) t - GROUP BY - t.orgId - ) t1 - left join .sys_dept d on d.id=t1.orgId - ) total - GROUP BY - total.orgId + esua_epdc_events.epdc_issue mei + WHERE + mei.DEL_FLAG = '0' + GROUP BY + EVENT_ID, + GRID_ID + ) t + group by t.GRID_ID + UNION ALL - union all + select GRID_ID, + 0 as userTotal, + 0 AS partyTotal, + 0 as groupTotal, + 0 as issueTotal, + count(id) as topicTotal, + 0 as projectTotal, 0 as companyTotal + from esua_epdc_group.epdc_topic + where DEL_FLAG=0 + group by GRID_ID + + UNION ALL + select GRID_ID, + 0 as userTotal, + 0 AS partyTotal, + 0 as groupTotal, + 0 as issueTotal, + 0 as topicTotal, + count(t.a) as projectTotal, 0 as companyTotal + from ( SELECT - total.orgId, - total.orgName, - total.parentId, - 'agency' as orgType, - SUM( total.USER_TOTAL) AS registerUserCount, - SUM( total.RESIDENTS_TOTAL ) AS resiTotal, - SUM( total.PARTY_TOTAL ) AS partyMemberCount, - SUM( total.ageLevel1 ) AS ageLevel1, - SUM( total.ageLevel2 ) AS ageLevel2, - SUM( total.ageLevel3 ) AS ageLevel3, - SUM( total.ageLevel4 ) AS ageLevel4, - SUM( total.ageLevel5 ) AS ageLevel5, - SUM( total.ageLevel6 ) AS ageLevel6, - DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, - total.area_code AS areaCode + count(id) as a, + EVENT_ID, + GRID_ID FROM - (SELECT - t1.orgId, - d.name as orgName, - d.pid as parentId, - d.area_code, - t1.USER_TOTAL, - IFNULL(( t1.USER_TOTAL - t1.PARTY_TOTAL ),0) AS RESIDENTS_TOTAL, - t1.PARTY_TOTAL, - t1.ageLevel1, - t1.ageLevel2, - t1.ageLevel3, - t1.ageLevel4, - t1.ageLevel5, - t1.ageLevel6 - FROM - (SELECT - t.orgId, - COUNT( t.ID ) AS USER_TOTAL, - count( t.PARTY_FLAG = '1' OR NULL ) AS PARTY_TOTAL, - count( ( t.age < 20 AND t.PARTY_FLAG = '1' ) OR NULL ) AS ageLevel1, - count( ( 20 <= t.age AND t.age <= 30 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel2, - count( ( 31 <= t.age AND t.age <= 40 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel3, - count( ( 41 <= t.age AND t.age <= 50 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel4, - count( ( 51 <= t.age AND t.age <= 60 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel5, - count( ( 60 < t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6 - FROM - (SELECT - e.ID, - e.PARTY_FLAG, - IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age, - st.id AS orgId - FROM - .sys_dept st - left join .sys_dept co on co.pid=st.id - left join .sys_dept gr on gr.pid=co.id - left join (select eu.id, - eu.BIRTHDAY, - eu.DEPT_ID AS orgId, - eu.PARTY_FLAG - from .epdc_user eu - where eu.DEL_FLAG = '0' )e on gr.id=e.orgId - WHERE - st.DEL_FLAG = '0' - and co.DEL_FLAG = '0' - and gr.DEL_FLAG = '0' - and st.type_key='street_party' - AND st.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t - WHERE t.`del_flag`= 0) - ) t - GROUP BY - t.orgId - ) t1 - left join .sys_dept d on d.id=t1.orgId - ) total - GROUP BY - total.orgId - - - union all - - - SELECT - total.orgId, - total.orgName, - total.parentId, - 'agency' as orgType, - SUM( total.USER_TOTAL) AS registerUserCount, - SUM( total.RESIDENTS_TOTAL ) AS resiTotal, - SUM( total.PARTY_TOTAL ) AS partyMemberCount, - SUM( total.ageLevel1 ) AS ageLevel1, - SUM( total.ageLevel2 ) AS ageLevel2, - SUM( total.ageLevel3 ) AS ageLevel3, - SUM( total.ageLevel4 ) AS ageLevel4, - SUM( total.ageLevel5 ) AS ageLevel5, - SUM( total.ageLevel6 ) AS ageLevel6, - DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, - total.area_code AS areaCode - FROM - (SELECT - t1.orgId, - d.name as orgName, - d.pid as parentId, - d.area_code, - t1.USER_TOTAL, - IFNULL(( t1.USER_TOTAL - t1.PARTY_TOTAL ),0) AS RESIDENTS_TOTAL, - t1.PARTY_TOTAL, - t1.ageLevel1, - t1.ageLevel2, - t1.ageLevel3, - t1.ageLevel4, - t1.ageLevel5, - t1.ageLevel6 - FROM - (SELECT - t.orgId, - COUNT( t.ID ) AS USER_TOTAL, - count( t.PARTY_FLAG = '1' OR NULL ) AS PARTY_TOTAL, - count( ( t.age < 20 AND t.PARTY_FLAG = '1' ) OR NULL ) AS ageLevel1, - count( ( 20 <= t.age AND t.age <= 30 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel2, - count( ( 31 <= t.age AND t.age <= 40 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel3, - count( ( 41 <= t.age AND t.age <= 50 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel4, - count( ( 51 <= t.age AND t.age <= 60 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel5, - count( ( 60 < t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6 - FROM - (SELECT - e.ID, - e.PARTY_FLAG, - IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age, - city.id AS orgId - FROM - .sys_dept city - left join .sys_dept st on st.pid=city.id - left join .sys_dept co on co.pid=st.id - left join .sys_dept gr on gr.pid=co.id - left join (select eu.id, - eu.BIRTHDAY, - eu.DEPT_ID AS orgId, - eu.PARTY_FLAG - from .epdc_user eu - where eu.DEL_FLAG = '0' )e on gr.id=e.orgId - WHERE - city.DEL_FLAG = '0' - and st.DEL_FLAG = '0' - and co.DEL_FLAG = '0' - and gr.DEL_FLAG = '0' - AND city.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t - WHERE t.`del_flag`= 0) - and city.type_key='district_party' - ) t - GROUP BY - t.orgId - ) t1 - left join .sys_dept d on d.id=t1.orgId - ) total - GROUP BY - total.orgId - - - - - -select gr.id as orgId, - gr.name as orgName, - gr.pid as parentId, - 'grid' as orgType, - IFNULL(dg.createGroupTotal,0) AS createGroupTotal, - IFNULL(dg.groupUserTotal,0) AS groupUserTotal, - DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime, - gr.area_code AS areaCode - from .sys_dept gr - left join - (select eg.GRID_ID, - count(eg.id) as createGroupTotal, - sum(group_user.userCount) as groupUserTotal - from .epdc_group eg - left join (select GROUP_ID, - count(STATE = 10 OR NULL) AS userCount - from .epdc_user_group eu - where eu.DEL_FLAG=0 - group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id - where eg.DEL_FLAG=0 and eg.STATE=10 - group by eg.GRID_ID)dg on dg.GRID_ID=gr.id - where gr.del_flag=0 - AND gr.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t - WHERE t.`del_flag`= 0) - and gr.type_key='grid_party' - - union all - - select co.id as orgId, - co.name as orgName, - co.pid as parentId, - 'agency' as orgType, - sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal, - sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal, - DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime, - co.area_code AS areaCode - from .sys_dept co - left join .sys_dept gr on co.id=gr.pid - left join - (select eg.GRID_ID, - count(eg.id) as createGroupTotal, - sum(group_user.userCount) as groupUserTotal - from .epdc_group eg - left join (select GROUP_ID, - count(STATE = 10 OR NULL) AS userCount - from .epdc_user_group eu - where eu.DEL_FLAG=0 - group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id - where eg.DEL_FLAG=0 and eg.STATE=10 - group by eg.GRID_ID)dg on dg.GRID_ID=gr.id - where gr.del_flag=0 - and co.del_flag=0 - AND co.`id` NOT IN( SELECT t.`dept_id` - FROM .`sys_dept_config` t - WHERE t.`del_flag`= 0) - and co.type_key='community_party' - group by co.id - - union all + SELECT + total.orgId, + total.orgName, + total.parentId, + 'grid' as orgType, + SUM( total.USER_TOTAL) AS registerUserCount, + SUM( total.RESIDENTS_TOTAL ) AS resiTotal, + SUM( total.PARTY_TOTAL ) AS partyMemberCount, + SUM( total.ageLevel1 ) AS ageLevel1, + SUM( total.ageLevel2 ) AS ageLevel2, + SUM( total.ageLevel3 ) AS ageLevel3, + SUM( total.ageLevel4 ) AS ageLevel4, + SUM( total.ageLevel5 ) AS ageLevel5, + SUM( total.ageLevel6 ) AS ageLevel6, + DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, + total.area_code AS areaCode + FROM + (SELECT + t1.orgId, + d.name as orgName, + d.pid as parentId, + d.area_code as area_code, + t1.USER_TOTAL, + IFNULL(( t1.USER_TOTAL - t1.PARTY_TOTAL ),0) AS RESIDENTS_TOTAL, + t1.PARTY_TOTAL, + t1.ageLevel1, + t1.ageLevel2, + t1.ageLevel3, + t1.ageLevel4, + t1.ageLevel5, + t1.ageLevel6 + FROM + (SELECT + t.orgId, + COUNT( t.ID ) AS USER_TOTAL, + count( t.PARTY_FLAG = '1' OR NULL ) AS PARTY_TOTAL, + count( ( t.age < 20 AND t.PARTY_FLAG = '1' ) OR NULL ) AS ageLevel1, + count( ( 20 <= t.age AND t.age <= 30 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel2, + count( ( 31 <= t.age AND t.age <= 40 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel3, + count( ( 41 <= t.age AND t.age <= 50 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel4, + count( ( 51 <= t.age AND t.age <= 60 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel5, + count( ( 60 < t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6 + FROM + (SELECT + e.ID, + e.PARTY_FLAG, + IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age, + d.id as orgId + FROM + esua_epdc_admin.sys_dept d + left join (select eu.id, + eu.BIRTHDAY, + eu.DEPT_ID AS orgId, + eu.PARTY_FLAG + from esua_epdc_user.epdc_user eu + where eu.DEL_FLAG = '0' )e on d.id=e.orgId + WHERE + d.DEL_FLAG = '0' + and d.type_key='grid_party' + AND d.`id` NOT IN( SELECT t.`dept_id` + FROM `esua_epdc_admin`.`sys_dept_config` t + WHERE t.`del_flag`= 0) + ) t + GROUP BY + t.orgId + ) t1 + left join esua_epdc_admin.sys_dept d on d.id=t1.orgId + ) total + GROUP BY + total.orgId - select st.id as orgId, - st.name as orgName, - st.pid as parentId, - 'agency' as orgType, - sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal, - sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal, - DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime, - st.area_code AS areaCode - from .sys_dept st - left join .sys_dept co on st.id=co.pid - left join .sys_dept gr on co.id=gr.pid - left join - (select eg.GRID_ID, - count(eg.id) as createGroupTotal, - sum(group_user.userCount) as groupUserTotal - from .epdc_group eg - left join (select GROUP_ID, - count(STATE = 10 OR NULL) AS userCount - from .epdc_user_group eu - where eu.DEL_FLAG=0 - group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id - where eg.DEL_FLAG=0 and eg.STATE=10 - group by eg.GRID_ID)dg on dg.GRID_ID=gr.id - where gr.del_flag=0 - and co.del_flag=0 - and st.del_flag=0 - and st.type_key='street_party' - group by st.id + union all - union all - select city.id as orgId, - city.name as orgName, - city.pid as parentId, - 'agency' as orgType, - sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal, - sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal, - DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime, - city.area_code AS areaCode - from .sys_dept city - left join .sys_dept st on city.id=st.pid - left join .sys_dept co on st.id=co.pid - left join .sys_dept gr on co.id=gr.pid - left join - (select eg.GRID_ID, - count(eg.id) as createGroupTotal, - sum(group_user.userCount) as groupUserTotal - from .epdc_group eg - left join (select GROUP_ID, - count(STATE = 10 OR NULL) AS userCount - from .epdc_user_group eu - where eu.DEL_FLAG=0 - group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id - where eg.DEL_FLAG=0 and eg.STATE=10 - group by eg.GRID_ID)dg on dg.GRID_ID=gr.id - where gr.del_flag=0 - and co.del_flag=0 - and st.del_flag=0 - and city.del_flag=0 - and city.type_key='district_party' - group by city.id + SELECT + total.orgId, + total.orgName, + total.parentId, + 'agency' as orgType, + SUM( total.USER_TOTAL) AS registerUserCount, + SUM( total.RESIDENTS_TOTAL ) AS resiTotal, + SUM( total.PARTY_TOTAL ) AS partyMemberCount, + SUM( total.ageLevel1 ) AS ageLevel1, + SUM( total.ageLevel2 ) AS ageLevel2, + SUM( total.ageLevel3 ) AS ageLevel3, + SUM( total.ageLevel4 ) AS ageLevel4, + SUM( total.ageLevel5 ) AS ageLevel5, + SUM( total.ageLevel6 ) AS ageLevel6, + DATE_FORMAT(now(),'%Y%m%d') as dataEndTime, + total.area_code AS areaCode + FROM + (SELECT + t1.orgId, + d.name as orgName, + d.pid as parentId, + d.area_code, + t1.USER_TOTAL, + IFNULL(( t1.USER_TOTAL - t1.PARTY_TOTAL ),0) AS RESIDENTS_TOTAL, + t1.PARTY_TOTAL, + t1.ageLevel1, + t1.ageLevel2, + t1.ageLevel3, + t1.ageLevel4, + t1.ageLevel5, + t1.ageLevel6 + FROM + (SELECT + t.orgId, + COUNT( t.ID ) AS USER_TOTAL, + count( t.PARTY_FLAG = '1' OR NULL ) AS PARTY_TOTAL, + count( ( t.age < 20 AND t.PARTY_FLAG = '1' ) OR NULL ) AS ageLevel1, + count( ( 20 <= t.age AND t.age <= 30 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel2, + count( ( 31 <= t.age AND t.age <= 40 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel3, + count( ( 41 <= t.age AND t.age <= 50 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel4, + count( ( 51 <= t.age AND t.age <= 60 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel5, + count( ( 60 < t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6 + FROM + (SELECT + e.ID, + e.PARTY_FLAG, + IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age, + co.id AS orgId + FROM + esua_epdc_admin.sys_dept co + left join esua_epdc_admin.sys_dept gr on gr.pid=co.id + left join (select eu.id, + eu.BIRTHDAY, + eu.DEPT_ID AS orgId, + eu.PARTY_FLAG + from esua_epdc_user.epdc_user eu + where eu.DEL_FLAG = '0' )e on gr.id=e.orgId + WHERE + co.DEL_FLAG = '0' + and gr.DEL_FLAG = '0' + and co.type_key='community_party' + AND co.`id` NOT IN( SELECT t.`dept_id` + FROM `esua_epdc_admin`.`sys_dept_config` t + WHERE t.`del_flag`= 0) + ) t + GROUP BY + t.orgId + ) t1 + left join esua_epdc_admin.sys_dept d on d.id=t1.orgId + ) total + GROUP BY + total.orgId - - - + + - - - - - - + + - - + + + + + + + + - - - - + + + + + From e33b73f6a8dfd356d9fe15b3c41d758a249eec46 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Mar 2021 15:40:50 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenBasicDataDao.xml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml index 0ebb044..c68a51e 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBasicDataDao.xml @@ -490,7 +490,7 @@ SELECT COUNT(en.`ID`) AS newsCount, SUM(en.`READING_AMOUNT`) AS readCount, SUM(en.`LIKE_NUMBER`) AS likeCount, - SUM(en.`COMMENT_NUM`) AS commentCount + 0 AS commentCount FROM `esua_epdc_news`.`epdc_news` en WHERE en.`DEL_FLAG`= '0' AND en.`NEWS_RELEASE_STATE`= '0' @@ -503,19 +503,8 @@ SELECT en.`ID` AS newsId, en.`NEWS_TITLE` AS newsTitle, - (en.`LIKE_NUMBER`+ en.`UN_LIKE_NUMBER`+ en.`COMMENT_NUM`) AS hotCount + (en.`LIKE_NUMBER`+ en.`UN_LIKE_NUMBER`) AS hotCount FROM `esua_epdc_news`.`epdc_news` en WHERE en.`DEL_FLAG`= '0' AND en.`NEWS_RELEASE_STATE`= '0' From d0bba45f8c232b44b4523d7690a55b5ca613673b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Mar 2021 17:50:36 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenPublicDataDao.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index 99c05b8..e881cd2 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -2001,7 +2001,7 @@ select gr.id as orgId, count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, - count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag + 0 as groupCreateFlag FROM esua_epdc_analysis.epdc_user_behavior_log behavior LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' @@ -2092,7 +2092,7 @@ select gr.id as orgId, count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, - count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag + 0 as groupCreateFlag FROM esua_epdc_analysis.epdc_user_behavior_log behavior LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) @@ -2174,7 +2174,7 @@ select gr.id as orgId, count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, - count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag + 0 as groupCreateFlag FROM esua_epdc_analysis.epdc_user_behavior_log behavior LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' WHERE behavior.USER_ID in ( select meu.ID from esua_epdc_user.epdc_user meu ) @@ -2246,7 +2246,7 @@ select gr.id as orgId, count( behavior.GROUP_OPPOSE_FLAG = 1 OR NULL ) AS groupOpposeFlag, count( behavior.GROUP_JOIN_FLAG = 1 OR NULL ) AS groupJoinFlag, count( behavior.GROUP_COMMENT_FLAG = 1 OR NULL ) AS groupCommentFlag, - count( behavior.GROUP_CREATE_FLAG = 1 OR NULL ) groupCreateFlag + 0 as groupCreateFlag FROM esua_epdc_analysis.epdc_user_behavior_log behavior LEFT JOIN esua_epdc_user.epdc_user USER ON USER.ID = behavior.USER_ID AND USER.DEL_FLAG = '0' @@ -2337,7 +2337,7 @@ SELECT gr.id as orgId, SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag, SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, - SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag + 0 as groupCreateFlag FROM esua_epdc_analysis.epdc_user_behavior_log behavior GROUP BY USER_ID ) behaviorCount @@ -2476,7 +2476,7 @@ UNION ALL SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag, SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, - SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag + 0 as groupCreateFlag FROM esua_epdc_analysis.epdc_user_behavior_log behavior GROUP BY USER_ID ) behaviorCount @@ -2617,7 +2617,7 @@ union all SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag, SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, - SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag + 0 as groupCreateFlag FROM esua_epdc_analysis.epdc_user_behavior_log behavior GROUP BY USER_ID ) behaviorCount @@ -2760,7 +2760,7 @@ union all SUM( behavior.GROUP_OPPOSE_FLAG = 1 ) AS groupOpposeFlag, SUM( behavior.GROUP_JOIN_FLAG = 1 ) AS groupJoinFlag, SUM( behavior.GROUP_COMMENT_FLAG = 1 ) AS groupCommentFlag, - SUM( behavior.GROUP_CREATE_FLAG = 1 ) groupCreateFlag + 0 as groupCreateFlag FROM esua_epdc_analysis.epdc_user_behavior_log behavior GROUP BY USER_ID ) behaviorCount From c1d3a75d51db4fad49460609119e784406a14212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 8 Mar 2021 10:37:30 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenIndexDataDao.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml index 28807ad..e313e87 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml @@ -290,7 +290,8 @@ SELECT sd.ID agencyId, - sd.PID parentId, + CASE WHEN sd.TYPE_KEY = 'street_party' + THEN 0 ELSE PID END AS parentId, DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, CONCAT(DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'), '%Y'), 'Q', @@ -413,7 +415,7 @@ AND sd.id NOT IN ( SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' ) - AND (sd.TYPE_KEY = 'community_party' OR sd.TYPE_KEY = 'street_party' OR sd.TYPE_KEY = 'district_party') + AND (sd.TYPE_KEY = 'community_party' OR sd.TYPE_KEY = 'street_party') select d.id as agencyId, - d.PID as parentId, + CASE WHEN d.TYPE_KEY = 'street_party' + THEN 0 ELSE PID END AS parentId, DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'),'%Y') AS yearId, CONCAT(DATE_FORMAT(STR_TO_DATE(#{yearMonth, jdbcType=VARCHAR}, '%Y'), '%Y'), 'Q', @@ -550,7 +553,7 @@ left join esua_epdc_events.epdc_category c ON me.CATEGORY_CODE = c.CATEGORY_CODE group by t.DEPT_ID )tr on tr.DEPT_ID=d.id - WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party' OR d.TYPE_KEY = 'district_party') + WHERE (d.TYPE_KEY = 'community_party' OR d.TYPE_KEY = 'street_party') and d.DEL_FLAG = '0' and d.id not in ( SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0' From 723b3397eec5927e011083d226e38c9779d6871d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Mar 2021 10:37:35 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenPublicDataDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index e881cd2..8228afa 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -6,8 +6,8 @@