From eabdc9da66d6429b15c0048399992e090be0eb94 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 2 Sep 2021 15:13:07 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=20=E5=A4=9A=E5=85=83?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=85=9A=E5=91=98=E6=9C=8D=E5=8A=A1=E5=BC=80?= =?UTF-8?q?=E5=8F=91=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/EpdcScreenController.java | 25 +++++++++++ .../modules/screen/dao/EpdcScreenDao.java | 18 ++++++++ .../screen/service/EpdcScreenService.java | 19 +++++++++ .../service/impl/EpdcScreenServiceImpl.java | 12 ++++++ .../resources/mapper/screen/EpdcScreenDao.xml | 41 ++++++++++++++++--- 5 files changed, 109 insertions(+), 6 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index a39fb19..9f10121 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -307,4 +307,29 @@ public class EpdcScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.itemList(formDto); } + + /** + * 多元服务-党员服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 13:44 + */ + @GetMapping("multipleService/partyMemberServices") + public Result> partyMemberServices(@RequestBody EpdcScreenPartyMemberServicesFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.partyMemberServices(formDto); + } + + /** + * 多元服务-地图党员服务 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 13:44 + */ + public Result> mapPartyMemberServices(@RequestBody EpdcScreenMapPartyMemberServicesFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.mapPartyMemberServices(formDto); + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index df4d344..22b47fc 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -238,4 +238,22 @@ public interface EpdcScreenDao extends BaseDao itemList(EpdcScreenItemListFormDTO formDto); + /** + * 多元服务-党员服务列表 + * @params [formDto] + * @return java.util.List + * @author jyyzz + * @since 2021/9/2 14:03 + */ + List partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto); + + /** + * 多元服务-地图党员服务 + * @params [formDto] + * @return java.util.List + * @author jyyzz + * @since 2021/9/2 14:03 + */ + List mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index e145904..3147259 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.modules.screen.service; +import com.baomidou.mybatisplus.extension.api.R; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; @@ -217,4 +218,22 @@ public interface EpdcScreenService { * @since 2021/8/23 19:02 */ Result> itemList(EpdcScreenItemListFormDTO formDto); + + /** + * 多元服务-党员服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 13:44 + */ + Result> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto); + + /** + * 多元服务-地图党员服务 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 13:44 + */ + Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index e6dd957..b182146 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -181,4 +181,16 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl>().ok(data); } + @Override + public Result> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto) { + List data = baseDao.partyMemberServices(formDto); + return new Result>().ok(data); + } + + @Override + public Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto) { + List data = baseDao.mapPartyMemberServices(formDto); + return new Result>().ok(data); + } + } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 3d4a8f7..08b5ec5 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -228,12 +228,6 @@ ui.CREATED_TIME DESC LIMIT #{pageIndex}, #{pageSize} - - UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '1' WHERE ID = #{id} AND DEL_FALG = '0' - - - UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '0' WHERE ID = #{id} AND DEL_FALG = '0' - + + + + From 235e7b7cc4bb6e8592f4183c3332bfd6a8b56596 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 2 Sep 2021 19:17:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=20=E5=A4=9A=E5=85=83?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=85=9A=E5=91=98=E6=9C=8D=E5=8A=A1=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 1 + .../resources/mapper/screen/EpdcScreenDao.xml | 22 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 9f10121..1a22493 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -328,6 +328,7 @@ public class EpdcScreenController { * @author zhangfenghe * @since 2021/9/2 13:44 */ + @GetMapping("multipleService/mapPartyMemberServices") public Result> mapPartyMemberServices(@RequestBody EpdcScreenMapPartyMemberServicesFormDTO formDto){ ValidatorUtils.validateEntity(formDto); return epdcScreenService.mapPartyMemberServices(formDto); diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 08b5ec5..c69771d 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -509,11 +509,11 @@ LIMIT #{pageIndex}, #{pageSize} - SELECT ug.NICKNAME, ug.USER_AVATAR, - COUNT(tc.ID) AS serviceNum + COUNT(DISTINCT tc.USER_ID,tc.TOPIC_ID) AS serviceNum FROM yushan_esua_epdc_group.epdc_user_group ug LEFT JOIN yushan_esua_epdc_group.epdc_topic_comment tc ON ug.USER_ID = tc.USER_ID WHERE ug.DEL_FLAG = '0' @@ -521,14 +521,24 @@ AND tc.DEL_FLAG = '0' AND tc.COMMENT_TYPE = '0' GROUP BY - tc.TOPIC_ID + tc.USER_ID LIMIT #{pageIndex}, #{pageSize} - SELECT - t.TOPIC_LATITUDE, - t.TOPIC_LONGITUDE, + t.TOPIC_LATITUDE AS topicLatitude, + t.TOPIC_LONGITUDE AS topicLongitude, tc.CONTENT, tc.CREATED_TIME as contentTime, ug.NICKNAME, From 32d470fac1e5a2883bd0c216b40e67a0ba28660d Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Mon, 6 Sep 2021 15:02:40 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=BF=97=E6=84=BF=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E3=80=81=E7=A4=BE=E5=8C=BA=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 52 +++++++++++ .../modules/screen/dao/EpdcScreenDao.java | 40 +++++++- .../screen/service/EpdcScreenService.java | 37 ++++++++ .../service/impl/EpdcScreenServiceImpl.java | 40 ++++++++ .../resources/mapper/screen/EpdcScreenDao.xml | 91 +++++++++++++++++++ 5 files changed, 259 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 1a22493..d4cfbd6 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -333,4 +333,56 @@ public class EpdcScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.mapPartyMemberServices(formDto); } + + /** + * 多元服务-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/communityServices") + public Result> communityServices(@RequestBody EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getCommunityServices(formDto); + } + + /** + * 多元服务-地图-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/mapCommunityServices") + public Result> mapCommunityServices(@RequestBody EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getMapCommunityServices(formDto); + } + + /** + * 多元服务-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/volunteerServices") + public Result> volunteerServices(@RequestBody EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getVolunteerServices(formDto); + } + + /** + * 多元服务-地图-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/mapVolunteerServices") + public Result> mapVolunteerServices(@RequestBody EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getMapVolunteerServices(formDto); + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 22b47fc..10ec12f 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -1,7 +1,6 @@ package com.elink.esua.epdc.modules.screen.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import org.apache.ibatis.annotations.Mapper; @@ -256,4 +255,43 @@ public interface EpdcScreenDao extends BaseDao mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto); + /** + * 多元服务-社区服务列表 + * 统计社区这一级别发布的（type_key = community_party）已上架（ACT_STATUS = '1'） 的 社区活动（ACT_TYPE = '0'） + * + * @params [formDto] + * @return java.util.List + * @author zy + * @since 2021/9/2 15:30 + */ + List selectListCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-社区服务列表 + * @params [formDto] + * @return java.util.List + * @author zy + * @since 2021/9/2 15:30 + */ + List selectListMapCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-志愿服务列表 + * 统计已启用的志愿组织（is_open = '0'）发布的 已上架（ACT_STATUS = '1'） 的 志愿活动（ACT_TYPE = '1'） + * @params [formDto] + * @return java.util.List + * @author zy + * @since 2021/9/2 15:30 + */ + List selectListVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-志愿服务列表 + * @params [formDto] + * @return java.util.List + * @author zy + * @since 2021/9/2 15:30 + */ + List selectListMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index 3147259..8061a90 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -236,4 +236,41 @@ public interface EpdcScreenService { * @since 2021/9/2 13:44 */ Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto); + + /** + * 多元服务-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getMapCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index b182146..9a91371 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -193,4 +193,44 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl>().ok(data); } + @Override + public Result> getCommunityServices(EpdcScreenBasePageFormDTO formDto) { + this.setPageIndex(formDto); + List data = baseDao.selectListCommunityServices(formDto); + return new Result>().ok(data); + } + + @Override + public Result> getMapCommunityServices(EpdcScreenBasePageFormDTO formDto) { + this.setPageIndex(formDto); + List data = baseDao.selectListMapCommunityServices(formDto); + return new Result>().ok(data); + } + + @Override + public Result> getVolunteerServices(EpdcScreenBasePageFormDTO formDto) { + this.setPageIndex(formDto); + List data = baseDao.selectListVolunteerServices(formDto); + return new Result>().ok(data); + } + + @Override + public Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) { + this.setPageIndex(formDto); + List data = baseDao.selectListMapVolunteerServices(formDto); + return new Result>().ok(data); + } + + /** + * 分页统一处理方法 + * + * @param formDto + * @return void + * @Author zhangyong + * @Date 10:36 2021-09-06 + **/ + private void setPageIndex(EpdcScreenBasePageFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE)*formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + } } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index c69771d..67b44ad 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -553,4 +553,95 @@ AND tc.COMMENT_TYPE = '0' LIMIT #{pageIndex}, #{pageSize} + + + + + + + + From 949f09be38097bc2c549bff16be2200b4dcd055a Mon Sep 17 00:00:00 2001 From: zhangfh Date: Mon, 6 Sep 2021 16:33:38 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=20analysis=20sql?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/screen/EpdcScreenDao.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 67b44ad..b79574e 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -526,6 +526,8 @@ + + @@ -537,6 +539,8 @@ @@ -610,15 +610,15 @@ vo.id orgId, vo.volunteer_org_name orgName, COUNT(i.ID) serviceNum, - IFNULL(SUM(TIMESTAMPDIFF(MINUTE, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime, - 100 satisfaction + IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime, + 0 satisfaction FROM yushan_esua_epdc_mutuality.epdc_volunteer_org vo LEFT JOIN yushan_esua_epdc_mutuality.epdc_vact_org_relation vor ON vo.ID = vor.VOLUNTEER_ORG_ID AND vor.DEL_FLAG = '0' LEFT JOIN yushan_esua_epdc_mutuality.epdc_act_info i ON i.VACT_ID = vor.VACT_ID AND i.ACT_TYPE = '1' AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' WHERE vo.del_flag = 0 AND vo.is_open = '0' GROUP BY vo.id - ORDER BY COUNT(i.ID) DESC, IFNULL(SUM(TIMESTAMPDIFF(MINUTE, i.ACT_START_TIME, i.ACT_END_TIME)), 0) DESC + ORDER BY COUNT(i.ID) DESC, IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) DESC LIMIT #{pageIndex}, #{pageSize} From bb73a6a6cf22ee88e7c0690a96d0c9eb9db65a99 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Tue, 7 Sep 2021 15:30:07 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E6=8C=89=E6=9C=8D=E5=8A=A1=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E5=80=92=E5=8F=99=20=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/screen/EpdcScreenDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 66d7ee7..6a67c66 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -520,8 +520,8 @@ AND ug.PARTY_MEMBER = '1' AND tc.DEL_FLAG = '0' AND tc.COMMENT_TYPE = '0' - GROUP BY - tc.USER_ID + GROUP BY tc.USER_ID + ORDER BY COUNT(DISTINCT tc.USER_ID,tc.TOPIC_ID) DESC LIMIT #{pageIndex}, #{pageSize} From 8529e4109d111b48f644c0afb32ec00bb9d5a8b0 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Tue, 7 Sep 2021 15:52:33 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/EpdcScreenDao.xml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 6a67c66..f72f2bf 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -514,8 +514,8 @@ ug.NICKNAME, ug.USER_AVATAR, COUNT(DISTINCT tc.USER_ID,tc.TOPIC_ID) AS serviceNum - FROM yushan_esua_epdc_group.epdc_user_group ug - LEFT JOIN yushan_esua_epdc_group.epdc_topic_comment tc ON ug.USER_ID = tc.USER_ID + FROM esua_epdc_group.epdc_user_group ug + LEFT JOIN esua_epdc_group.epdc_topic_comment tc ON ug.USER_ID = tc.USER_ID WHERE ug.DEL_FLAG = '0' AND ug.PARTY_MEMBER = '1' AND tc.DEL_FLAG = '0' @@ -547,9 +547,9 @@ tc.CREATED_TIME as contentTime, ug.NICKNAME, ug.MOBILE - FROM yushan_esua_epdc_group.epdc_topic t - LEFT JOIN yushan_esua_epdc_group.epdc_topic_comment tc ON t.ID = tc.TOPIC_ID - LEFT JOIN yushan_esua_epdc_group.epdc_user_group ug ON tc.USER_ID = ug.USER_ID + FROM esua_epdc_group.epdc_topic t + LEFT JOIN esua_epdc_group.epdc_topic_comment tc ON t.ID = tc.TOPIC_ID + LEFT JOIN esua_epdc_group.epdc_user_group ug ON tc.USER_ID = ug.USER_ID WHERE t.DEL_FLAG = '0' AND tc.DEL_FLAG = '0' AND ug.DEL_FLAG = '0' @@ -565,12 +565,12 @@ COUNT(i.ID) serviceNum, IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime, 0 satisfaction - FROM yushan_esua_epdc_admin.sys_dept d - LEFT JOIN yushan_esua_epdc_mutuality.epdc_act_info i ON d.id = i.DEPT_ID AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' AND i.ACT_TYPE = '0' + FROM esua_epdc_admin.sys_dept d + LEFT JOIN esua_epdc_mutuality.epdc_act_info i ON d.id = i.DEPT_ID AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' AND i.ACT_TYPE = '0' WHERE d.del_flag = 0 AND d.type_key = 'community_party' - AND d.id NOT IN (SELECT DEPT_ID FROM yushan_esua_epdc_admin.sys_dept_config WHERE DEL_FLAG = 0) + AND d.id NOT IN (SELECT DEPT_ID FROM esua_epdc_admin.sys_dept_config WHERE DEL_FLAG = 0) GROUP BY d.id ORDER BY COUNT(i.ID) DESC, SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)) DESC @@ -595,12 +595,12 @@ i.ACT_CONTENT actContent, i.SPONSOR sponsor, i.CREATED_TIME - FROM yushan_esua_epdc_mutuality.epdc_act_info i - LEFT JOIN yushan_esua_epdc_admin.sys_dept d ON d.id = i.DEPT_ID AND d.del_flag = 0 + FROM esua_epdc_mutuality.epdc_act_info i + LEFT JOIN esua_epdc_admin.sys_dept d ON d.id = i.DEPT_ID AND d.del_flag = 0 WHERE i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' AND i.ACT_TYPE = '0' AND d.type_key = 'community_party' - AND d.id NOT IN (SELECT DEPT_ID FROM yushan_esua_epdc_admin.sys_dept_config WHERE DEL_FLAG = 0) + AND d.id NOT IN (SELECT DEPT_ID FROM esua_epdc_admin.sys_dept_config WHERE DEL_FLAG = 0) ORDER BY i.CREATED_TIME DESC LIMIT #{pageIndex}, #{pageSize} @@ -612,9 +612,9 @@ COUNT(i.ID) serviceNum, IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime, 0 satisfaction - FROM yushan_esua_epdc_mutuality.epdc_volunteer_org vo - LEFT JOIN yushan_esua_epdc_mutuality.epdc_vact_org_relation vor ON vo.ID = vor.VOLUNTEER_ORG_ID AND vor.DEL_FLAG = '0' - LEFT JOIN yushan_esua_epdc_mutuality.epdc_act_info i ON i.VACT_ID = vor.VACT_ID AND i.ACT_TYPE = '1' AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' + FROM esua_epdc_mutuality.epdc_volunteer_org vo + LEFT JOIN esua_epdc_mutuality.epdc_vact_org_relation vor ON vo.ID = vor.VOLUNTEER_ORG_ID AND vor.DEL_FLAG = '0' + LEFT JOIN esua_epdc_mutuality.epdc_act_info i ON i.VACT_ID = vor.VACT_ID AND i.ACT_TYPE = '1' AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' WHERE vo.del_flag = 0 AND vo.is_open = '0' GROUP BY vo.id @@ -639,9 +639,9 @@ i.REQUIREMENT requirement, i.ACT_CONTENT actContent, i.SPONSOR sponsor - FROM yushan_esua_epdc_mutuality.epdc_act_info i - LEFT JOIN yushan_esua_epdc_mutuality.epdc_vact_org_relation vor ON i.VACT_ID = vor.VACT_ID AND vor.DEL_FLAG = '0' - LEFT JOIN yushan_esua_epdc_mutuality.epdc_volunteer_org vo ON vo.ID = vor.VOLUNTEER_ORG_ID AND vo.del_flag = 0 + FROM esua_epdc_mutuality.epdc_act_info i + LEFT JOIN esua_epdc_mutuality.epdc_vact_org_relation vor ON i.VACT_ID = vor.VACT_ID AND vor.DEL_FLAG = '0' + LEFT JOIN esua_epdc_mutuality.epdc_volunteer_org vo ON vo.ID = vor.VOLUNTEER_ORG_ID AND vo.del_flag = 0 WHERE i.ACT_TYPE = '1' AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' AND vo.is_open = '0' GROUP BY i.ID