居民端相关接口返回用户党员标识

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppVolunteerRankFormDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/7/5 14:33
+ */
+@Data
+public class EpdcAppVolunteerRankFormDTO implements Serializable {
+    private static final long serialVersionUID = -9051392365709037682L;
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java

@@ -2,6 +2,8 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppVolunteerRankDTO;
 import com.elink.esua.epdc.service.AppVolunteerRankService;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
@@ -32,8 +34,9 @@ public class ApiVolunteerRankController {
      * @date 2019/12/13 14:41
      */
     @GetMapping("leaderboard")
-    public Result<List<EpdcAppVolunteerRankDTO>> leaderboard() {
-        Result<List<EpdcVolunteerRankDTO>> data = appVolunteerRankService.leaderboard();
+    public Result<List<EpdcAppVolunteerRankDTO>> leaderboard(EpdcAppVolunteerRankFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        Result<List<EpdcVolunteerRankDTO>> data = appVolunteerRankService.leaderboard(formDto);
         List<EpdcAppVolunteerRankDTO> list2 = ConvertUtils.sourceToTarget(data.getData(), EpdcAppVolunteerRankDTO.class);
         return new Result().ok(list2);
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.activity.result.ActApplyDetailResultDTO;
 import com.elink.esua.epdc.activity.result.ActApplyRecordResultDTO;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO;
 import com.elink.esua.epdc.feign.fallback.AppVolunteerRankFeignClientFallback;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -31,7 +32,7 @@ public interface AppVolunteerRankFeignClient {
      * @return
      */
     @GetMapping("heart/volunteer/leaderboard")
-    Result<List<EpdcVolunteerRankDTO>> leaderboard();
+    Result<List<EpdcVolunteerRankDTO>> leaderboard(EpdcAppVolunteerRankFormDTO formDto);
 
     /**
      * @Description   我要申请

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java

@@ -7,6 +7,7 @@ import com.elink.esua.epdc.activity.result.ActApplyRecordResultDTO;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO;
 import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
 import org.springframework.stereotype.Component;
@@ -21,7 +22,7 @@ import java.util.List;
 public class AppVolunteerRankFeignClientFallback implements AppVolunteerRankFeignClient {
 
     @Override
-    public Result<List<EpdcVolunteerRankDTO>> leaderboard() {
+    public Result<List<EpdcVolunteerRankDTO>> leaderboard(EpdcAppVolunteerRankFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "leaderboard");
     }
 

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

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.activity.result.ActApplyDetailResultDTO;
 import com.elink.esua.epdc.activity.result.ActApplyRecordResultDTO;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
 
 import java.util.List;
@@ -21,7 +22,7 @@ public interface AppVolunteerRankService {
      * @Author wanggongfeng
      * @return
      */
-    Result<List<EpdcVolunteerRankDTO>> leaderboard();
+    Result<List<EpdcVolunteerRankDTO>> leaderboard(EpdcAppVolunteerRankFormDTO formDto);
 
     /**
      * @Description  我要申请

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

@@ -7,6 +7,7 @@ import com.elink.esua.epdc.activity.result.ActApplyRecordResultDTO;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient;
 import com.elink.esua.epdc.service.AppVolunteerRankService;
@@ -36,8 +37,8 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService {
      * @return
      */
     @Override
-    public Result<List<EpdcVolunteerRankDTO>> leaderboard() {
-        Result<List<EpdcVolunteerRankDTO>> dataResult = appVolunteerRankFeignClient.leaderboard();
+    public Result<List<EpdcVolunteerRankDTO>> leaderboard(EpdcAppVolunteerRankFormDTO formDto) {
+        Result<List<EpdcVolunteerRankDTO>> dataResult = appVolunteerRankFeignClient.leaderboard(formDto);
         return dataResult;
     }
 

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/AppVolunteerRankController.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.volunteer.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerRankService;
 import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +37,7 @@ import java.util.List;
 @RestController
 @RequestMapping("volunteer")
 public class AppVolunteerRankController {
-    
+
     @Autowired
     private VolunteerRankService volunteerRankService;
 
@@ -45,8 +46,8 @@ public class AppVolunteerRankController {
      * @return
      */
     @GetMapping(value="leaderboard")
-    public Result<List<EpdcVolunteerRankDTO>> leaderboard() {
-        List<EpdcVolunteerRankDTO> list = volunteerRankService.leaderboard();
+    public Result<List<EpdcVolunteerRankDTO>> leaderboard(@RequestBody EpdcAppVolunteerRankFormDTO formDto) {
+        List<EpdcVolunteerRankDTO> list = volunteerRankService.leaderboard(formDto);
         return new Result().ok(list);
     }
 
@@ -62,4 +63,4 @@ public class AppVolunteerRankController {
 
 
 
-}
+}

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

@@ -18,9 +18,11 @@
 package com.elink.esua.epdc.modules.volunteer.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+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;
 
@@ -37,7 +39,7 @@ public interface VolunteerRankDao extends BaseDao<VolunteerRankEntity> {
      * @Author wanggongfeng
      * @return
      */
-    List<EpdcVolunteerRankDTO> leaderboard();
+    List<EpdcVolunteerRankDTO> leaderboard(@Param("formDto") EpdcAppVolunteerRankFormDTO formDto);
     /**
      * @Description  清空排行榜数据
      * @Author songyunpeng
@@ -46,4 +48,4 @@ public interface VolunteerRankDao extends BaseDao<VolunteerRankEntity> {
      * @return void
      **/
     void clearGenerateRankingList();
-}
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerRankService.java

@@ -21,6 +21,7 @@ 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.epdc.result.EpdcGetVolunteerRankDTO;
+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 com.elink.esua.epdc.volunteer.VolunteerRankDTO;
@@ -101,7 +102,7 @@ public interface VolunteerRankService extends BaseService<VolunteerRankEntity> {
      * @Author wanggongfeng
      * @return
      */
-    List<EpdcVolunteerRankDTO> leaderboard();
+    List<EpdcVolunteerRankDTO> leaderboard(EpdcAppVolunteerRankFormDTO formDto);
 
     /**
      * 生成排行榜
@@ -111,4 +112,4 @@ public interface VolunteerRankService extends BaseService<VolunteerRankEntity> {
     Result generateRankingList(List<EpdcGetVolunteerRankDTO> list);
 
 
-}
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java

@@ -21,10 +21,12 @@ 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.constant.NumConstant;
 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.dto.epdc.result.EpdcGetVolunteerRankDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerRankDao;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerRankEntity;
 import com.elink.esua.epdc.modules.volunteer.redis.VolunteerRankRedis;
@@ -110,9 +112,10 @@ public class VolunteerRankServiceImpl extends BaseServiceImpl<VolunteerRankDao,
      * @return
      */
     @Override
-    public List<EpdcVolunteerRankDTO> leaderboard(){
-        List<EpdcVolunteerRankDTO> list = baseDao.leaderboard();
-        return list;
+    public List<EpdcVolunteerRankDTO> leaderboard(EpdcAppVolunteerRankFormDTO formDto){
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        return baseDao.leaderboard(formDto);
     }
 
     /**
@@ -135,4 +138,4 @@ public class VolunteerRankServiceImpl extends BaseServiceImpl<VolunteerRankDao,
         return new Result().error("更新排名失败");
     }
 
-}
+}

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

@@ -26,11 +26,12 @@
     <select id="leaderboard" resultType="com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO">
         select substr(NICKNAME,locate('-',NICKNAME)+1) as NICKNAME,FACE_IMG,PARTY_FLAG,KINDNESS_TIME,PARTICIPATION_NUM,SORT
         from epdc_volunteer_rank
-        where GENERATE_DATE = DATE_FORMAT(NOW(),'%Y-%m-%d')
+        where DEL_FLAG = '0' and SHOW_FLAG = '1'
         order by sort
+        LIMIT #{formDto.pageIndex},#{formDto.pageSize}
     </select>
     <delete id="clearGenerateRankingList">
         delete from epdc_volunteer_rank
     </delete>
 
-</mapper>
+</mapper>

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/AllUsers.java

@@ -48,5 +48,9 @@ public class AllUsers implements Serializable {
      */
     private String bannedFlag;
 
+    /**
+     * 党员标识：0-否，1-是
+     */
+    private String partyMember;
 
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/CurrentUser.java

@@ -48,4 +48,9 @@ public class CurrentUser  implements Serializable {
      */
     private String bannedFlag;
 
+    /**
+     * 党员标识：0-否，1-是
+     */
+    private String partyMember;
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyGroupOfficialsResultDTO.java

@@ -69,4 +69,9 @@ public class PartyGroupOfficialsResultDTO implements Serializable {
      */
     private String duty;
 
-}
+    /**
+     * 党员标识：0-否，1-是
+     */
+    private String partyFlag;
+
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -12,11 +12,13 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserMobilePartyFlagResultDTO;
 import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -29,7 +31,7 @@ import java.util.List;
  */
 @FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
 public interface UserFeignClient {
-    
+
     /**
      * @Description  获取指定街道下用户信息（未删除，状态不为0）
      * @Author songyunpeng
@@ -41,7 +43,7 @@ public interface UserFeignClient {
     Result<List<UserDTO>> getUserList(@PathVariable("deptId") Long deptId);
 
     /**
-     * @Description  查询用户基础信息 
+     * @Description  查询用户基础信息
      * @Author songyunpeng
      * @Date  2020/6/1
      * @Param [userId]
@@ -59,4 +61,15 @@ public interface UserFeignClient {
      **/
     @GetMapping(value = "app-user/usergrid/getUserFirstScanGird/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<UserGridRelationDTO> getUserFirstScanGird(@PathVariable("userId") String userId);
+
+    /**
+     * 根据手机号关联用户表获取党员身份标识
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.PartyGroupOfficialsResultDTO>>
+     * @author liuchuang
+     * @since 2021/7/5 10:01
+     */
+    @GetMapping(value = "app-user/epdc-app/user/getPartyFlagByMobile", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcUserMobilePartyFlagResultDTO>> getOfficialsPartyFlagByMobile(@RequestBody List<String> formDto);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -13,6 +13,8 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserMobilePartyFlagResultDTO;
+import com.elink.esua.epdc.dto.result.PartyGroupOfficialsResultDTO;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -43,4 +45,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<UserGridRelationDTO> getUserFirstScanGird(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserFirstScanGird", userId);
     }
+
+    @Override
+    public Result<List<EpdcUserMobilePartyFlagResultDTO>> getOfficialsPartyFlagByMobile(List<String> formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getOfficialsPartyFlagByMobile", formDto);
+    }
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupOfficialsServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 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;
@@ -31,10 +32,12 @@ import com.elink.esua.epdc.dao.PartyGroupOfficialsDao;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.PartyGroupOfficialsDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserMobilePartyFlagResultDTO;
 import com.elink.esua.epdc.dto.form.PartyGroupOfficialsFormDTO;
 import com.elink.esua.epdc.dto.result.PartyGroupOfficialsResultDTO;
 import com.elink.esua.epdc.entity.PartyGroupOfficialsEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.redis.PartyGroupOfficialsRedis;
 import com.elink.esua.epdc.service.PartyGroupOfficialsService;
 import org.apache.commons.lang3.StringUtils;
@@ -46,9 +49,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
- * 网格长（楼长）表 
+ * 网格长（楼长）表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2020-05-29
@@ -62,6 +66,9 @@ public class PartyGroupOfficialsServiceImpl extends BaseServiceImpl<PartyGroupOf
     @Autowired
     private AdminFeignClient adminFeignClient;
 
+    @Autowired
+    private UserFeignClient userFeignClient;
+
     @Override
     public PageData<PartyGroupOfficialsDTO> page(Map<String, Object> params) {
         IPage<PartyGroupOfficialsEntity> page = baseDao.selectPage(
@@ -165,7 +172,21 @@ public class PartyGroupOfficialsServiceImpl extends BaseServiceImpl<PartyGroupOf
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
         formDto.setPageIndex(pageIndex);
         List<PartyGroupOfficialsResultDTO> data = baseDao.selectListOfPartyGroupOfficials(formDto);
+        // 根据手机号关联用户表获取党员身份标识
+        List<String> officialMobiles = data.stream().map(PartyGroupOfficialsResultDTO::getMobile).collect(Collectors.toList());
+        Result<List<EpdcUserMobilePartyFlagResultDTO>> result = userFeignClient.getOfficialsPartyFlagByMobile(officialMobiles);
+        if (result.success() && CollectionUtil.isNotEmpty(result.getData())) {
+            data = data.stream()
+                    .map(officialsResultDto -> result.getData().stream()
+                            .filter(partyFlagResultDto -> officialsResultDto.getMobile().equals(partyFlagResultDto.getMobile()))
+                            .findFirst()
+                            .map(partyFlagResultDto -> {
+                                officialsResultDto.setPartyFlag(partyFlagResultDto.getPartyFlag());
+                                return officialsResultDto;
+                            }).orElse(officialsResultDto))
+                    .collect(Collectors.toList());
+        }
         return new Result<List<PartyGroupOfficialsResultDTO>>().ok(data);
     }
 
-}
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml

@@ -73,11 +73,12 @@
            MOTTO,
            FACE_IMG,
            DUTY,
-           AREA_RESPONSIBILITY
+           AREA_RESPONSIBILITY,
+           '0' as partyFlag
         from epdc_party_group_officials
         where DEL_FLAG ='0' and PARTY_GROUP_ID =  #{partyGroupId}
          order by SORT, CREATED_TIME desc
          LIMIT #{pageIndex},#{pageSize}
     </select>
 
-</mapper>
+</mapper>

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml

@@ -169,7 +169,8 @@
         then 4
         else 0
         END )) as bannedFlag,
-        thisCommunity
+        thisCommunity,
+        PARTY_MEMBER
         from (select
         epug.ID,
         epug.PARTY_GROUP_ID,
@@ -219,7 +220,8 @@
         then 4
         else 0
         END )) as bannedFlag,
-        thisCommunity
+        thisCommunity,
+        PARTY_MEMBER
         from (
         select
         epug.ID,
@@ -265,4 +267,4 @@
     <update id="updateGridByDeptId">
         UPDATE epdc_party_user_group SET GRID = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId}
     </update>
-</mapper>
+</mapper>

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppPointsController.java

@@ -112,4 +112,9 @@ public class EpdcAppPointsController {
 
         return new Result<EpdcVerificationLogsResultDTO>().ok(data);
     }
+
+    @GetMapping("test")
+    public Result test() {
+        return pointsLogsService.test();
+    }
 }

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java

@@ -236,11 +236,13 @@ public interface PointsLogsService extends BaseService<PointsLogsEntity> {
      */
     EpdcVerificationLogsResultDTO listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto);
     /**
-     * @Description  更新过时的积分记录 
+     * @Description  更新过时的积分记录
      * @Author songyunpeng
      * @Date  2021/4/8
      * @Param [formDto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result maBindUnIdLogs(PointsLogsBindUnIdDTO formDto);
+
+    Result test();
 }

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java

@@ -48,6 +48,7 @@ import com.elink.esua.epdc.mq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.redis.PointsLogsRedis;
 import com.elink.esua.epdc.service.PointsBehaviorService;
 import com.elink.esua.epdc.service.PointsLogsService;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -551,4 +552,40 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
 
         return pointsLogsEntity;
     }
+
+    @Override
+    @GlobalTransactional
+    public Result test() {
+        insertLogs();
+        updateUserPoints();
+
+        return null;
+    }
+
+    private void insertLogs() {
+        PointsLogsEntity entity = new PointsLogsEntity();
+        entity.setUserId("f093eaa6b6ace23b631e2e61e02b9e58");
+        entity.setNickname("南宁路-刘先生");
+        entity.setRuleCode("123");
+        entity.setBehaviorCode("123");
+        entity.setOperationType("1");
+        entity.setPoints(10);
+        entity.setOperationDesc("123");
+        entity.setOperationTime(new Date());
+        entity.setOperationMode("123");
+        entity.setDelFlag("0");
+        entity.setCreatedBy("123");
+        entity.setCreatedTime(new Date());
+        entity.setUpdatedBy("123");
+        entity.setUpdatedTime(new Date());
+        insert(entity);
+    }
+
+    private void updateUserPoints() {
+        EpdcUserPointsFormDTO dto = new EpdcUserPointsFormDTO();
+        dto.setOperationType("1");
+        dto.setPoints(10);
+        dto.setUserId("f093eaa6b6ace23b631e2e61e02b9e58");
+        usersFeignClient.updateUserPoints(dto);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java

@@ -33,4 +33,9 @@ public class EpdcAppVolunteerListResultDTO implements Serializable {
      * 志愿者签名
      */
     private String volunteerSignature;
+
+    /**
+     * 党员标识：0-否，1-是
+     */
+    private String partyFlag;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserMobilePartyFlagResultDTO.java

@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/7/5 10:06
+ */
+@Data
+public class EpdcUserMobilePartyFlagResultDTO implements Serializable {
+    private static final long serialVersionUID = -8464797959237738864L;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 党员标识：0-否，1-是
+     */
+    private String partyFlag;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -455,4 +455,19 @@ public class EpdcAppUserController {
     public Result<Long> getUserGridIdByUserId(@PathVariable String userId){
         return userService.getUserGridIdByUserId(userId);
     }
+
+    /**
+     * 根据手机号获取党员身份标识
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<EpdcUserMobilePartyFlagResultDTO>>
+     * @author liuchuang
+     * @since 2021/7/5 10:04
+     */
+    @PostMapping("getPartyFlagByMobile")
+    public Result<List<EpdcUserMobilePartyFlagResultDTO>> getPartyFlagByMobile(@RequestBody List<String> formDto) {
+        List<EpdcUserMobilePartyFlagResultDTO> data = userService.listOfUserPartyFlagByMobiles(formDto);
+
+        return new Result<List<EpdcUserMobilePartyFlagResultDTO>>().ok(data);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -321,4 +321,14 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @return void
      **/
     void resetPoints();
+
+    /**
+     * 根据手机号获取党员身份标识
+     *
+     * @param formDto
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserMobilePartyFlagResultDTO>
+     * @author liuchuang
+     * @since 2021/7/5 10:11
+     */
+    List<EpdcUserMobilePartyFlagResultDTO> selectListOfUserPartyFlagByMobiles(@Param("formDto") List<String> formDto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -418,7 +418,7 @@ public interface UserService extends BaseService<UserEntity> {
      **/
     Result<Long> getUserGridIdByUserId(String userId);
     /**
-     * @Description  检查完善信息 合并重复用户 
+     * @Description  检查完善信息 合并重复用户
      * @Author songyunpeng
      * @Date  2021/4/9
      * @Param [checkRepeatUserFormDTO]
@@ -426,7 +426,7 @@ public interface UserService extends BaseService<UserEntity> {
      **/
     Result<String> checkRepeatUser(CheckRepeatUserFormDTO checkRepeatUserFormDTO);
     /**
-     * @Description  志愿者合并用户 
+     * @Description  志愿者合并用户
      * @Author songyunpeng
      * @Date  2021/4/15
      * @Param [formDTO]
@@ -434,11 +434,21 @@ public interface UserService extends BaseService<UserEntity> {
      **/
     Result<UserDTO> combineVolunteerUser(CombineVolunteerUserFormDTO formDTO);
     /**
-     * @Description  季度重置积分 -  定时任务使用 
+     * @Description  季度重置积分 -  定时任务使用
      * @Author songyunpeng
      * @Date  2021/4/19
      * @Param []
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result resetPoints();
+
+    /**
+     * 根据手机号获取党员身份标识
+     *
+     * @param formDto
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserMobilePartyFlagResultDTO>
+     * @author liuchuang
+     * @since 2021/7/5 10:11
+     */
+    List<EpdcUserMobilePartyFlagResultDTO> listOfUserPartyFlagByMobiles(List<String> formDto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -1554,4 +1555,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         baseDao.resetPoints();
         return new Result();
     }
+
+    @Override
+    public List<EpdcUserMobilePartyFlagResultDTO> listOfUserPartyFlagByMobiles(List<String> formDto) {
+        if (CollectionUtil.isEmpty(formDto)) {
+            return null;
+        }
+        return baseDao.selectListOfUserPartyFlagByMobiles(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -991,4 +991,18 @@
         LEFT JOIN ( select * from (select * from epdc_user_grid_relation order by CREATED_TIME)t group by t.USER_ID) ug ON u.ID = ug.USER_ID
         where u.DEL_FLAG = '0' and u.ID = #{userId}
     </select>
+
+    <select id="selectListOfUserPartyFlagByMobiles" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcUserMobilePartyFlagResultDTO">
+        SELECT
+            MOBILE,
+            PARTY_FLAG
+        FROM
+            epdc_user
+        WHERE
+            DEL_FLAG = '0'
+            AND MOBILE IN
+        <foreach item="mobile" collection="formDto" open="(" separator="," close=")">
+            #{mobile}
+        </foreach>
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -225,10 +225,12 @@
             v.ID id,
             v.VOLUNTEER_NICKNAME nickname,
 			v.VOLUNTEER_FACE_IMG faceImg,
-			v.VOLUNTEER_SIGNATURE volunteerSignature
+			v.VOLUNTEER_SIGNATURE volunteerSignature,
+            u.party_flag
         FROM
             epdc_volunteer_info v
         LEFT JOIN epdc_volunteer_tag_relation vt ON vt.VOLUNTEER_ID = v.ID
+        LEFT JOIN epdc_user u on u.id = v.user_id
         AND vt.DEL_FLAG = '0'
         WHERE
           v.DEL_FLAG = 0