Commit 7ff06ca5 by xugaojun

9月迭代:企业微信列表支持标签是否同步查询

parent 2fcf25e2
......@@ -56,8 +56,9 @@ public class EnterpriseController extends WebBaseController {
// @Autowired
// private WxEnterpriseRelatedApiService wxEnterpriseRelllatedApiService;
//企业列表
// openTagFlag 0 未开启 1 开启 2 所有
@RequestMapping("wx-enterprise-list")
public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo, String keyword, String gicEnterpriseName, Integer gicContactHelper, String version) {
public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo, String keyword, int openTagFlag, String gicEnterpriseName, Integer gicContactHelper, String version) {
List<String> wxEnterpriseIds = new ArrayList<String>();
if (!StringUtils.isEmpty(gicEnterpriseName)) {
List<EnterpriseDTO> enterpriseNames = enterpriseService.getEnterpriseByName(gicEnterpriseName);
......@@ -84,14 +85,28 @@ public class EnterpriseController extends WebBaseController {
Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo, keyword, wxEnterpriseIds, gicContactHelper, version);
PageResult<YwWxEnterpriseDTO> pageVo = new PageResult<>();
List<YwWxEnterpriseDTO> list = EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, page.getResult());
for (YwWxEnterpriseDTO dto : list) {
Set<String> finalWxEntIdSet = wxEntIdSet;
list.stream().filter(one -> {
if (openTagFlag == 0) {
return !finalWxEntIdSet.contains(one.getWxEnterpriseId());
}
if (openTagFlag == 1) {
return finalWxEntIdSet.contains(one.getWxEnterpriseId());
}
if (openTagFlag == 2) {
return true;
}
return true;
}).forEach(dto -> {
dto.setVersion("3.0");
dto.setBuyDate(new Date());
dto.setBuyStatus("1");
List<EnterpriseDetailDTO> counts = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(dto.getWxEnterpriseId());
dto.setRelationCount(counts.size());
dto.setTagOpenFlag(wxEntIdSet.contains(dto.getWxEnterpriseId()) ? 1 : 0);
}
dto.setTagOpenFlag(finalWxEntIdSet.contains(dto.getWxEnterpriseId()) ? 1 : 0);
});
pageVo.setList(list);
pageVo.setPageNum(page.getCurrentPage());
pageVo.setPages(page.getPages());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment