From 9daa7bab9d2aaff5277e2f794a1d8cf2603bf4da Mon Sep 17 00:00:00 2001
From: liuchuang <liuchuang@elink-cn.com>
Date: Wed, 14 Jul 2021 16:18:11 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E5=BF=97=E6=84=BF=E8=80=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=89=80=E5=B1=9E=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=92=8C=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/VolunteerInfoDTO.java |  5 +++++
 .../epdc/controller/VolunteerDeptController.java  | 15 +++++++++++++++
 .../main/resources/mapper/VolunteerInfoDao.xml    |  7 ++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java
index 28f7b0ed..69c1ce96 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java
@@ -227,4 +227,9 @@ public class VolunteerInfoDTO implements Serializable {
      * 志愿者部门ID
      */
     private String volunteerDeptId;
+
+    /**
+     * 志愿者部门名称
+     */
+    private String DeptName;
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerDeptController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerDeptController.java
index 023000eb..6a8aa38a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerDeptController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerDeptController.java
@@ -27,10 +27,12 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.VolunteerDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.VolunteerDeptModifyFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcVolunteerDeptResultDTO;
 import com.elink.esua.epdc.service.VolunteerDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -83,4 +85,17 @@ public class VolunteerDeptController {
         return new Result();
     }
 
+    /**
+     * 部门列表
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcVolunteerDeptResultDTO>>
+     * @author liuchuang
+     * @since 2021/7/14 15:58
+     */
+    @GetMapping("volunteerdepts")
+    public Result<List<EpdcVolunteerDeptResultDTO>> volunteerDepts() {
+        List<EpdcVolunteerDeptResultDTO> data = volunteerDeptService.listOfVolunteerDepts();
+        return new Result<List<EpdcVolunteerDeptResultDTO>>().ok(data);
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
index ce922dff..76288ab7 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -56,9 +56,11 @@
                 date_format(v.REGIST_TIME,'%Y-%m-%d %H:%i:%S') registTimeString,
                 v.REGIST_TIME registTime,
 				v.AUDIT_STATUS auditStatus,
-                v.VOLUNTEER_ORDER volunteerOrder
+                v.VOLUNTEER_ORDER volunteerOrder,
+                d.dept_name
         FROM
             epdc_volunteer_info v
+            left join epdc_volunteer_dept d on d.id = v.volunteer_dept_id
             left join epdc_user u on v.USER_ID = u.ID and u.del_flag = '0'
         where v.del_flag = '0' and u.id is not null
         <if test="realName !='' and realName.trim() != null">
@@ -73,6 +75,9 @@
         <if test="deptId !='' and deptId != null">
             and v.ALL_DEPT_IDS like concat('%',#{deptId},'%')
         </if>
+        <if test="volunteerDeptId !='' and volunteerDeptId != null">
+            and v.volunteer_dept_id = #{volunteerDeptId}
+        </if>
         ORDER BY v.KINDNESS_TIME desc,u.POINTS DESC
     </select>