From c5048574f24da47f33f731c8f726316d1dde30fb Mon Sep 17 00:00:00 2001 From: Jackwang Date: Sun, 29 Aug 2021 11:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=AE=A4=E8=AF=81=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VolunteerController.java | 31 +++-- .../controller/VolunteerOrgController.java | 12 ++ .../modules/volunteer/dao/VolunteerDao.java | 33 ++++- .../volunteer/dao/VolunteerOrgDao.java | 9 ++ .../volunteer/entity/VolunteerEntity.java | 2 +- .../volunteer/excel/VolunteerExcel.java | 114 +++++++++--------- .../service/VolunteerOrgService.java | 10 ++ .../volunteer/service/VolunteerService.java | 22 +++- .../service/impl/VolunteerOrgServiceImpl.java | 7 ++ .../service/impl/VolunteerServiceImpl.java | 25 +++- .../mapper/volunteer/VolunteerDao.xml | 58 +++++++++ .../mapper/volunteer/VolunteerOrgDao.xml | 6 + 12 files changed, 261 insertions(+), 68 deletions(-) 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 28dafd2..595c63c 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 @@ -25,9 +25,11 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +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.VolunteerDTO; +import com.elink.esua.epdc.volunteer.VolunteerPageDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -49,16 +51,19 @@ public class VolunteerController { @Autowired private VolunteerService volunteerService; + @Autowired + private VolunteerDao volunteerDao; + @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = volunteerService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = volunteerService.getPageInfo(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - VolunteerDTO data = volunteerService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id){ + VolunteerPageDTO data = volunteerService.get(id); + return new Result().ok(data); } @PostMapping @@ -87,8 +92,20 @@ public class VolunteerController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = volunteerService.list(params); + List list = volunteerDao.getPageInfo(params); ExcelUtils.exportExcelToTarget(response, null, list, VolunteerExcel.class); } + /** + * @describe: 审核认证 + * @author wangtong + * @date 2021/8/29 11:22 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("handleApply") + public Result handleApply(@RequestBody VolunteerDTO dto){ + return volunteerService.handleApply(dto); + } + } \ No newline at end of file diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerOrgController.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerOrgController.java index 35307b0..1cab5ed 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerOrgController.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerOrgController.java @@ -95,4 +95,16 @@ public class VolunteerOrgController { ExcelUtils.exportExcelToTarget(response, null, list, VolunteerOrgExcel.class); } + /** + * @describe: 查询所有志愿组织 + * @author wangtong + * @date 2021/8/28 22:03 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("getVolunteerOrgList") + public Result> getVolunteerOrgList(){ + return volunteerOrgService.getVolunteerOrgList(); + } + } \ 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 f1352da..3d5be26 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 @@ -19,7 +19,12 @@ 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.VolunteerEntity; +import com.elink.esua.epdc.volunteer.VolunteerPageDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * 志愿者信息表 @@ -29,5 +34,31 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface VolunteerDao extends BaseDao { - + + /** + * @describe: 后台列表 + * @author wangtong + * @date 2021/8/29 10:41 + * @params [params] + * @return java.util.List + */ + List getPageInfo(Map params); + + /** + * @describe: 后台查看详情 + * @author wangtong + * @date 2021/8/29 10:40 + * @params [id] + * @return com.elink.esua.epdc.volunteer.VolunteerPageDTO + */ + VolunteerPageDTO selectInfoById(@Param("id") String id); + + /** + * @describe: 通过id查询 + * @author wangtong + * @date 2021/8/29 11:31 + * @params [id] + * @return com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity + */ + VolunteerEntity selectEntityById(@Param("id") String 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 f0fce4d..3326a39 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 @@ -52,4 +52,13 @@ public interface VolunteerOrgDao extends BaseDao { * @return java.util.List */ List getPageList(Map params); + + /** + * @describe: 查询所有志愿组织 + * @author wangtong + * @date 2021/8/28 22:03 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + List getVolunteerOrgList(); } \ 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 1f968f2..33ec768 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 @@ -53,7 +53,7 @@ public class VolunteerEntity extends BaseEpdcEntity { /** * 自我介绍 */ - private String describe; + private String introduceInfo; /** * 认证状态：0审核中 1审核通过 2审核驳回 diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerExcel.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerExcel.java index 1112a3f..f720683 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerExcel.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerExcel.java @@ -20,8 +20,6 @@ package com.elink.esua.epdc.modules.volunteer.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; -import java.util.Date; - /** * 志愿者信息表 * @@ -31,71 +29,77 @@ import java.util.Date; @Data public class VolunteerExcel { - @Excel(name = "主键") - private String id; +// @Excel(name = "主键") +// private String id; @Excel(name = "姓名") - private String name; - - @Excel(name = "身份证") - private String idcard; + private String realName; @Excel(name = "电话") private String mobile; - @Excel(name = "自我介绍") - private String describe; - - @Excel(name = "认证状态：0审核中 1审核通过 2审核驳回") - private String state; - - @Excel(name = "审核理由") - private String reason; - - @Excel(name = "用户ID") - private String userId; - - @Excel(name = "头像地址") - private String url; - - @Excel(name = "党员标识：0否1是") - private String partyFlag; - - @Excel(name = "部门ID") - private String deptId; - - @Excel(name = "部门名称") - private String deptName; - - @Excel(name = "所有部门ID") - private String allDeptIds; - - @Excel(name = "所有部门名称") - private String allDeptNames; - - @Excel(name = "父所有部门") - private String parentDeptIds; - - @Excel(name = "父所有部门") - private String parentDeptNames; + @Excel(name = "身份证") + private String idCard; - @Excel(name = "删除标识 0-否，1-是") - private String delFlag; + @Excel(name = "自我介绍") + private String introduceInfo; - @Excel(name = "乐观锁") - private Integer revision; + @Excel(name = "志愿组织") + private String volunteerOrgNames; - @Excel(name = "创建人") - private String createdBy; +// @Excel(name = "认证状态：0审核中 1审核通过 2审核驳回") +// private String state; - @Excel(name = "创建时间") - private Date createdTime; + @Excel(name = "审核状态") + private String stateName; - @Excel(name = "更新人") - private String updatedBy; + @Excel(name = "审核理由") + private String reason; - @Excel(name = "更新时间") - private Date updatedTime; +// @Excel(name = "用户ID") +// private String userId; +// +// @Excel(name = "头像地址") +// private String url; +// +// @Excel(name = "党员标识：0否1是") +// private String partyFlag; +// +// @Excel(name = "部门ID") +// private String deptId; +// +// @Excel(name = "部门名称") +// private String deptName; +// +// @Excel(name = "所有部门ID") +// private String allDeptIds; +// +// @Excel(name = "所有部门名称") +// private String allDeptNames; +// +// @Excel(name = "父所有部门") +// private String parentDeptIds; +// +// @Excel(name = "父所有部门") +// private String parentDeptNames; +// +// @Excel(name = "删除标识 0-否，1-是") +// private String delFlag; +// +// @Excel(name = "乐观锁") +// private Integer revision; +// +// @Excel(name = "创建人") +// private String createdBy; +// +// @Excel(name = "创建时间") +// private Date createdTime; +// +// @Excel(name = "更新人") +// private String updatedBy; +// +// @Excel(name = "更新时间") +// private Date updatedTime; } \ No newline at end of file diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerOrgService.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerOrgService.java index 1f28521..0d3bd2f 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerOrgService.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerOrgService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.volunteer.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; 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.VolunteerOrgEntity; import com.elink.esua.epdc.volunteer.VolunteerOrgDTO; @@ -93,4 +94,13 @@ public interface VolunteerOrgService extends BaseService { * @date 2021-08-28 */ void delete(String[] ids); + + /** + * @describe: 查询所有志愿组织 + * @author wangtong + * @date 2021/8/28 22:03 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + Result> getVolunteerOrgList(); } \ No newline at end of file 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 bd7b167..332b721 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 @@ -20,8 +20,10 @@ package com.elink.esua.epdc.modules.volunteer.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; 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.VolunteerDTO; +import com.elink.esua.epdc.volunteer.VolunteerPageDTO; import java.util.List; import java.util.Map; @@ -62,7 +64,7 @@ public interface VolunteerService extends BaseService { * @author generator * @date 2021-08-28 */ - VolunteerDTO get(String id); + VolunteerPageDTO get(String id); /** * 默认保存 @@ -93,4 +95,22 @@ public interface VolunteerService extends BaseService { * @date 2021-08-28 */ void delete(String[] ids); + + /** + * @describe: 后台管理列表 + * @author wangtong + * @date 2021/8/29 9:51 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.page.PageData + */ + PageData getPageInfo(Map params); + + /** + * @describe: 审核认证 + * @author wangtong + * @date 2021/8/29 11:22 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result handleApply(VolunteerDTO dto); } \ No newline at end of file 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 63450fe..0ca07e9 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 @@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; 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.VolunteerOrgDao; import com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity; import com.elink.esua.epdc.modules.volunteer.redis.VolunteerOrgRedis; @@ -114,4 +115,10 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl> getVolunteerOrgList() { + List result = baseDao.getVolunteerOrgList(); + return new Result>().ok(result); + } + } \ No newline at end of file diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java index a4355f1..64e60f4 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java @@ -23,11 +23,13 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; 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.VolunteerDao; import com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity; import com.elink.esua.epdc.modules.volunteer.redis.VolunteerRedis; import com.elink.esua.epdc.modules.volunteer.service.VolunteerService; import com.elink.esua.epdc.volunteer.VolunteerDTO; +import com.elink.esua.epdc.volunteer.VolunteerPageDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -58,6 +60,22 @@ public class VolunteerServiceImpl extends BaseServiceImpl getPageInfo(Map params) { + IPage page = getPage(params); + List list = baseDao.getPageInfo(params); + return new PageData<>(list, page.getTotal()); + } + + @Override + public Result handleApply(VolunteerDTO dto) { + VolunteerEntity entity = baseDao.selectEntityById(dto.getId()); + entity.setState(dto.getState()); + entity.setReason(dto.getReason()); + updateById(entity); + return new Result().ok("审核成功"); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); @@ -75,9 +93,8 @@ public class VolunteerServiceImpl extends BaseServiceImpl + + + \ 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 93061dc..f8cb184 100644 --- a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml +++ b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml @@ -35,6 +35,12 @@ order by create_date desc + \ No newline at end of file