From 38273fe5894b298a13f13fed6a6279d5beca71b4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 25 二月 2022 10:13:16 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java | 75 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java
index e9ed04b..35d284c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -20,6 +21,7 @@
import javax.annotation.Resource;
import java.util.Date;
+import java.util.List;
/**
* 项目人员(ComActSocialProjectMember)表服务实现类
@@ -47,15 +49,18 @@
if(comActSocialProjectMemberVO.getType()==1){
ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(comActSocialProjectMemberVO.getParamId());
if(comActSocialWorker!=null){
- ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
- BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
- comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
- comActSocialProjectMember.setImage(comActSocialWorker.getImage());
- comActSocialProjectMember.setName(comActSocialWorker.getName());
- comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
- comActSocialProjectMember.setCreateTime(new Date());
- comActSocialProjectMemberDao.insert(comActSocialProjectMember);
- return R.ok();
+ List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getProjectId()));
+ if(CollectionUtils.isEmpty(list)){
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
+ comActSocialProjectMember.setImage(comActSocialWorker.getImage());
+ comActSocialProjectMember.setName(comActSocialWorker.getName());
+ comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ return R.ok();
+ }
}
}
else {
@@ -82,33 +87,39 @@
if(comActSocialProjectMemberVO.getType()==1){
ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(id);
if(comActSocialWorker!=null){
- ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
- BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
- comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
- comActSocialProjectMember.setImage(comActSocialWorker.getImage());
- comActSocialProjectMember.setName(comActSocialWorker.getName());
- comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
- comActSocialProjectMember.setCreateTime(new Date());
- comActSocialProjectMember.setType(1);
- comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
- comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
- comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getProjectId()));
+ if(CollectionUtils.isEmpty(list)){
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
+ comActSocialProjectMember.setImage(comActSocialWorker.getImage());
+ comActSocialProjectMember.setName(comActSocialWorker.getName());
+ comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMember.setType(1);
+ comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
+ comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ }
}
}
else {
ComMngVolunteerMngDO comMngVolunteerMngDO=comMngVolunteerMngDAO.selectById(id);
if(comMngVolunteerMngDO!=null){
- ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
- BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
- comActSocialProjectMember.setAge(comMngVolunteerMngDO.getAge());
- comActSocialProjectMember.setImage(comMngVolunteerMngDO.getPhotoPath());
- comActSocialProjectMember.setName(comMngVolunteerMngDO.getName());
- comActSocialProjectMember.setPhone(comMngVolunteerMngDO.getPhone());
- comActSocialProjectMember.setCreateTime(new Date());
- comActSocialProjectMember.setType(2);
- comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
- comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
- comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comMngVolunteerMngDO.getPhone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getProjectId()));
+ if(CollectionUtils.isEmpty(list)){
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(comMngVolunteerMngDO.getAge());
+ comActSocialProjectMember.setImage(comMngVolunteerMngDO.getPhotoPath());
+ comActSocialProjectMember.setName(comMngVolunteerMngDO.getName());
+ comActSocialProjectMember.setPhone(comMngVolunteerMngDO.getPhone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMember.setType(2);
+ comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
+ comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ }
}
}
});
@@ -117,7 +128,7 @@
}
public Integer getAge(String idCard){
- Integer year=Integer.parseInt(idCard.substring(5,9));
+ Integer year=Integer.parseInt(idCard.substring(6,10));
Integer nowYear= DateUtils.getYear(new Date());
return nowYear-year;
}
--
Gitblit v1.7.1