From 1abee89cd55e34fc51102d23f984e3d56ed01647 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期五, 30 四月 2021 15:35:36 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 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 36d5144..866bf8e 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
@@ -8,8 +8,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_dangjian.dao.*;
@@ -52,7 +54,6 @@
private ComPbDynDAO comPbDynDAO;
@Resource
private ComPbDynUserDAO comPbDynUserDAO;
-
private final String REDIS_ORG_ALL="ogrlist";
@@ -181,6 +182,7 @@
partyBuildingMemberVO.setOrgId(null);
}
BeanUtils.copyProperties(partyBuildingMemberVO,comPbMemberDO);
+ comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
int i = comPbMemberDAO.updateById(comPbMemberDO);
if (i>0) {
return R.ok();
@@ -251,7 +253,7 @@
comPbMemberRoleDO.setUpdateAt(new Date());
comPbMemberRoleDO.setPositionTwo(partyCommitteeVO.getPositionTwo());
comPbMemberRoleDO.setIsReg(2);
- PartyCommitteeVO oldPartyCommitteeVO = comPbMemberRoleDAO.selectPartyCommitteeById(partyCommitteeVO.getId());
+ PartyCommitteeVO oldPartyCommitteeVO = comPbMemberRoleDAO.selectPartyCommitteeById(partyCommitteeVO.getId());
String oldphone = oldPartyCommitteeVO.getPhone();
SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone);
String newphone=partyCommitteeVO.getPhone();
@@ -352,24 +354,23 @@
* @return 详情
*/
@Override
- public R infoYnamic(Integer id) {
- ComPbDynDO comPbDynDO = comPbDynDAO.selectById(id);
- if (ObjectUtils.isEmpty(comPbDynDO)) {
+ public R infoYnamic(Long id) {
+ PartyBuildingComPbDynVO comPbDynVO = comPbDynDAO.selectVoById(id);
+ if (ObjectUtils.isEmpty(comPbDynVO)) {
return R.fail("动态不存在");
}
- PartyBuildingComPbDynVO partyBuildingComPbDynVO=new PartyBuildingComPbDynVO();
- Long createBy = comPbDynDO.getCreateBy();
// ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(createBy);
- String name = comPbMemberDAO.selectNameByUserId(createBy);
- if (ObjectUtils.isEmpty(name)) {
+ //String name = comPbMemberDAO.selectNameByUserId(createBy);
+
+ if (ObjectUtils.isEmpty(comPbDynVO.getCreateByName())) {
// return R.fail("发布人不存在");
+ String name = comPbMemberDAO.selectNameByUserId(comPbDynVO.getCreateBy());
name="后台发布";
+ comPbDynVO.setCreateByName(name);
}
- Integer integer = comPbDynUserDAO.selectCount(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
- BeanUtils.copyProperties(comPbDynDO,partyBuildingComPbDynVO);
- partyBuildingComPbDynVO.setCreateByName(name);
- partyBuildingComPbDynVO.setReadingVolume(null==integer?0:integer);
- return R.ok(partyBuildingComPbDynVO);
+ //Integer integer = comPbDynUserDAO.selectCount(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
+ comPbDynVO.setReadingVolume(null==comPbDynVO.getReadingVolume()?0:comPbDynVO.getReadingVolume());
+ return R.ok(comPbDynVO);
}
/**
@@ -428,15 +429,11 @@
*/
@Override
public R addDynUser(ComPbDynUserVO comPbDynUserVO) {
- ComPbDynUserDO comPbDynUserDO = comPbDynUserDAO.selectOne(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId,comPbDynUserVO.getDynId()).eq(ComPbDynUserDO::getUserId,comPbDynUserVO.getUserId()));
- if (ObjectUtils.isEmpty(comPbDynUserDO)) {
- comPbDynUserDO=new ComPbDynUserDO();
- BeanUtils.copyProperties(comPbDynUserVO,comPbDynUserDO);
- int insert = comPbDynUserDAO.insert(comPbDynUserDO);
- if (insert>0) {
- return R.ok();
- }
- return R.fail();
+ ComPbDynUserDO comPbDynUserDO=new ComPbDynUserDO();
+ BeanUtils.copyProperties(comPbDynUserVO,comPbDynUserDO);
+ int insert = comPbDynUserDAO.insert(comPbDynUserDO);
+ if (insert>0) {
+ return R.ok();
}
return R.fail();
}
@@ -489,9 +486,25 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- IPage<PartyBuildingMemberVO> iPage=comPbMemberDAO.pagePartyBuildingMemberVO(page, pagePartyBuildingMemberVO);
+ IPage<PartyBuildingMemberVO> iPage=comPbMemberDAO.pagePartyBuildingMembersVO(page, pagePartyBuildingMemberVO);
return R.ok(iPage);
}
+ @Override
+ public R updatePartyBuildingMembers(PartyBuildingMemberVO partyBuildingMemberVO){
+ ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(partyBuildingMemberVO.getId());
+ if(comPbMemberDO == null){
+ return R.fail("未找到党员认证信息");
+ }
+ comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
+ if(partyBuildingMemberVO.getAuditResult().equals(1)){
+ comPbMemberDO.setUpdateAt(new Date());
+ }
+ if (comPbMemberDAO.updateById(comPbMemberDO) > 0) {
+ return R.ok(comPbMemberDO.getIdCard());
+ }
+ return R.fail();
+ }
+
}
--
Gitblit v1.7.1