Revert "志愿者功能 bug修改"

This reverts commit 719cc9f7

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java

@@ -63,19 +63,6 @@ public class EpdcAppVolunteerRankDTO implements Serializable {
      */
 	private Integer participationNum;
 
-    /**
-     * 志愿者部门ID
-     */
-    private String volunteerDeptId;
-    /**
-     * 志愿者公益积分
-     */
-    private Integer volunteerPoints;
-    /**
-     * 志愿公益累计积分
-     */
-    private Integer volunteerPointsTotal;
-
 
 
-}
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -948,7 +948,6 @@ public class AppUserServiceImpl implements AppUserService {
                 dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature());
                 dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce());
                 dto.setVolunteerTagId(volunteerInfoDTO.getData().getTagId());
-                dto.setVolunteerDeptId(volunteerInfoDTO.getData().getVolunteerDeptId());
                 // 如果用户表的身份证号为空，则尝试使用志愿者表中的身份证
                 if (null == dto.getIdentityNo() || "".equals(dto.getIdentityNo())) {
                     dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo());

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java

@@ -107,7 +107,7 @@ public interface UserInfoFeignClient {
      * @Param [formDTO]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
      **/
-    @PostMapping(value = "app-user/volunteerinfo/handleVolunteerPoints", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "app-user/user/handleVolunteerPoints", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result handleVolunteerPoints(EpdcVolunteerPointsFormDTO formDTO);
 
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerRankEntity;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -38,7 +39,7 @@ public interface VolunteerRankDao extends BaseDao<VolunteerRankEntity> {
      * @Author wanggongfeng
      * @return
      */
-    List<EpdcVolunteerRankDTO> leaderboard(EpdcAppVolunteerRankFormDTO formDto);
+    List<EpdcVolunteerRankDTO> leaderboard(@Param("formDto") EpdcAppVolunteerRankFormDTO formDto);
     /**
      * @Description  清空排行榜数据
      * @Author songyunpeng

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml

@@ -37,7 +37,7 @@
         <if test='type != "" and type != null and type=="2"'>
             order by VOLUNTEER_POINTS desc
         </if>
-        LIMIT #{pageIndex},#{pageSize}
+        LIMIT #{formDto.pageIndex},#{formDto.pageSize}
     </select>
     <delete id="clearGenerateRankingList">
         delete from epdc_volunteer_rank

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java

@@ -127,7 +127,7 @@ public class EpdcCompleteVolunteerInfoV2FormDTO implements Serializable {
     /**
      * 志愿者部门
      */
-    private String volunteerDeptId;
+    private String volunteerDept;
 
 }