Browse Source

Merge remote-tracking branch 'origin/feature/phaseOne'

hotfix/zhy
liuchuang 4 years ago
parent
commit
304d5db17e
  1. 78
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java
  2. 58
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java
  3. 56
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java
  4. 52
      epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java
  5. 146
      epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

78
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java

@ -307,4 +307,82 @@ public class EpdcScreenController {
ValidatorUtils.validateEntity(formDto); ValidatorUtils.validateEntity(formDto);
return epdcScreenService.itemList(formDto); return epdcScreenService.itemList(formDto);
} }
/**
* 多元服务-党员服务列表
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyMemberServicesResultDTO>>
* @author zhangfenghe
* @since 2021/9/2 13:44
*/
@GetMapping("multipleService/partyMemberServices")
public Result<List<EpdcScreenPartyMemberServicesResultDTO>> partyMemberServices(@RequestBody EpdcScreenPartyMemberServicesFormDTO formDto){
ValidatorUtils.validateEntity(formDto);
return epdcScreenService.partyMemberServices(formDto);
}
/**
* 多元服务-地图党员服务
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyMemberServicesResultDTO>>
* @author zhangfenghe
* @since 2021/9/2 13:44
*/
@GetMapping("multipleService/mapPartyMemberServices")
public Result<List<EpdcScreenMapPartyMemberServicesResultDTO>> mapPartyMemberServices(@RequestBody EpdcScreenMapPartyMemberServicesFormDTO formDto){
ValidatorUtils.validateEntity(formDto);
return epdcScreenService.mapPartyMemberServices(formDto);
}
/**
* 多元服务-社区服务列表
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActStatisticsResultDTO>>
* @author zy
* @since 2021/9/2 15:30
*/
@GetMapping("multipleService/communityServices")
public Result<List<EpdcScreenActStatisticsResultDTO>> communityServices(@RequestBody EpdcScreenBasePageFormDTO formDto){
ValidatorUtils.validateEntity(formDto);
return epdcScreenService.getCommunityServices(formDto);
}
/**
* 多元服务-地图-社区服务列表
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActListResultDTO>>
* @author zy
* @since 2021/9/2 15:30
*/
@GetMapping("multipleService/mapCommunityServices")
public Result<List<EpdcScreenActListResultDTO>> mapCommunityServices(@RequestBody EpdcScreenBasePageFormDTO formDto){
ValidatorUtils.validateEntity(formDto);
return epdcScreenService.getMapCommunityServices(formDto);
}
/**
* 多元服务-志愿服务列表
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActStatisticsResultDTO>>
* @author zy
* @since 2021/9/2 15:30
*/
@GetMapping("multipleService/volunteerServices")
public Result<List<EpdcScreenActStatisticsResultDTO>> volunteerServices(@RequestBody EpdcScreenBasePageFormDTO formDto){
ValidatorUtils.validateEntity(formDto);
return epdcScreenService.getVolunteerServices(formDto);
}
/**
* 多元服务-地图-志愿服务列表
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActListResultDTO>>
* @author zy
* @since 2021/9/2 15:30
*/
@GetMapping("multipleService/mapVolunteerServices")
public Result<List<EpdcScreenActListResultDTO>> mapVolunteerServices(@RequestBody EpdcScreenBasePageFormDTO formDto){
ValidatorUtils.validateEntity(formDto);
return epdcScreenService.getMapVolunteerServices(formDto);
}
} }

58
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; package com.elink.esua.epdc.modules.screen.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; 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.form.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -238,4 +237,61 @@ public interface EpdcScreenDao extends BaseDao<EpdcScreenGridGovernanceItemResul
*/ */
List<EpdcScreenItemListResultDTO> itemList(EpdcScreenItemListFormDTO formDto); List<EpdcScreenItemListResultDTO> itemList(EpdcScreenItemListFormDTO formDto);
/**
* 多元服务-党员服务列表
* @params [formDto]
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyMemberServicesResultDTO>
* @author jyyzz
* @since 2021/9/2 14:03
*/
List<EpdcScreenPartyMemberServicesResultDTO> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto);
/**
* 多元服务-地图党员服务
* @params [formDto]
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyMemberServicesResultDTO>
* @author jyyzz
* @since 2021/9/2 14:03
*/
List<EpdcScreenMapPartyMemberServicesResultDTO> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto);
/**
* 多元服务-社区服务列表
* 统计社区这一级别发布的type_key = community_party已上架ACT_STATUS = '1' 社区活动ACT_TYPE = '0'
*
* @params [formDto]
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActStatisticsResultDTO>
* @author zy
* @since 2021/9/2 15:30
*/
List<EpdcScreenActStatisticsResultDTO> selectListCommunityServices(EpdcScreenBasePageFormDTO formDto);
/**
* 多元服务-地图-社区服务列表
* @params [formDto]
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActListResultDTO>
* @author zy
* @since 2021/9/2 15:30
*/
List<EpdcScreenActListResultDTO> selectListMapCommunityServices(EpdcScreenBasePageFormDTO formDto);
/**
* 多元服务-志愿服务列表
* 统计已启用的志愿组织is_open = '0'发布的 已上架ACT_STATUS = '1' 志愿活动ACT_TYPE = '1'
* @params [formDto]
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActStatisticsResultDTO>
* @author zy
* @since 2021/9/2 15:30
*/
List<EpdcScreenActStatisticsResultDTO> selectListVolunteerServices(EpdcScreenBasePageFormDTO formDto);
/**
* 多元服务-地图-志愿服务列表
* @params [formDto]
* @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActListResultDTO>
* @author zy
* @since 2021/9/2 15:30
*/
List<EpdcScreenActListResultDTO> selectListMapVolunteerServices(EpdcScreenBasePageFormDTO formDto);
} }

56
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; 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.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
@ -217,4 +218,59 @@ public interface EpdcScreenService {
* @since 2021/8/23 19:02 * @since 2021/8/23 19:02
*/ */
Result<List<EpdcScreenItemListResultDTO>> itemList(EpdcScreenItemListFormDTO formDto); Result<List<EpdcScreenItemListResultDTO>> itemList(EpdcScreenItemListFormDTO formDto);
/**
* 多元服务-党员服务列表
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyMemberServicesResultDTO>>
* @author zhangfenghe
* @since 2021/9/2 13:44
*/
Result<List<EpdcScreenPartyMemberServicesResultDTO>> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto);
/**
* 多元服务-地图党员服务
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyMemberServicesResultDTO>>
* @author zhangfenghe
* @since 2021/9/2 13:44
*/
Result<List<EpdcScreenMapPartyMemberServicesResultDTO>> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto);
/**
* 多元服务-社区服务列表
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActStatisticsResultDTO>>
* @author zy
* @since 2021/9/2 15:30
*/
Result<List<EpdcScreenActStatisticsResultDTO>> getCommunityServices(EpdcScreenBasePageFormDTO formDto);
/**
* 多元服务-地图-社区服务列表
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActListResultDTO>>
* @author zy
* @since 2021/9/2 15:30
*/
Result<List<EpdcScreenActListResultDTO>> getMapCommunityServices(EpdcScreenBasePageFormDTO formDto);
/**
* 多元服务-志愿服务列表
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActStatisticsResultDTO>>
* @author zy
* @since 2021/9/2 15:30
*/
Result<List<EpdcScreenActStatisticsResultDTO>> getVolunteerServices(EpdcScreenBasePageFormDTO formDto);
/**
* 多元服务-地图-志愿服务列表
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActListResultDTO>>
* @author zy
* @since 2021/9/2 15:30
*/
Result<List<EpdcScreenActListResultDTO>> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto);
} }

52
epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java

@ -181,4 +181,56 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl<EpdcScreenDao, EpdcSc
return new Result<List<EpdcScreenItemListResultDTO>>().ok(data); return new Result<List<EpdcScreenItemListResultDTO>>().ok(data);
} }
@Override
public Result<List<EpdcScreenPartyMemberServicesResultDTO>> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto) {
List<EpdcScreenPartyMemberServicesResultDTO> data = baseDao.partyMemberServices(formDto);
return new Result<List<EpdcScreenPartyMemberServicesResultDTO>>().ok(data);
}
@Override
public Result<List<EpdcScreenMapPartyMemberServicesResultDTO>> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto) {
List<EpdcScreenMapPartyMemberServicesResultDTO> data = baseDao.mapPartyMemberServices(formDto);
return new Result<List<EpdcScreenMapPartyMemberServicesResultDTO>>().ok(data);
}
@Override
public Result<List<EpdcScreenActStatisticsResultDTO>> getCommunityServices(EpdcScreenBasePageFormDTO formDto) {
this.setPageIndex(formDto);
List<EpdcScreenActStatisticsResultDTO> data = baseDao.selectListCommunityServices(formDto);
return new Result<List<EpdcScreenActStatisticsResultDTO>>().ok(data);
}
@Override
public Result<List<EpdcScreenActListResultDTO>> getMapCommunityServices(EpdcScreenBasePageFormDTO formDto) {
this.setPageIndex(formDto);
List<EpdcScreenActListResultDTO> data = baseDao.selectListMapCommunityServices(formDto);
return new Result<List<EpdcScreenActListResultDTO>>().ok(data);
}
@Override
public Result<List<EpdcScreenActStatisticsResultDTO>> getVolunteerServices(EpdcScreenBasePageFormDTO formDto) {
this.setPageIndex(formDto);
List<EpdcScreenActStatisticsResultDTO> data = baseDao.selectListVolunteerServices(formDto);
return new Result<List<EpdcScreenActStatisticsResultDTO>>().ok(data);
}
@Override
public Result<List<EpdcScreenActListResultDTO>> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) {
this.setPageIndex(formDto);
List<EpdcScreenActListResultDTO> data = baseDao.selectListMapVolunteerServices(formDto);
return new Result<List<EpdcScreenActListResultDTO>>().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);
}
} }

146
epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

@ -228,12 +228,6 @@
ui.CREATED_TIME DESC ui.CREATED_TIME DESC
LIMIT #{pageIndex}, #{pageSize} LIMIT #{pageIndex}, #{pageSize}
</select> </select>
<update id="recommended">
UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '1' WHERE ID = #{id} AND DEL_FALG = '0'
</update>
<update id="recommendedCancel">
UPDATE esua_epdc_user.epdc_user_info SET RECOMMEND_FLAG = '0' WHERE ID = #{id} AND DEL_FALG = '0'
</update>
<select id="partyMemberAge" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyMemberAgeResultDTO"> <select id="partyMemberAge" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyMemberAgeResultDTO">
SELECT SELECT
IFNULL(SUM( AGE_EIGHTEEN_THIRTY ), 0) AS ageEighteenThirty, IFNULL(SUM( AGE_EIGHTEEN_THIRTY ), 0) AS ageEighteenThirty,
@ -514,4 +508,144 @@
CREATED_TIME DESC CREATED_TIME DESC
LIMIT #{pageIndex}, #{pageSize} LIMIT #{pageIndex}, #{pageSize}
</select> </select>
<select id="partyMemberServices" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyMemberServicesResultDTO">
SELECT
ug.NICKNAME,
ug.USER_AVATAR,
COUNT(DISTINCT tc.USER_ID,tc.TOPIC_ID) AS serviceNum
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'
AND tc.COMMENT_TYPE = '0'
GROUP BY tc.USER_ID
ORDER BY COUNT(DISTINCT tc.USER_ID,tc.TOPIC_ID) DESC
LIMIT #{pageIndex}, #{pageSize}
</select>
<resultMap id="mapPartyMemberServiceMap" type="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenMapPartyMemberServicesResultDTO">
<result property="id" column="ID"/>
<result property="topicContent" column="TOPIC_CONTENT"/>
<result property="topicLongitude" column="topicLongitude"/>
<result property="topicLatitude" column="topicLatitude"/>
<collection property="partyMemberInfo" ofType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyMemberInfoDTO">
<result property="nickName" column="NICKNAME"/>
<result property="mobile" column="MOBILE"/>
<result property="content" column="CONTENT"/>
<result property="contentTime" column="contentTime"/>
</collection>
</resultMap>
<select id="mapPartyMemberServices" resultMap="mapPartyMemberServiceMap">
SELECT
t.ID,
t.TOPIC_CONTENT,
t.TOPIC_LATITUDE AS topicLatitude,
t.TOPIC_LONGITUDE AS topicLongitude,
tc.CONTENT,
tc.CREATED_TIME as contentTime,
ug.NICKNAME,
ug.MOBILE
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'
AND ug.PARTY_MEMBER = '1'
AND tc.COMMENT_TYPE = '0'
LIMIT #{pageIndex}, #{pageSize}
</select>
<select id="selectListCommunityServices" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActStatisticsResultDTO">
SELECT
d.id orgId,
d.`NAME` orgName,
COUNT(i.ID) serviceNum,
IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime,
0 satisfaction
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 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
LIMIT #{pageIndex}, #{pageSize}
</select>
<select id="selectListMapCommunityServices" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActListResultDTO">
SELECT
d.id orgId,
d.`NAME` orgName,
i.ACT_LONGITUDE actLongitude,
i.ACT_LATITUDE actLatitude,
i.CONTACTS contacts,
i.TEL tel,
i.ACT_START_TIME actStartTime,
i.ACT_END_TIME actEndTime,
i.TITLE title,
i.ID actId,
i.HEAD_PIC headPic,
i.SIGNUP_NUM signupNum,
i.REQUIREMENT requirement,
i.ACT_CONTENT actContent,
i.SPONSOR sponsor,
i.CREATED_TIME
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 esua_epdc_admin.sys_dept_config WHERE DEL_FLAG = 0)
ORDER BY i.CREATED_TIME DESC
LIMIT #{pageIndex}, #{pageSize}
</select>
<select id="selectListVolunteerServices" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActStatisticsResultDTO">
SELECT
vo.id orgId,
vo.volunteer_org_name orgName,
COUNT(i.ID) serviceNum,
IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime,
0 satisfaction
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
ORDER BY COUNT(i.ID) DESC, IFNULL(SUM(TIMESTAMPDIFF(HOUR, i.ACT_START_TIME, i.ACT_END_TIME)), 0) DESC
LIMIT #{pageIndex}, #{pageSize}
</select>
<select id="selectListMapVolunteerServices" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenActListResultDTO">
SELECT
GROUP_CONCAT(vo.id) orgId,
GROUP_CONCAT(vo.volunteer_org_name) orgName,
i.ACT_LONGITUDE actLongitude,
i.ACT_LATITUDE actLatitude,
i.CONTACTS contacts,
i.TEL tel,
i.ACT_START_TIME actStartTime,
i.ACT_END_TIME actEndTime,
i.TITLE title,
i.ID actId,
i.HEAD_PIC headPic,
i.SIGNUP_NUM signupNum,
i.REQUIREMENT requirement,
i.ACT_CONTENT actContent,
i.SPONSOR sponsor
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
ORDER BY i.CREATED_TIME DESC
LIMIT #{pageIndex}, #{pageSize}
</select>
</mapper> </mapper>

Loading…
Cancel
Save