springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -32,7 +32,7 @@ @ApiModelProperty("发起人名字") private String sponsorName; @ApiModelProperty("发布人昵称") @ApiModelProperty("发起人昵称") private String userNickName; @ApiModelProperty("发起人头像") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyBuildingMemberVO.java
@@ -25,4 +25,6 @@ private Long pageNum; @ApiModelProperty(value ="每页记录数") private Long pageSize; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -536,6 +536,10 @@ @PostMapping("pageprepartybuildingmember") public R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO) { //待认证党员分页查询 Long communityId = this.getCommunityId(); if(communityId != null){ pagePartyBuildingMemberVO.setCommunityId(communityId); } return partyBuildingService.pagePrePartybuildingmember(pagePartyBuildingMemberVO); }
@@ -30,7 +30,7 @@ } private static final int BATCH_COUNT = 100; private static final int BATCH_COUNT = 5000; private List<PartyBuildingMemberExcelVO> list = new ArrayList<>(); @Override public void invoke(PartyBuildingMemberExcelVO partyBuildingMemberExcelVO, AnalysisContext analysisContext) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java
@@ -29,6 +29,7 @@ @Select("" + "SELECT\n" + "u.`name` userName,\n" + "u.`nick_name` userNickName,\n" + "u.`image_url`,\n" + "u.phone,\n" + "c.`comment`,\n" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -194,7 +194,7 @@ "SELECT\n" + "p.id,\n" + "u.`name` sponsor_name,\n" + "u.nick_name userNickName,\n" + "u.`nick_name` userNickName,\n" + "u.phone sponsor_phone,\n" + "count(DISTINCT pu.id)giveThumbsUpNum,\n" + "count(DISTINCT c.id)commentNum,\n" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
@@ -482,9 +482,11 @@ } Long userId = comActDiscussDO.getUserId(); LoginUserInfoVO loginUserInfoVO=comActDiscussDAO.selectUserByUserId(userId); comActDiscussVO.setUserName(loginUserInfoVO.getName()); comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl()); comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName()); if(loginUserInfoVO != null){ comActDiscussVO.setUserName(loginUserInfoVO.getName()); comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName()); comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl()); } Long communityId = comActDiscussDO.getCommunityId(); Integer type1 = loginUserInfoVO.getType(); if (type1.intValue()>1) { springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -154,6 +154,9 @@ "<if test='pagePartyBuildingMemberVO.auditStatus != null'>" + " and m.audit_result = #{pagePartyBuildingMemberVO.auditStatus}"+ " </if> " + "<if test='pagePartyBuildingMemberVO.communityId != null'>" + " and m.community_id = #{pagePartyBuildingMemberVO.communityId}"+ " </if> " + " order by m.join_time desc "+ "</script>") IPage<PartyBuildingMemberVO> pagePartyBuildingMembersVO(Page page, @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -101,28 +101,40 @@ @Override @Transactional(rollbackFor = Exception.class) public R listSavePartyBuildingMemberExcelVO(List<PartyBuildingMemberExcelVO> list) { Boolean aBoolean = stringRedisTemplate.hasKey(REDIS_ORG_ALL); ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue(); // Boolean aBoolean = stringRedisTemplate.hasKey(REDIS_ORG_ALL); // ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue(); List<PartyOrganizationVO> partyOrganizationVOS=new ArrayList<>(); if (aBoolean) { String orgs = valueOperations.get(REDIS_ORG_ALL); if (!ObjectUtils.isEmpty(orgs)) { partyOrganizationVOS= JSONArray.parseArray(orgs,PartyOrganizationVO.class); } } else { List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(new LambdaQueryWrapper<>()); if (!ObjectUtils.isEmpty(comPbOrgDOS)) { List<PartyOrganizationVO> partyOrganizationVOList=new ArrayList<>(); comPbOrgDOS.forEach(comPbOrgDO -> { PartyOrganizationVO partyOrganizationVO=new PartyOrganizationVO(); partyOrganizationVO.setId(comPbOrgDO.getId()); partyOrganizationVO.setName(comPbOrgDO.getName()); partyOrganizationVO.setCommunityId(comPbOrgDO.getCommunityId()); partyOrganizationVOList.add(partyOrganizationVO); }); partyOrganizationVOS= partyOrganizationVOList; } valueOperations.set(REDIS_ORG_ALL,JSONArray.toJSONString(partyOrganizationVOS),24, TimeUnit.HOURS); // if (aBoolean) { // String orgs = valueOperations.get(REDIS_ORG_ALL); // if (!ObjectUtils.isEmpty(orgs)) { // partyOrganizationVOS= JSONArray.parseArray(orgs,PartyOrganizationVO.class); // } // } else { // List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(new LambdaQueryWrapper<>()); // if (!ObjectUtils.isEmpty(comPbOrgDOS)) { // List<PartyOrganizationVO> partyOrganizationVOList=new ArrayList<>(); // comPbOrgDOS.forEach(comPbOrgDO -> { // PartyOrganizationVO partyOrganizationVO=new PartyOrganizationVO(); // partyOrganizationVO.setId(comPbOrgDO.getId()); // partyOrganizationVO.setName(comPbOrgDO.getName()); // partyOrganizationVO.setCommunityId(comPbOrgDO.getCommunityId()); // partyOrganizationVOList.add(partyOrganizationVO); // }); // partyOrganizationVOS= partyOrganizationVOList; // } // valueOperations.set(REDIS_ORG_ALL,JSONArray.toJSONString(partyOrganizationVOS),24, TimeUnit.HOURS); // } List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(new LambdaQueryWrapper<>()); if (!ObjectUtils.isEmpty(comPbOrgDOS)) { List<PartyOrganizationVO> partyOrganizationVOList=new ArrayList<>(); comPbOrgDOS.forEach(comPbOrgDO -> { PartyOrganizationVO partyOrganizationVO=new PartyOrganizationVO(); partyOrganizationVO.setId(comPbOrgDO.getId()); partyOrganizationVO.setName(comPbOrgDO.getName()); partyOrganizationVO.setCommunityId(comPbOrgDO.getCommunityId()); partyOrganizationVOList.add(partyOrganizationVO); }); partyOrganizationVOS= partyOrganizationVOList; } List<ComPbMemberDO> comPbMemberDOS=new ArrayList<>(); if (!ObjectUtils.isEmpty(list)) {
