From 7913441c1cb6a91e1aef32d0292f1a7c8c960308 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Sat, 28 Aug 2021 21:52:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VolunteerOrgController.java | 6 +- .../volunteer/dao/VolunteerOrgDao.java | 24 +++++- .../volunteer/entity/VolunteerEntity.java | 4 +- .../volunteer/entity/VolunteerOrgEntity.java | 74 +++++++++++++------ .../volunteer/excel/VolunteerOrgExcel.java | 46 ++++++------ .../service/impl/VolunteerOrgServiceImpl.java | 23 ++++-- .../mapper/volunteer/VolunteerOrgDao.xml | 44 +++++++---- 7 files changed, 150 insertions(+), 71 deletions(-) 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 d36fbc0..35307b0 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 @@ -25,6 +25,7 @@ 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.VolunteerOrgDao; import com.elink.esua.epdc.modules.volunteer.excel.VolunteerOrgExcel; import com.elink.esua.epdc.modules.volunteer.service.VolunteerOrgService; import com.elink.esua.epdc.volunteer.VolunteerOrgDTO; @@ -49,6 +50,9 @@ public class VolunteerOrgController { @Autowired private VolunteerOrgService volunteerOrgService; + @Autowired + private VolunteerOrgDao volunteerOrgDao; + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = volunteerOrgService.page(params); @@ -87,7 +91,7 @@ public class VolunteerOrgController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = volunteerOrgService.list(params); + List list = volunteerOrgDao.getPageList(params); ExcelUtils.exportExcelToTarget(response, null, list, VolunteerOrgExcel.class); } 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 c2e1080..f0fce4d 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,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.VolunteerOrgEntity; +import com.elink.esua.epdc.volunteer.VolunteerOrgDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * 志愿者组织 @@ -29,5 +34,22 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface VolunteerOrgDao extends BaseDao { - + + /** + * @describe: 通过组织名称查询 + * @author wangtong + * @date 2021/8/28 20:27 + * @params [volunteerOrgName] + * @return com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity + */ + VolunteerOrgEntity selectByName(@Param("volunteerOrgName") String volunteerOrgName,@Param("id") Long id); + + /** + * @describe: 后台列表 + * @author wangtong + * @date 2021/8/28 21:23 + * @params [params] + * @return java.util.List + */ + List getPageList(Map params); } \ 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 f3e4969..1f968f2 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 @@ -38,12 +38,12 @@ public class VolunteerEntity extends BaseEpdcEntity { /** * 姓名 */ - private String name; + private String realName; /** * 身份证 */ - private String idcard; + private String idCard; /** * 电话 diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerOrgEntity.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerOrgEntity.java index 11e254d..9733db1 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerOrgEntity.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerOrgEntity.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.modules.volunteer.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,43 +35,68 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("epdc_volunteer_org") -public class VolunteerOrgEntity extends BaseEpdcEntity { +public class VolunteerOrgEntity extends BaseEntity { private static final long serialVersionUID = 1L; - /** - * 组织名称 - */ + + /** + * 组织名称 + */ private String volunteerOrgName; - /** - * 组织编码 - */ + /** + * 组织编码 + */ private String volunteerOrgCode; - /** - * 是否启用：0启用 1禁用 - */ + /** + * 是否启用：0启用 1禁用 + */ private String isOpen; - /** - * 排序 - */ + /** + * 排序 + */ private Integer sort; - /** - * 负责人 - */ + /** + * 负责人 + */ private String headName; - /** - * 负责电话 - */ + /** + * 负责电话 + */ private String mobile; - /** - * 地址 - */ + /** + * 地址 + */ private String address; + /** + * 备注 + */ + private String note; + + /** + * 删除标识 0：未删除 1：删除 + */ + @TableField(fill = FieldFill.INSERT) + private Integer delFlag; + + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updater; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateDate; + } \ No newline at end of file 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 6d605fe..dd78fa4 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 @@ -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,16 +29,16 @@ import java.util.Date; @Data public class VolunteerOrgExcel { - @Excel(name = "主键") - private String id; +// @Excel(name = "主键") +// private String id; @Excel(name = "组织名称") private String volunteerOrgName; - @Excel(name = "组织编码") - private String volunteerOrgCode; +// @Excel(name = "组织编码") +// private String volunteerOrgCode; - @Excel(name = "是否启用：0启用 1禁用") + @Excel(name = "是否启用",replace = { "启用_0", "禁用_1"}) private String isOpen; @Excel(name = "排序") @@ -55,23 +53,23 @@ public class VolunteerOrgExcel { @Excel(name = "地址") private String address; - @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; +// @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/impl/VolunteerOrgServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java index f756df8..63450fe 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 @@ -21,6 +21,7 @@ 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; 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.modules.volunteer.dao.VolunteerOrgDao; @@ -51,11 +52,15 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, VolunteerOrgDTO.class); +// IPage page = baseDao.selectPage( +// getPage(params, FieldConstant.CREATE_DATE, false), +// getWrapper(params) +// ); +// return getPageData(page, VolunteerOrgDTO.class); + + IPage page = getPage(params); + List list = baseDao.getPageList(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -83,6 +88,10 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file