From b7ee93df9c0f10ce17431fd1ef33506742977b82 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期一, 10 五月 2021 16:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 b7515fa..3b4f250 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
@@ -348,6 +348,11 @@
@Override
public R updateYnamic(PartyBuildingComPbDynVO partyCommitteeVO) {
ComPbDynDO comPbDynDO=new ComPbDynDO();
+ if(partyCommitteeVO.getPublishAt()!=null && partyCommitteeVO.getPublishAt().getTime() >System.currentTimeMillis()){
+ partyCommitteeVO.setStatus(1);
+ }else if(partyCommitteeVO.getPublishAt()!=null && partyCommitteeVO.getPublishAt().getTime() < System.currentTimeMillis()){
+ partyCommitteeVO.setStatus(2);
+ }
BeanUtils.copyProperties(partyCommitteeVO,comPbDynDO);
int insert = comPbDynDAO.updateById(comPbDynDO);
if (insert>0) {
@@ -506,15 +511,34 @@
if(comPbMemberDO == null){
return R.fail("未找到党员认证信息");
}
- String idCard=comPbMemberDO.getIdCard();
comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
+ if(partyBuildingMemberVO.getAuditResult()!=null && partyBuildingMemberVO.getAuditResult().equals(3)){
+ comPbMemberDO.setRefuseReason(partyBuildingMemberVO.getRefuseReason());
+ }
if(partyBuildingMemberVO.getAuditResult()!=null && partyBuildingMemberVO.getAuditResult().equals(1)){
comPbMemberDO.setUpdateAt(new Date());
}
- BeanUtils.copyProperties(partyBuildingMemberVO, comPbMemberDO);
- if(partyBuildingMemberVO.getIdCard().contains("********")){
- comPbMemberDO.setIdCard(idCard);
+
+ //编辑
+ if(partyBuildingMemberVO.getJoinTime()!=null) {
+ comPbMemberDO.setJoinTime(partyBuildingMemberVO.getJoinTime());
}
+ if(partyBuildingMemberVO.getEmploymentTime()!=null) {
+ comPbMemberDO.setEmploymentTime(partyBuildingMemberVO.getEmploymentTime());
+ }
+ if(partyBuildingMemberVO.getIdCard()!=null &&!partyBuildingMemberVO.getIdCard().contains("*")){
+ comPbMemberDO.setIdCard(partyBuildingMemberVO.getIdCard());
+ }
+ if(partyBuildingMemberVO.getName()!=null ){
+ comPbMemberDO.setName(partyBuildingMemberVO.getName());
+ }
+ if(partyBuildingMemberVO.getOrgId()!=null ){
+ comPbMemberDO.setOrgId(partyBuildingMemberVO.getOrgId());
+ }
+ if(partyBuildingMemberVO.getPhotoPath()!=null ){
+ comPbMemberDO.setPhotoPath(partyBuildingMemberVO.getPhotoPath());
+ }
+
if (comPbMemberDAO.updateById(comPbMemberDO) > 0) {
PartyBuildingMemberVO rtVO = new PartyBuildingMemberVO();
BeanUtils.copyProperties(comPbMemberDO, rtVO);
--
Gitblit v1.7.1