志愿者组织管理

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<PageData<VolunteerOrgDTO>> page(@RequestParam Map<String, Object> params){
         PageData<VolunteerOrgDTO> page = volunteerOrgService.page(params);
@@ -87,7 +91,7 @@ public class VolunteerOrgController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<VolunteerOrgDTO> list = volunteerOrgService.list(params);
+        List<VolunteerOrgDTO> list = volunteerOrgDao.getPageList(params);
         ExcelUtils.exportExcelToTarget(response, null, list, VolunteerOrgExcel.class);
     }
 

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<VolunteerOrgEntity> {
-	
+
+    /**
+    * @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<com.elink.esua.epdc.dto.VolunteerOrgDTO>
+    */
+    List<VolunteerOrgDTO> getPageList(Map<String, Object> params);
 }

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;
 
     /**
      * 电话

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;
+
 }

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;
 
 
 }

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<VolunteerOrgDao, Vo
 
     @Override
     public PageData<VolunteerOrgDTO> page(Map<String, Object> params) {
-        IPage<VolunteerOrgEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, VolunteerOrgDTO.class);
+//        IPage<VolunteerOrgEntity> page = baseDao.selectPage(
+//                getPage(params, FieldConstant.CREATE_DATE, false),
+//                getWrapper(params)
+//        );
+//        return getPageData(page, VolunteerOrgDTO.class);
+
+        IPage<VolunteerOrgDTO> page = getPage(params);
+        List<VolunteerOrgDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
@@ -83,6 +88,10 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl<VolunteerOrgDao, Vo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(VolunteerOrgDTO dto) {
+        VolunteerOrgEntity isHave = baseDao.selectByName(dto.getVolunteerOrgName(),null);
+        if(isHave != null){
+            throw new RenException("已存在此组织名称，请更换后重试");
+        }
         VolunteerOrgEntity entity = ConvertUtils.sourceToTarget(dto, VolunteerOrgEntity.class);
         insert(entity);
     }
@@ -90,6 +99,10 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl<VolunteerOrgDao, Vo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(VolunteerOrgDTO dto) {
+        VolunteerOrgEntity isHave = baseDao.selectByName(dto.getVolunteerOrgName(),dto.getId());
+        if(isHave != null){
+            throw new RenException("已存在此组织名称，请更换后重试");
+        }
         VolunteerOrgEntity entity = ConvertUtils.sourceToTarget(dto, VolunteerOrgEntity.class);
         updateById(entity);
     }

epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml

@@ -4,21 +4,37 @@
 <mapper namespace="com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgDao">
 
     <resultMap type="com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity" id="volunteerOrgMap">
-        <result property="id" column="ID"/>
-        <result property="volunteerOrgName" column="VOLUNTEER_ORG_NAME"/>
-        <result property="volunteerOrgCode" column="VOLUNTEER_ORG_CODE"/>
-        <result property="isOpen" column="IS_OPEN"/>
-        <result property="sort" column="SORT"/>
-        <result property="headName" column="HEAD_NAME"/>
-        <result property="mobile" column="MOBILE"/>
-        <result property="address" column="ADDRESS"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="id" column="id"/>
+        <result property="volunteerOrgName" column="volunteer_org_name"/>
+        <result property="volunteerOrgCode" column="volunteer_org_code"/>
+        <result property="isOpen" column="is_open"/>
+        <result property="sort" column="sort"/>
+        <result property="headName" column="head_name"/>
+        <result property="mobile" column="mobile"/>
+        <result property="address" column="address"/>
+        <result property="note" column="note"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="creator" column="creator"/>
+        <result property="createDate" column="create_date"/>
+        <result property="updater" column="updater"/>
+        <result property="updateDate" column="update_date"/>
     </resultMap>
+    <select id="selectByName" resultType="com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity">
+        select * from epdc_volunteer_org
+        where del_flag='0'
+              and volunteer_org_name=#{volunteerOrgName}
+              <if test="id != null and id!=''">
+                  and id !=#{id}
+              </if>
+    </select>
+    <select id="getPageList" resultType="com.elink.esua.epdc.volunteer.VolunteerOrgDTO">
+        select * from epdc_volunteer_org
+         where del_flag='0'
+                <if test="volunteerOrgName != null and volunteerOrgName!=''">
+                    and volunteer_org_name like '%${volunteerOrgName}%'
+                </if>
+        order by create_date desc
+    </select>
 
 
 </mapper>