志愿认证审核

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<PageData<VolunteerDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<VolunteerPageDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<VolunteerDTO> page = volunteerService.page(params);
+        PageData<VolunteerPageDTO> page = volunteerService.getPageInfo(params);
-        return new Result<PageData<VolunteerDTO>>().ok(page);
+        return new Result<PageData<VolunteerPageDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<VolunteerDTO> get(@PathVariable("id") String id){
+    public Result<VolunteerPageDTO> get(@PathVariable("id") String id){
-        VolunteerDTO data = volunteerService.get(id);
+        VolunteerPageDTO data = volunteerService.get(id);
-        return new Result<VolunteerDTO>().ok(data);
+        return new Result<VolunteerPageDTO>().ok(data);
     }
 
     @PostMapping
@@ -87,8 +92,20 @@ public class VolunteerController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<VolunteerDTO> list = volunteerService.list(params);
+        List<VolunteerPageDTO> 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);
+    }
+
 }

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<java.util.List<com.elink.esua.epdc.volunteer.VolunteerOrgDTO>>
+    */
+    @GetMapping("getVolunteerOrgList")
+    public Result<List<VolunteerOrgDTO>> getVolunteerOrgList(){
+        return volunteerOrgService.getVolunteerOrgList();
+    }
+
 }

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;
 
 /**
  * 志愿者信息表
@@ -30,4 +35,30 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface VolunteerDao extends BaseDao<VolunteerEntity> {
 
+    /**
+    * @describe: 后台列表
+    * @author wangtong
+    * @date 2021/8/29 10:41
+    * @params [params]
+    * @return java.util.List<com.elink.esua.epdc.volunteer.VolunteerPageDTO>
+    */
+    List<VolunteerPageDTO> getPageInfo(Map<String, Object> 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);
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java

@@ -52,4 +52,13 @@ public interface VolunteerOrgDao extends BaseDao<VolunteerOrgEntity> {
     * @return java.util.List<com.elink.esua.epdc.dto.VolunteerOrgDTO>
     */
     List<VolunteerOrgDTO> getPageList(Map<String, Object> params);
+
+    /**
+     * @describe: 查询所有志愿组织
+     * @author wangtong
+     * @date 2021/8/28 22:03
+     * @params [params]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.volunteer.VolunteerOrgDTO>>
+     */
+    List<VolunteerOrgDTO> getVolunteerOrgList();
 }

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审核驳回

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 = "主键")
+//    @Excel(name = "主键")
-    private String id;
+//    private String id;
 
     @Excel(name = "姓名")
-    private String name;
+    private String realName;
-
-    @Excel(name = "身份证")
-    private String idcard;
 
     @Excel(name = "电话")
     private String mobile;
 
-    @Excel(name = "自我介绍")
+    @Excel(name = "身份证")
-    private String describe;
+    private String idCard;
-
-    @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 = "删除标识 0-否，1-是")
+    @Excel(name = "自我介绍")
-    private String delFlag;
+    private String introduceInfo;
 
-    @Excel(name = "乐观锁")
+    @Excel(name = "志愿组织")
-    private Integer revision;
+    private String volunteerOrgNames;
 
-    @Excel(name = "创建人")
+//    @Excel(name = "认证状态：0审核中 1审核通过 2审核驳回")
-    private String createdBy;
+//    private String state;
 
-    @Excel(name = "创建时间")
+    @Excel(name = "审核状态")
-    private Date createdTime;
+    private String stateName;
 
-    @Excel(name = "更新人")
+    @Excel(name = "审核理由")
-    private String updatedBy;
+    private String reason;
 
-    @Excel(name = "更新时间")
+//    @Excel(name = "用户ID")
-    private Date updatedTime;
+//    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;
 
 
 }

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<VolunteerOrgEntity> {
      * @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<java.util.List<com.elink.esua.epdc.volunteer.VolunteerOrgDTO>>
+     */
+    Result<List<VolunteerOrgDTO>> getVolunteerOrgList();
 }

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<VolunteerEntity> {
      * @author generator
      * @date 2021-08-28
      */
-    VolunteerDTO get(String id);
+    VolunteerPageDTO get(String id);
 
     /**
      * 默认保存
@@ -93,4 +95,22 @@ public interface VolunteerService extends BaseService<VolunteerEntity> {
      * @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<com.elink.esua.epdc.volunteer.VolunteerPageDTO>
+    */
+    PageData<VolunteerPageDTO> getPageInfo(Map<String, Object> 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);
 }

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<VolunteerOrgDao, Vo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result<List<VolunteerOrgDTO>> getVolunteerOrgList() {
+        List<VolunteerOrgDTO> result = baseDao.getVolunteerOrgList();
+        return new Result<List<VolunteerOrgDTO>>().ok(result);
+    }
+
 }

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<VolunteerDao, Voluntee
         return getPageData(page, VolunteerDTO.class);
     }
 
+    @Override
+    public PageData<VolunteerPageDTO> getPageInfo(Map<String, Object> params) {
+        IPage<VolunteerPageDTO> page = getPage(params);
+        List<VolunteerPageDTO> 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<VolunteerDTO> list(Map<String, Object> params) {
         List<VolunteerEntity> entityList = baseDao.selectList(getWrapper(params));
@@ -75,9 +93,8 @@ public class VolunteerServiceImpl extends BaseServiceImpl<VolunteerDao, Voluntee
     }
 
     @Override
-    public VolunteerDTO get(String id) {
+    public VolunteerPageDTO get(String id) {
-        VolunteerEntity entity = baseDao.selectById(id);
+        return baseDao.selectInfoById(id);
-        return ConvertUtils.sourceToTarget(entity, VolunteerDTO.class);
     }
 
     @Override
@@ -101,4 +118,6 @@ public class VolunteerServiceImpl extends BaseServiceImpl<VolunteerDao, Voluntee
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+
+
 }

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

@@ -27,6 +27,64 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="getPageInfo" resultType="com.elink.esua.epdc.volunteer.VolunteerPageDTO">
+        select v.id,
+			 v.REAL_NAME,
+			 v.MOBILE,
+			 v.ID_CARD,
+			 v.`INTRODUCE_INFO` as introduceInfo,
+			 V.STATE,
+			 CASE
+			 WHEN V.STATE='0' THEN '未审核'
+			 WHEN V.STATE='5' THEN '未通过'
+			 WHEN V.STATE='10' THEN '通过'
+			 else '状态信息错误' END as stateName,
+             v.REASON,
+			 REPLACE(GROUP_CONCAT(o.volunteer_org_name ORDER BY o.create_date DESC),',','、')  as volunteerOrgNames
+        from epdc_volunteer v
+        left join epdc_volunteer_org_relation r on v.id=r.VOLUNTEER_ID and r.DEL_FLAG='0'
+        LEFT JOIN epdc_volunteer_org o on r.VOLUNTEER_ORG_ID=o.id and o.del_flag='0'
+        where v.DEL_FLAG='0'
+        <if test="state != null and state!=''">
+            and v.state=#{state}
+        </if>
+        <if test="volunteerOrgId != null and volunteerOrgId!=''">
+            and o.id=#{volunteerOrgId}
+        </if>
+        <if test="mobile != null and mobile!=''">
+            and v.mobile like '%${mobile}%'
+        </if>
+        group by v.id
+        order by v.CREATED_TIME desc
+    </select>
+    <select id="selectInfoById" resultType="com.elink.esua.epdc.volunteer.VolunteerPageDTO">
+        select v.id,
+			 v.REAL_NAME,
+			 v.MOBILE,
+			 v.ID_CARD,
+			 v.`INTRODUCE_INFO` as introduceInfo,
+			 V.STATE,
+			 CASE
+			 WHEN V.STATE='0' THEN '未审核'
+			 WHEN V.STATE='5' THEN '未通过'
+			 WHEN V.STATE='10' THEN '通过'
+			 else '状态信息错误' END as stateName,
+             v.REASON,
+			 REPLACE(GROUP_CONCAT(o.volunteer_org_name ORDER BY o.create_date DESC),',','、')  as volunteerOrgNames
+        from epdc_volunteer v
+        left join epdc_volunteer_org_relation r on v.id=r.VOLUNTEER_ID and r.DEL_FLAG='0'
+        LEFT JOIN epdc_volunteer_org o on r.VOLUNTEER_ORG_ID=o.id and o.del_flag='0'
+        where v.DEL_FLAG='0'
+			  and v.id=#{id}
+    </select>
+    <select id="selectEntityById" resultType="com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity">
+        SELECT *
+        FROM
+            epdc_volunteer
+        WHERE
+            id = #{id}
+            AND del_flag = '0'
+    </select>
 
 
 </mapper>

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

@@ -35,6 +35,12 @@
                 </if>
         order by create_date desc
     </select>
+    <select id="getVolunteerOrgList" resultType="com.elink.esua.epdc.volunteer.VolunteerOrgDTO">
+        select * from epdc_volunteer_org
+        where del_flag='0'
+              AND is_open='0'
+        order by sort ASC
+    </select>
 
 
 </mapper>