项目列表接口修改

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

@@ -446,4 +446,15 @@ public interface UserFeignClient {
      */
     @PostMapping("/app-user/epdc-app/user/StandarBearerApply/{userId}/{gridId}")
     Result StandarBearerApply(@PathVariable("userId") String userId, @PathVariable("gridId") Long gridId);
+
+    /**
+     * 根据标签过滤用户
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/4/28 15:15
+     */
+    @PostMapping("/app-user/epdc-app/user/filteridlist/bytag")
+    Result<List<String>> filterUserIdListByTag(@RequestBody EpdcUserMatchTagFormDTO formDto);
 }

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

@@ -226,4 +226,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result StandarBearerApply(String userId, Long gridId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "standarBearerApply", userId, gridId);
     }
+
+    @Override
+    public Result<List<String>> filterUserIdListByTag(EpdcUserMatchTagFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "filterUserIdListByTag", formDto);
+    }
 }

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

@@ -1,7 +1,10 @@
 package com.elink.esua.epdc.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
+import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
+import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.form.PointLogFormDTO;
 import com.elink.esua.epdc.dto.item.form.*;
@@ -11,15 +14,20 @@ import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
 import com.elink.esua.epdc.feign.ItemFeignClient;
 import com.elink.esua.epdc.feign.PointsFeignClient;
+import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.service.ItemService;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserMatchTagFormDTO;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * 项目模块
+ *
  * @Author LC
  * @Date 2019/9/9 16:34
  */
@@ -32,13 +40,38 @@ public class ItemServiceImpl implements ItemService {
     @Autowired
     private PointsFeignClient pointFeignClient;
 
+    @Autowired
+    private UserFeignClient userFeignClient;
+
     @Override
     public Result<List<ItemResultDTO>> listItems(TokenDto userDetail, ItemFormDTO formDto) {
         if (null == userDetail) {
             return new Result<List<ItemResultDTO>>().error("获取用户信息失败");
         }
         formDto.setDeptId(userDetail.getGridId());
-        return itemFeignClient.listItems(formDto);
+        Result<List<ItemResultDTO>> listResult = itemFeignClient.listItems(formDto);
+        Optional.of(listResult.getData()).ifPresent(
+                itemList -> {
+                    List<String> userIdList = itemList.stream().filter(item -> YesOrNoEnum.YES.value().equals(item.getPartyFlag())).map(ItemResultDTO::getUserId).distinct().collect(Collectors.toList());
+                    if (CollUtil.isNotEmpty(userIdList)) {
+                        EpdcUserMatchTagFormDTO form = new EpdcUserMatchTagFormDTO();
+                        form.setUserIdList(userIdList);
+                        form.setUserTagValue(UserTagEnum.PARTY_STANDARD_BEARER.value());
+                        Result<List<String>> filterByTagRes = userFeignClient.filterUserIdListByTag(form);
+                        List<String> filter = filterByTagRes.getData();
+                        if (filterByTagRes.success() && null != filter && CollUtil.isNotEmpty(filter)) {
+                            itemList.forEach(
+                                    item -> {
+                                        if (filter.contains(item.getUserId())) {
+                                            item.setStandardBearerFlag(YesOrNoEnum.YES.value());
+                                        }
+                                    }
+                            );
+                        }
+                    }
+                }
+        );
+        return listResult;
     }
 
     @Override

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java

@@ -38,6 +38,10 @@ public class IssueResultDTO implements Serializable {
      * 是否党员 0否；1是
      */
     private String partyFlag;
+    /**
+     * 是否亮旗党员  0否 1是
+     */
+    private String standardBearerFlag;
     /**
      * 赞数
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java

@@ -23,6 +23,7 @@ public class ItemResultDTO implements Serializable {
      * 事件ID
      */
     private String eventId;
+    private String userId;
     /**
      * 项目内容
      */
@@ -39,6 +40,10 @@ public class ItemResultDTO implements Serializable {
      * 是否党员 0否；1是
      */
     private String partyFlag;
+    /**
+     * 是否亮旗党员  0否 1是
+     */
+    private String standardBearerFlag;
     /**
      * 赞数
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -9,6 +9,7 @@
     <resultMap id="itemsMap" type="com.elink.esua.epdc.dto.item.result.ItemResultDTO">
         <result property="id" column="ID"/>
         <result property="eventId" column="EVENT_ID"/>
+        <result property="userId" column="USER_ID"/>
         <result property="itemContent" column="ITEM_CONTENT"/>
         <result property="nickname" column="NICK_NAME"/>
         <result property="avatar" column="USER_FACE"/>
@@ -32,6 +33,7 @@
         SELECT
         item.ID,
         item.EVENT_ID,
+        item.USER_ID,
         item.ITEM_CONTENT,
         item.NICK_NAME,
         item.USER_FACE,