LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合同关联项目变更

Browse Source
This commit is contained in:
梁琦涛
2021-10-27 17:51:59 +08:00
parent 1362303222
commit 0f6ac2b1db
3 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+35 -34
View File
@@ -46,6 +46,7 @@ import com.jero.modules.system.service.ISysUserService;
import com.jero.pack.common.PackCommon;
import com.jero.pack.entity.PayPackCompanyProject;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItem;
@@ -353,17 +354,16 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
updatePayCommonProject.eq(PayCommonProject::getId,p.getProjectId());
updatePayCommonProject.set(PayCommonProject::getUpdateBy,sysUser.getUsername());
updatePayCommonProject.set(PayCommonProject::getUpdateTime,new Date());
if(Objects.equals(payCommonProject.getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
updatePayCommonProject.set(PayCommonProject::getContractNum,payIncomeContract.getContractNum());
}
updatePayCommonProject.set(PayCommonProject::getChargeWay,PayIncomeContractCommon.CHARGE_WAY2);
updatePayCommonProject.set(PayCommonProject::getContractNum,payIncomeContract.getContractNum());
updatePayCommonProject.set(PayCommonProject::getChargeNoticeNo,null);
updatePayCommonProject.set(PayCommonProject::getChargeNoticeId,null);
// 合同选择了打包，查看打包年份&&打包企业是否存在
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
updatePayCommonProject.set(PayCommonProject::getPack,PayIncomeContractCommon.PACK1);
payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContract.getPackYear(),payCommonProject.getId(),PayIncomeContractCommon.PROJECT_TYPE1,payIncomeContract.getPack());
}
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) || Objects.equals(payCommonProject.getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
payCommonProjectService.update(updatePayCommonProject);
}
payCommonProjectService.update(updatePayCommonProject);
principalId = payCommonProject.getPrincipalId();
projectName = payCommonProject.getChargeProject();
// 更新项目id
@@ -395,17 +395,17 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date());
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId());
if(Objects.equals(listPayWorkingGroupSubItem.get(0).getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,payIncomeContract.getContractNum());
}
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,payIncomeContract.getContractNum());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeWay,PayIncomeContractCommon.CHARGE_WAY2);
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getCharge,null);
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeNo,null);
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeId,null);
// 合同选择了打包，查看打包年份&&打包企业是否存在
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK1);
payPackCompanyProjectService.setPack(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),listPayWorkingGroupSubItem.get(0).getContactsIdOne(),payIncomeContract.getPackYear(),listPayWorkingGroupSubItem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE2,payIncomeContract.getPack());
}
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) || Objects.equals(listPayWorkingGroupSubItem.get(0).getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
}
payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
principalId = payWorkingGroup.getPrincipalIdA();
projectName = payWorkingGroup.getWorkingGroupProject();
// 更新项目id
@@ -468,17 +468,16 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateBy,sysUser.getUsername());
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateTime,new Date());
updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,listPayMemberProjectSubitem.get(0).getId());
if(Objects.equals(listPayMemberProjectSubitem.get(0).getPaymentMethod(),PayIncomeContractCommon.CHARGE_WAY2)){
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,payIncomeContract.getContractNum());
}
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,payIncomeContract.getContractNum());
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getPaymentMethod,PayIncomeContractCommon.CHARGE_WAY2);
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getChargeNoticeNo,null);
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getChargeNoticeFileId,null);
// 合同选择了打包，查看打包年份&&打包企业是否存在
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getPack,PayIncomeContractCommon.PACK1);
payPackCompanyProjectService.setPack(listPayMemberProjectSubitem.get(0).getCompanyId(),listPayMemberProjectSubitem.get(0).getCompanyContactId(),payIncomeContract.getPackYear(),listPayMemberProjectSubitem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE4,payIncomeContract.getPack());
}
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) || Objects.equals(listPayMemberProjectSubitem.get(0).getPaymentMethod(),PayIncomeContractCommon.CHARGE_WAY2)){
memberProjectSubitemService.update(updatePayMemberProjectSubitem);
}
memberProjectSubitemService.update(updatePayMemberProjectSubitem);
principalId = payMemberProject.getDirectorId();
projectName = payMemberProject.getProjectName();
p.setProjectId(listPayMemberProjectSubitem.get(0).getId());
@@ -606,6 +605,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
if(Objects.isNull(payCommonProject)){
throw new JeroBootException("项目不存在！");
}
LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
updatePayCommonProject.set(PayCommonProject::getUpdateBy,sysUser.getUsername());
updatePayCommonProject.set(PayCommonProject::getUpdateTime,new Date());
// 合同为打包
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
// 查询打包项目来源是否为收入合同
@@ -616,14 +618,12 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
// 存在数据，取消打包,变更项目打包状态， 否则不进行操作
if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
payPackCompanyProjectService.removeById(listPayPackCompanyProject.get(0).getId());
LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
updatePayCommonProject.set(PayCommonProject::getUpdateBy,sysUser.getUsername());
updatePayCommonProject.set(PayCommonProject::getUpdateTime,new Date());
updatePayCommonProject.set(PayCommonProject::getPack,PayIncomeContractCommon.PACK0);
updatePayCommonProject.eq(PayCommonProject::getId,payIncomeContractAssociated.getProjectId());
payCommonProjectService.update(updatePayCommonProject);
}
}
updatePayCommonProject.eq(PayCommonProject::getId,payIncomeContractAssociated.getProjectId());
updatePayCommonProject.set(PayCommonProject::getContractNum,null);
payCommonProjectService.update(updatePayCommonProject);
break;
case PayIncomeContractCommon.PROJECT_TYPE2:
// 工作组项目
@@ -633,7 +633,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
// 更新项目id
payIncomeContractAssociated.setProjectId(listPayWorkingGroupSubItem.getId());
LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date());
// 合同为打包
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
// 查询打包项目来源是否为收入合同
@@ -644,14 +646,12 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
// 存在数据，取消打包,变更项目打包状态， 否则不进行操作
if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
payPackCompanyProjectService.removeById(listPayPackCompanyProject.get(0).getId());
LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK0);
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.getId());
payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
}
}
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.getId());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,null);
payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
break;
case PayIncomeContractCommon.PROJECT_TYPE3:
// 会议项目
@@ -682,6 +682,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
// 更新项目id
payIncomeContractAssociated.setProjectId(payMemberProjectSubitem.getId());
LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateBy,sysUser.getUsername());
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateTime,new Date());
// 合同为打包
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
// 查询打包项目来源是否为收入合同
@@ -692,14 +695,12 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
// 存在数据，取消打包,变更项目打包状态， 否则不进行操作
if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
payPackCompanyProjectService.removeById(listPayPackCompanyProject.get(0).getId());
LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateBy,sysUser.getUsername());
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateTime,new Date());
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getPack,PayIncomeContractCommon.PACK0);
updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,payMemberProjectSubitem.getId());
memberProjectSubitemService.update(updatePayMemberProjectSubitem);
}
}
updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,payMemberProjectSubitem.getId());
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,null);
memberProjectSubitemService.update(updatePayMemberProjectSubitem);
break;
case PayIncomeContractCommon.PROJECT_TYPE5:
// 标协会员
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java
+3
View File
@@ -14,10 +14,13 @@ import com.jero.member.service.IPayMemberProjectService;
import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayCommonProject;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+16
View File
@@ -18,6 +18,7 @@ import com.jero.contract.service.IPayIncomeContractService;
import com.jero.pack.entity.PayPackCompanyProject;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayCommonProject;
import com.jero.temporary.entity.PayCompanyManagementTemporary;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -203,6 +204,21 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
payMemberProjectSubitem.setMail(projectStatusVO.getMail());
}
}
// 选择无
if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(), PayProjectCommon.CHARGE_WAY1)){
payMemberProjectSubitem.setContractNo(null);
payMemberProjectSubitem.setChargeNoticeNo(null);
payMemberProjectSubitem.setChargeNoticeFileId(null);
}
// 选择合同
if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY2)){
payMemberProjectSubitem.setChargeNoticeNo(null);
payMemberProjectSubitem.setChargeNoticeFileId(null);
}
// 选择收费通知
if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY3)){
payMemberProjectSubitem.setContractNo(null);
}
validMemberProjectSubitemEdit(payMemberProjectSubitem,payMemberProjectSubitem1);
saveOrUpdate(payMemberProjectSubitem);
}