From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 7e93333..a98bf96 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
@@ -12,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.*;
@@ -74,6 +75,8 @@
private UserService userService;
@Autowired
private ComActProjectMapper comActProjectMapper;
+ @Autowired
+ private NewFightResourceSharingDAO newFightResourceSharingDAO;
/**
* 新增党员
@@ -1204,16 +1207,20 @@
@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());
- List<ComActProject> comActProjects = comActProjectMapper.selectList(wrapper);
+// 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);
+ List<ComActProject> comActProjects = comActProjectMapper.getList(projectVO);
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());
@@ -1221,7 +1228,34 @@
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();
}
--
Gitblit v1.7.1