From e29f3ad03ab04eb43db6b466dcc5a68c38b8cd45 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 16 Nov 2021 17:42:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E5=85=88=E9=94=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/VolunteerPioneerDTO.java    |  5 +++
 .../controller/VolunteerInfoController.java   | 13 +++++++
 .../VolunteerPioneerController.java           | 19 ++++++++--
 .../elink/esua/epdc/dao/VolunteerInfoDao.java |  9 +++++
 .../esua/epdc/dao/VolunteerPioneerDao.java    | 19 ++++++++--
 .../epdc/service/VolunteerInfoService.java    |  9 +++++
 .../epdc/service/VolunteerPioneerService.java | 12 ++++++-
 .../impl/VolunteerInfoServiceImpl.java        |  8 +++++
 .../impl/VolunteerPioneerServiceImpl.java     | 35 ++++++++++++++-----
 .../resources/mapper/VolunteerInfoDao.xml     | 14 ++++++++
 .../resources/mapper/VolunteerPioneerDao.xml  | 19 +++++++++-
 11 files changed, 147 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerPioneerDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerPioneerDTO.java
index fb20793e..2eab79f5 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerPioneerDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerPioneerDTO.java
@@ -39,6 +39,11 @@ public class VolunteerPioneerDTO implements Serializable {
      */
 	private String id;
 
+    /**
+     * 姓名
+     */
+    private String realName;
+
     /**
      * 志愿者id
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
index 04654fab..d35ec90d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
@@ -271,5 +271,18 @@ public class VolunteerInfoController {
         return volunteerInfoService.handleVolunteerPoints(formDTO);
     }
 
+    /**
+    * @describe: 志愿先锋模块获取志愿者列表
+    * @author wangtong
+    * @date 2021/11/16 16:19
+    * @params [params]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.VolunteerInfoDTO>>
+    */
+    @GetMapping("getVolunteerListForPionner")
+    public Result<PageData<VolunteerInfoDTO>> getVolunteerListForPionner(@RequestParam Map<String, Object> params) {
+        PageData<VolunteerInfoDTO> page = volunteerInfoService.getVolunteerListForPionner(params);
+        return new Result<PageData<VolunteerInfoDTO>>().ok(page);
+    }
+
 
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerPioneerController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerPioneerController.java
index bc150f27..d53c6737 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerPioneerController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerPioneerController.java
@@ -23,8 +23,9 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 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.UpdateGroup;
 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.dto.NoticeDTO;
 import com.elink.esua.epdc.dto.VolunteerPioneerDTO;
 import com.elink.esua.epdc.excel.VolunteerPioneerExcel;
 import com.elink.esua.epdc.service.VolunteerPioneerService;
@@ -45,7 +46,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("volunteerpioneer")
 public class VolunteerPioneerController {
-    
+
     @Autowired
     private VolunteerPioneerService volunteerPioneerService;
 
@@ -91,4 +92,16 @@ public class VolunteerPioneerController {
         ExcelUtils.exportExcelToTarget(response, null, list, VolunteerPioneerExcel.class);
     }
 
-}
\ No newline at end of file
+    /**
+    * @describe: 志愿先锋 上下架
+    * @author wangtong
+    * @date 2021/11/16 17:36
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PutMapping("handleIsUpDown")
+    public Result handleIsUpDown(@RequestBody VolunteerPioneerDTO dto) {
+        return volunteerPioneerService.handleIsUpDown(dto);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
index 2888fcf5..db20d2c7 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
@@ -177,4 +177,13 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
      * @return java.util.List<com.elink.esua.epdc.dto.VolunteerInfoDTO>
      **/
     List<VolunteerInfoDTO> selectListOfOrganizationInfo(String deptId);
+
+    /**
+     * @describe: 志愿先锋模块获取志愿者列表
+     * @author wangtong
+     * @date 2021/11/16 16:19
+     * @params [params]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.VolunteerInfoDTO>>
+     */
+    List<VolunteerInfoEntity> getUserListForVolunteerOrg(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerPioneerDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerPioneerDao.java
index 7ac5c1ee..039d46ca 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerPioneerDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerPioneerDao.java
@@ -18,8 +18,13 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.VolunteerPioneerDTO;
 import com.elink.esua.epdc.entity.VolunteerPioneerEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 志愿先锋
@@ -29,5 +34,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface VolunteerPioneerDao extends BaseDao<VolunteerPioneerEntity> {
-	
-}
\ No newline at end of file
+
+    List<VolunteerPioneerDTO> getPageList(Map<String, Object> params);
+
+    /**
+    * @describe: 通过id查询详情
+    * @author wangtong
+    * @date 2021/11/16 17:12
+    * @params [id]
+    * @return com.elink.esua.epdc.dto.VolunteerPioneerDTO
+    */
+    VolunteerPioneerDTO selectDetailById(@Param("id") String id);
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
index a781fb83..d3da3a84 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
@@ -270,4 +270,13 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @Date 2019/12/13 15:10
      **/
     Result handleVolunteerPoints(EpdcVolunteerPointsFormDTO formDTO);
+
+    /**
+     * @describe: 志愿先锋模块获取志愿者列表
+     * @author wangtong
+     * @date 2021/11/16 16:19
+     * @params [params]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.VolunteerInfoDTO>>
+     */
+    PageData<VolunteerInfoDTO> getVolunteerListForPionner(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerPioneerService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerPioneerService.java
index d166d6a3..a7873839 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerPioneerService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerPioneerService.java
@@ -19,6 +19,7 @@ package com.elink.esua.epdc.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.dto.VolunteerPioneerDTO;
 import com.elink.esua.epdc.entity.VolunteerPioneerEntity;
 
@@ -92,4 +93,13 @@ public interface VolunteerPioneerService extends BaseService<VolunteerPioneerEnt
      * @date 2021-11-16
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+
+    /**
+     * @describe: 志愿先锋 上下架
+     * @author wangtong
+     * @date 2021/11/16 17:36
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result handleIsUpDown(VolunteerPioneerDTO dto);
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
index b202df51..1f1d97f4 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
@@ -517,6 +517,14 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return new Result();
     }
 
+    @Override
+    public PageData<VolunteerInfoDTO> getVolunteerListForPionner(Map<String, Object> params) {
+        IPage<VolunteerInfoEntity> page = getPage(params);
+        //查询
+        List<VolunteerInfoEntity> list = baseDao.getUserListForVolunteerOrg(params);
+        return getPageData(list, page.getTotal(), VolunteerInfoDTO.class);
+    }
+
     /**
      * 组织机构信息处理
      *
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerPioneerServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerPioneerServiceImpl.java
index 87e8cf71..4a470b50 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerPioneerServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerPioneerServiceImpl.java
@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 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.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.VolunteerPioneerDao;
 import com.elink.esua.epdc.dto.VolunteerPioneerDTO;
 import com.elink.esua.epdc.entity.VolunteerPioneerEntity;
@@ -51,11 +52,14 @@ public class VolunteerPioneerServiceImpl extends BaseServiceImpl<VolunteerPionee
 
     @Override
     public PageData<VolunteerPioneerDTO> page(Map<String, Object> params) {
-        IPage<VolunteerPioneerEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, VolunteerPioneerDTO.class);
+//        IPage<VolunteerPioneerEntity> page = baseDao.selectPage(
+//                getPage(params, FieldConstant.CREATED_TIME, false),
+//                getWrapper(params)
+//        );
+//        return getPageData(page, VolunteerPioneerDTO.class);
+        IPage<VolunteerPioneerDTO> page = getPage(params);
+        List<VolunteerPioneerDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
@@ -76,14 +80,14 @@ public class VolunteerPioneerServiceImpl extends BaseServiceImpl<VolunteerPionee
 
     @Override
     public VolunteerPioneerDTO get(String id) {
-        VolunteerPioneerEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, VolunteerPioneerDTO.class);
+        return baseDao.selectDetailById(id);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(VolunteerPioneerDTO dto) {
         VolunteerPioneerEntity entity = ConvertUtils.sourceToTarget(dto, VolunteerPioneerEntity.class);
+        entity.setBannerFlag("0");
         insert(entity);
     }
 
@@ -101,4 +105,19 @@ public class VolunteerPioneerServiceImpl extends BaseServiceImpl<VolunteerPionee
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+    @Override
+    public Result handleIsUpDown(VolunteerPioneerDTO dto) {
+        VolunteerPioneerEntity entity = selectById(dto.getId());
+        if (null == entity) {
+            return new Result().error("未查到相关数据");
+        }
+        if ("0".equals(dto.getBannerFlag())) {
+            entity.setBannerFlag("1");
+        } else {
+            entity.setBannerFlag("0");
+        }
+        updateById(entity);
+        return new Result().ok("");
+    }
+
+}
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 9ccf20a9..7cc0f010 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
@@ -338,4 +338,18 @@
         WHERE
             FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
     </select>
+    <select id="getUserListForVolunteerOrg" resultType="com.elink.esua.epdc.entity.VolunteerInfoEntity">
+        select vi.*
+        from epdc_volunteer_info vi
+        where vi.DEL_FLAG='0'
+            and (vi.AUDIT_STATUS ='0' or vi.AUDIT_STATUS='1')
+            and vi.id not in (select VOLUNTEER_ID from epdc_volunteer_pioneer where DEL_FLAG='0')
+            <if test="realName != null and realName != ''">
+                and vi.REAL_NAME like '%${realName}%'
+            </if>
+            <if test="mobile != null and mobile != ''">
+                and vi.MOBILE like '%${mobile}%'
+            </if>
+        order by vi.CREATED_TIME desc
+    </select>
 </mapper>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerPioneerDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerPioneerDao.xml
index 441bfdaa..c194059e 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerPioneerDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerPioneerDao.xml
@@ -17,6 +17,23 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
+    <select id="getPageList" resultType="com.elink.esua.epdc.dto.VolunteerPioneerDTO">
+        SELECT v.REAL_NAME,vp.*
+        FROM `epdc_volunteer_pioneer` vp
+        inner join epdc_volunteer_info v on v.id=vp.VOLUNTEER_ID and v.DEL_FLAG='0'
+        where  vp.DEL_FLAG='0'
+        <if test="realName != null and realName != ''">
+            and v.REAL_NAME like '%${realName}%'
+        </if>
+        order by  vp.sort asc
+    </select>
+    <select id="selectDetailById" resultType="com.elink.esua.epdc.dto.VolunteerPioneerDTO">
+        SELECT v.REAL_NAME,vp.*
+        FROM `epdc_volunteer_pioneer` vp
+        inner join epdc_volunteer_info v on v.id=vp.VOLUNTEER_ID and v.DEL_FLAG='0'
+        where vp.DEL_FLAG='0'
+              and vp.id=#{id}
+    </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>