From e074434b87bd85d0d6a1e1a6a74b26439ccc084f Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 27 Sep 2021 16:53:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=BB=84=E7=BB=87-=E6=88=90=E5=91=98=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=A1=A8=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VactOrgTypeController.java | 3 +- .../controller/VolunteerController.java | 63 +++++++++++++++++++ .../modules/volunteer/dao/VolunteerDao.java | 18 ++++++ .../volunteer/dao/VolunteerOrgDao.java | 30 +++++++++ .../volunteer/entity/VolunteerEntity.java | 10 +++ .../volunteer/excel/VolunteerOrgExcel.java | 21 +++++-- .../volunteer/service/VactOrgTypeService.java | 2 +- .../volunteer/service/VolunteerService.java | 46 ++++++++++++++ .../service/impl/VactOrgTypeServiceImpl.java | 15 ++++- .../service/impl/VolunteerOrgServiceImpl.java | 44 ++++++++++--- .../service/impl/VolunteerServiceImpl.java | 39 ++++++++++-- .../mapper/volunteer/VolunteerDao.xml | 13 ++++ .../mapper/volunteer/VolunteerOrgDao.xml | 35 ++++++++++- 13 files changed, 315 insertions(+), 24 deletions(-) diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VactOrgTypeController.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VactOrgTypeController.java index a02ee8f..1f4622d 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VactOrgTypeController.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VactOrgTypeController.java @@ -81,8 +81,7 @@ public class VactOrgTypeController { public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - vactOrgTypeService.delete(ids); - return new Result(); + return vactOrgTypeService.delete(ids); } @GetMapping("export") diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerController.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerController.java index 4e62e55..517b0fe 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerController.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerController.java @@ -29,6 +29,7 @@ import com.elink.esua.epdc.modules.volunteer.dao.VolunteerDao; import com.elink.esua.epdc.modules.volunteer.excel.VolunteerExcel; import com.elink.esua.epdc.modules.volunteer.service.VolunteerService; import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO; +import com.elink.esua.epdc.volunteer.AppVorgFormDTO; import com.elink.esua.epdc.volunteer.VolunteerDTO; import com.elink.esua.epdc.volunteer.VolunteerPageDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -133,4 +134,66 @@ public class VolunteerController { return volunteerService.getVolunteerDetail(formDto); } + + /** + * @describe: 小程序-社会组织-组织分类列表 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getOrgTypeList") + public Result getOrgTypeList(@RequestBody AppVorgFormDTO formDto) { + return volunteerService.getOrgTypeList(formDto); + } + + /** + * @describe: 小程序-社会组织-组织列表 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getOrgListByType") + public Result getOrgListByType(@RequestBody AppVorgFormDTO formDto) { + return volunteerService.getOrgListByType(formDto); + } + + /** + * @describe: 小程序-社会组织-组织详情 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getOrgDetail") + public Result getOrgDetail(@RequestBody AppVorgFormDTO formDto) { + return volunteerService.getOrgDetail(formDto); + } + + /** + * @describe: 小程序-社会组织-组织详情列表 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getOrgDetailList") + public Result getOrgDetailList(@RequestBody AppVorgFormDTO formDto) { + return volunteerService.getOrgDetailList(formDto); + } + + /** + * @describe: 小程序-社会组织-成员管理列表 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getVolunteerList") + public Result getVolunteerList(@RequestBody AppVorgFormDTO formDto) { + return volunteerService.getVolunteerList(formDto); + } + + } \ No newline at end of file diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerDao.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerDao.java index e9f81e7..1374a86 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerDao.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerDao.java @@ -80,4 +80,22 @@ public interface VolunteerDao extends BaseDao { * @return java.util.List */ List getOrgIdListByUserId(@Param("userId") String userId); + + /** + * @describe: 根据用户id和组织ID查询 + * @author wangtong + * @date 2021/9/27 15:16 + * @params [userId, orgId] + * @return com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity + */ + VolunteerEntity getByUserIdAndOrgId(@Param("userId") String userId,@Param("orgId") Long orgId); + + /** + * @describe: 设置旧管理员为普通群成员 + * @author wangtong + * @date 2021/9/27 16:19 + * @params [id] + * @return void + */ + void updateAdminUser(@Param("orgId") Long id); } \ No newline at end of file diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java index 7d36324..bce5670 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java @@ -19,6 +19,9 @@ package com.elink.esua.epdc.modules.volunteer.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity; +import com.elink.esua.epdc.volunteer.AppVorgFormDTO; +import com.elink.esua.epdc.volunteer.OrgListByTypeResultDTO; +import com.elink.esua.epdc.volunteer.OrgTypeListResultDTO; import com.elink.esua.epdc.volunteer.VolunteerOrgDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -70,4 +73,31 @@ public interface VolunteerOrgDao extends BaseDao { * @return java.util.List */ List getAppVolunteerOrgList(); + + /** + * @describe: 小程序-社会组织-组织分类列表 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List getOrgTypeList(); + + /** + * @describe: 小程序-社会组织-组织列表 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List getOrgListByType(AppVorgFormDTO formDto); + + /** + * @describe: 检查组织分类下有没有组织 + * @author wangtong + * @date 2021/9/27 16:34 + * @params [typeId] + * @return java.util.List + */ + List getByTypeId(@Param("typeId") String typeId); } \ No newline at end of file diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerEntity.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerEntity.java index c8c61ee..dd74c20 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerEntity.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerEntity.java @@ -45,6 +45,16 @@ public class VolunteerEntity extends BaseEpdcEntity { */ private String idCard; + /** + * 管理员标识：0否1是 + */ + private String adminFlag; + + /** + * 志愿组织id + */ + private Long volunteerOrgId; + /** * 电话 */ diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerOrgExcel.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerOrgExcel.java index dd78fa4..2e72c86 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerOrgExcel.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerOrgExcel.java @@ -32,24 +32,33 @@ public class VolunteerOrgExcel { // @Excel(name = "主键") // private String id; + /** + * 组织类型 + */ + @Excel(name = "组织类型") + private String orgTypeName; + @Excel(name = "组织名称") private String volunteerOrgName; // @Excel(name = "组织编码") // private String volunteerOrgCode; - @Excel(name = "是否启用",replace = { "启用_0", "禁用_1"}) - private String isOpen; +// @Excel(name = "是否启用",replace = { "启用_0", "禁用_1"}) +// private String isOpen; - @Excel(name = "排序") - private Integer sort; +// @Excel(name = "排序") +// private Integer sort; - @Excel(name = "负责人") + @Excel(name = "管理员姓名") private String headName; - @Excel(name = "负责电话") + @Excel(name = "管理员手机号") private String mobile; + @Excel(name = "居民端管理员") + private String associatedStates; + @Excel(name = "地址") private String address; diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VactOrgTypeService.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VactOrgTypeService.java index c09d52b..e67ce0e 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VactOrgTypeService.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VactOrgTypeService.java @@ -93,7 +93,7 @@ public interface VactOrgTypeService extends BaseService { * @author generator * @date 2021-09-23 */ - void delete(String[] ids); + Result delete(String[] ids); /** * @describe: 获取组织类型列表 diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerService.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerService.java index 7393b68..8550d0c 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerService.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerService.java @@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity; import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO; +import com.elink.esua.epdc.volunteer.AppVorgFormDTO; import com.elink.esua.epdc.volunteer.VolunteerDTO; import com.elink.esua.epdc.volunteer.VolunteerPageDTO; @@ -133,4 +134,49 @@ public interface VolunteerService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result getVolunteerDetail(AppVolunteerApplyDTO formDto); + + /** + * @describe: 小程序-社会组织-组织分类列表 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getOrgTypeList(AppVorgFormDTO formDto); + + /** + * @describe: 小程序-社会组织-组织列表 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getOrgListByType(AppVorgFormDTO formDto); + + /** + * @describe: 小程序-社会组织-组织详情 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getOrgDetail(AppVorgFormDTO formDto); + + /** + * @describe: 小程序-社会组织-组织详情列表 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getOrgDetailList(AppVorgFormDTO formDto); + + /** + * @describe: 小程序-社会组织-成员管理列表 + * @author wangtong + * @date 2021/9/26 15:24 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getVolunteerList(AppVorgFormDTO formDto); } \ No newline at end of file diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactOrgTypeServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactOrgTypeServiceImpl.java index 0d2278e..583d5c1 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactOrgTypeServiceImpl.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactOrgTypeServiceImpl.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.modules.volunteer.service.impl; +import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; @@ -26,7 +27,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.modules.volunteer.dao.VactOrgTypeDao; +import com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgDao; import com.elink.esua.epdc.modules.volunteer.entity.VactOrgTypeEntity; +import com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity; import com.elink.esua.epdc.modules.volunteer.redis.VactOrgTypeRedis; import com.elink.esua.epdc.modules.volunteer.service.VactOrgTypeService; import com.elink.esua.epdc.volunteer.VactOrgTypeDTO; @@ -51,6 +54,9 @@ public class VactOrgTypeServiceImpl extends BaseServiceImpl page(Map params) { IPage page = getPage(params); @@ -119,9 +125,16 @@ public class VactOrgTypeServiceImpl extends BaseServiceImpl orgList = volunteerOrgDao.getByTypeId(id); + if(!CollectionUtils.isEmpty(orgList)){ + return new Result().error("该类型下存在组织，暂不能删除。"); + } + } // 逻辑删除（@TableLogic 注解） baseDao.deleteBatchIds(Arrays.asList(ids)); + return new Result().ok("操作成功"); } @Override diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java index 3a2a9a6..c1237ee 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java @@ -28,10 +28,11 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; +import com.elink.esua.epdc.modules.volunteer.dao.VolunteerDao; import com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgDao; import com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgRelationDao; +import com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity; import com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity; -import com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgRelationEntity; import com.elink.esua.epdc.modules.volunteer.redis.VolunteerOrgRedis; import com.elink.esua.epdc.modules.volunteer.service.VolunteerOrgService; import com.elink.esua.epdc.volunteer.VolunteerOrgDTO; @@ -62,6 +63,9 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl page(Map params) { // IPage page = baseDao.selectPage( @@ -116,12 +120,36 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -121,6 +123,35 @@ public class VolunteerServiceImpl extends BaseServiceImpl result = volunteerOrgDao.getOrgTypeList(); + return new Result().ok(result); + } + + @Override + public Result getOrgListByType(AppVorgFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List result = volunteerOrgDao.getOrgListByType(formDto); + return new Result().ok(result); + } + + @Override + public Result getOrgDetail(AppVorgFormDTO formDto) { + return null; + } + + @Override + public Result getOrgDetailList(AppVorgFormDTO formDto) { + return null; + } + + @Override + public Result getVolunteerList(AppVorgFormDTO formDto) { + return null; + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); diff --git a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml index c11e3a0..a01075d 100644 --- a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml +++ b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml @@ -112,6 +112,19 @@ where USER_ID=#{userId} and v.DEL_FLAG='0' + + + update `epdc_volunteer` set ADMIN_FLAG='0' + where DEL_FLAG='0' + and VOLUNTEER_ORG_ID=#{orgId} + and ADMIN_FLAG='1' + \ No newline at end of file diff --git a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml index 7d1c0b6..dde2589 100644 --- a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml +++ b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml @@ -33,8 +33,8 @@ v.* from epdc_volunteer_org v left join epdc_vact_org_type ot on ot.id=v.org_type - left join epdc_volunteer_org_relation r on r.VOLUNTEER_ORG_ID=v.id - and r.admin_flag=1 and r.DEL_FLAG='0' + left join epdc_volunteer r on r.VOLUNTEER_ORG_ID=v.id + and r.admin_flag=1 and r.DEL_FLAG='0' where v.del_flag='0' and v.volunteer_org_name like '%${volunteerOrgName}%' @@ -62,6 +62,37 @@ AND is_open='0' order by sort ASC + + + \ No newline at end of file