From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 138 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 126 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index 03d2be7..334b67c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,6 +12,7 @@
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto;
+import com.panzhihua.common.model.dtos.partybuilding.NewFightResourceSharingDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
@@ -19,9 +21,11 @@
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.*;
+import com.panzhihua.service_dangjian.entity.ComActProject;
import com.panzhihua.service_dangjian.model.dos.ComPbDynDO;
import com.panzhihua.service_dangjian.model.dos.ComPbDynUserDO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
@@ -29,6 +33,7 @@
import com.panzhihua.service_dangjian.service.ComPbMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -68,6 +73,10 @@
private ComPbDynUserDAO comPbDynUserDAO;
@Resource
private UserService userService;
+ @Autowired
+ private ComActProjectMapper comActProjectMapper;
+ @Autowired
+ private NewFightResourceSharingDAO newFightResourceSharingDAO;
/**
* 新增党员
@@ -202,12 +211,15 @@
public R pagePartyOrganization(PagePartyOrganizationVO pagePartyOrganizationVO) {
Long communityId = pagePartyOrganizationVO.getCommunityId();
- List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
- if (CollUtil.isEmpty(communityIds)) {
- communityIds = new ArrayList<>();
- communityIds.add(communityId);
+
+ if (null != communityId){
+ List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
+ if (CollUtil.isEmpty(communityIds)) {
+ communityIds = new ArrayList<>();
+ communityIds.add(communityId);
+ }
+ pagePartyOrganizationVO.setCommunityIds(communityIds);
}
- pagePartyOrganizationVO.setCommunityIds(communityIds);
Page page = new Page<>();
Long pageNum = pagePartyOrganizationVO.getPageNum();
@@ -297,7 +309,22 @@
@Override
public R pagePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
- return null;
+ Page page = new Page<>();
+ Long pageNum = partyCommitteeVO.getPageNum();
+ Long pageSize = partyCommitteeVO.getPageSize();
+ if (null == pageNum || 0 == pageNum) {
+ pageNum = 1l;
+ }
+ if (null == pageSize || 0 == pageSize) {
+ pageSize = 10l;
+ }
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<PartyCommitteeVO> iPage = comPbMemberRoleDAO.pagePartyOrganizations(page, partyCommitteeVO);
+ iPage.getRecords().forEach(record -> {
+ record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
+ });
+ return R.ok(iPage);
}
// /**
@@ -505,8 +532,31 @@
}
@Override
- public R pageYnamic(PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
- return null;
+ public R pageYnamic(PartyBuildingComPbDynVO partyBuildingComPbDynVO)
+ {
+ Page page = new Page<>();
+ Long pageNum = partyBuildingComPbDynVO.getPageNum();
+ Long pageSize = partyBuildingComPbDynVO.getPageSize();
+ if (null == pageNum) {
+ pageNum = 1l;
+ }
+ if (null == pageSize) {
+ pageSize = 10l;
+ }
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<PartyBuildingComPbDynVO> iPage = comPbDynDAO.pageYnamics(page, partyBuildingComPbDynVO);
+ List<PartyBuildingComPbDynVO> records = iPage.getRecords();
+ if (!(ObjectUtils.isEmpty(records))) {
+ records.forEach(partyBuildingComPbDynVO1 -> {
+ String content = partyBuildingComPbDynVO1.getContent();
+ if (!ObjectUtils.isEmpty(content)) {
+ String text = RichTextUtil.getText(content);
+ partyBuildingComPbDynVO1.setContentText(text);
+ }
+ });
+ }
+ return R.ok(iPage);
}
@Override
@@ -844,7 +894,7 @@
}
//查询左下数据
- statisticsVo = comPbMemberDAO.getOrgDataStatisticsLeftDown(communityId,orgIds,startTime,endTime);
+ statisticsVo = comPbMemberDAO.getOrgDataStatisticsLeftDown(communityId,orgIds,startTime,endTime,"");
if(statisticsVo != null){
statisticsOrgVo.setParticipateVolunteerActivityDuration(statisticsVo.getParticipateVolunteerActivityDuration());
statisticsOrgVo.setParticipateVolunteerActivityNum(statisticsVo.getParticipateVolunteerActivityNum());
@@ -855,8 +905,9 @@
}
//查询党员数据
- IPage<PartyBuildingMemberVO> partyMemberPage = comPbMemberDAO.getOrgDataStatisticsMember(new Page(statisticsOrgDto.getPageNum()
- ,statisticsOrgDto.getPageSize()),communityId,orgIds);
+ IPage<PartyBuildingMemberVO> partyMemberPage = comPbMemberDAO.getOrgDataStatisticsMember(
+ new Page(statisticsOrgDto.getPageNum()
+ ,statisticsOrgDto.getPageSize()),communityId,orgIds,"");
if(partyMemberPage.getRecords() != null && !partyMemberPage.getRecords().isEmpty()){
statisticsOrgVo.setPartyMemberList(partyMemberPage.getRecords());
}
@@ -868,7 +919,8 @@
List<String> completeEasyList = new ArrayList<>();
List<String> cumulativeEasyList = new ArrayList<>();
for (int i = 0; i < startDateList.size(); i++) {
- Map<String,Object> statisticsMap = comPbMemberDAO.getOrgDataStatisticsRightDown(communityId,orgIds, startDateList.get(i) + " 00:00:00", endDateList.get(i) + " 23:59:59");
+ Map<String,Object> statisticsMap = comPbMemberDAO.getOrgDataStatisticsRightDown(communityId,orgIds,
+ startDateList.get(i) + " 00:00:00", endDateList.get(i) + " 23:59:59");
if(statisticsMap != null){
completeWishList.add(statisticsMap.get("completeWishNum").toString());
cumulativeWishList.add(statisticsMap.get("cumulativeWishNum").toString());
@@ -1154,6 +1206,68 @@
}
@Override
+ public R getProject(ProjectVO projectVO) {
+ LambdaQueryWrapper<ComActProject> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ComActProject::getUnitId,projectVO.getUnitId());
+ wrapper.eq(projectVO.getSpeciality()!=null,ComActProject::getSpeciality,projectVO.getSpeciality());
+ wrapper.eq(projectVO.getProject()!=null,ComActProject::getProject,projectVO.getProject());
+ wrapper.orderByDesc(ComActProject::getCreateTime);
+ List<ComActProject> comActProjects = comActProjectMapper.selectList(wrapper);
+ return R.ok(comActProjects);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public R addProject(ProjectVO projectVO) {
+ Date date = new Date();
+ ComActProject comActProject = new ComActProject();
+ comActProject.setUnitId(projectVO.getUnitId());
+ comActProject.setUnitName(projectVO.getUnitName());
+ comActProject.setSpeciality(projectVO.getSpeciality());
+ comActProject.setProject(projectVO.getProject());
+ comActProject.setPhone(projectVO.getPhone());
+ comActProject.setImage(projectVO.getImage());
+ comActProject.setCreateTime(date);
+ comActProjectMapper.insert(comActProject);
+ // new_fight_resource_sharing
+ NewFightResourceSharingDTO dto = new NewFightResourceSharingDTO();
+ dto.setTitle(projectVO.getProject());
+ dto.setUnitId(String.valueOf(projectVO.getUnitId()));
+ dto.setMeritId(projectVO.getSpeciality());
+ dto.setImgUrl(projectVO.getImage());
+ dto.setPhone(projectVO.getPhone());
+ dto.setCommunityId(projectVO.getCommunityId());
+ dto.setCreationTime(date);
+ newFightResourceSharingDAO.addData(dto);
+ return R.ok();
+ }
+
+ @Override
+ public R updateProject(ProjectVO projectVO) {
+ LambdaQueryWrapper<ComActProject> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ComActProject::getUnitId,projectVO.getUnitId());
+ wrapper.eq(ComActProject::getId,projectVO.getId());
+ ComActProject actProject = comActProjectMapper.selectOne(wrapper);
+ actProject.setSpeciality(projectVO.getSpeciality());
+ actProject.setProject(projectVO.getProject());
+ actProject.setPhone(projectVO.getPhone());
+ if(projectVO.getImage() != null){
+ actProject.setImage(projectVO.getImage());
+ }
+ comActProjectMapper.updateById(actProject);
+ return R.ok();
+ }
+
+ @Override
+ public R deleteProject(ProjectVO projectVO) {
+ List<Long> ids = projectVO.getIds();
+ LambdaQueryWrapper<ComActProject> wrapper = new LambdaQueryWrapper<>();
+ wrapper.in(ComActProject::getId,ids);
+ comActProjectMapper.delete(wrapper);
+ return R.ok();
+ }
+
+ @Override
public R getPartyMember(String phone,Integer type) {
return R.ok(comPbMemberDAO.selectDetail(phone,type));
--
Gitblit v1.7.1