From 91ef458342b3bc004e2ce903f325b4fc2e851fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 25 Oct 2021 12:07:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40330?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectDetailServiceImpl.java | 6 ++ .../impl/PayWorkingGroupServiceImpl.java | 77 +++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 5140eae9..95d84e6a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -86,6 +86,12 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.isNull(payCommonProject)){ throw new JeroBootException("项目不存在！"); } + if(Objects.isNull(payCommonProject.getPaidAmount())){ + payCommonProject.setPaidAmount(new BigDecimal("0.00")); + } + if(Objects.isNull(payCommonProject.getReceivableAmount())){ + payCommonProject.setReceivableAmount(new BigDecimal("0.00")); + } // 工作组项目资料 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)){ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 4b9eb5b7..82b8e42d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -1,5 +1,7 @@ package com.jero.project.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,6 +9,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.exception.JeroBootException; import com.jero.common.service.RolePermissionService; import com.jero.common.system.vo.LoginUser; +import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.entity.PayContactsManagement; import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.modules.system.entity.SysUser; @@ -18,9 +22,14 @@ import com.jero.project.vo.PayWorkingGroupVO; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.mapper.PayWorkingGroupMapper; import com.jero.statistics.entity.*; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -56,6 +65,10 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageList(Page page, PayWorkingGroup payWorkingGroup) { @@ -144,6 +157,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPayWorkingGroup = new LambdaQueryWrapper<>(); queryPayWorkingGroup.like(PayWorkingGroup::getWorkingGroupProject,str); @@ -185,6 +201,64 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query); if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ listPayWorkingGroupSubItem.forEach(p->{ + // 添加企业临时数据 + PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(p.getChargeCompanyTemporaryId()); + if(Objects.isNull(payCompanyManagementTemporary)){ + payCompanyManagementTemporary = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(p.getChargeCompanyId()); + }else{ + payCompanyManagementTemporary.setCompanyId(payCompanyManagementTemporary.getId()); + payCompanyManagementTemporary.setId(null); + payCompanyManagementTemporaryService.save(payCompanyManagementTemporary); + } + + // 添加联系人一临时数据 + PayContactsManagementTemporary payContactsManagementTemporaryOne = payContactsManagementTemporaryService.getById(p.getContactsTemporaryIdOne()); + if(Objects.isNull(payContactsManagementTemporaryOne)){ + payContactsManagementTemporaryOne = payContactsManagementTemporaryService.insertContactsManagementTemporary(p.getContactsIdOne()); + }else{ + payContactsManagementTemporaryOne.setCompanyId(payContactsManagementTemporaryOne.getId()); + payContactsManagementTemporaryOne.setId(null); + payContactsManagementTemporaryService.save(payContactsManagementTemporaryOne); + } + + // 添加联系人二临时数据 + if(!StringUtils.isEmpty(p.getContactsTemporaryIdTwo())){ + PayContactsManagementTemporary payContactsManagementTemporaryTwo = payContactsManagementTemporaryService.getById(p.getContactsTemporaryIdTwo()); + if(Objects.isNull(payContactsManagementTemporaryTwo)){ + payContactsManagementTemporaryTwo = payContactsManagementTemporaryService.insertContactsManagementTemporary(p.getContactsIdTwo()); + } else { + payContactsManagementTemporaryTwo.setCompanyId(payContactsManagementTemporaryTwo.getId()); + payContactsManagementTemporaryTwo.setId(null); + payContactsManagementTemporaryService.save(payContactsManagementTemporaryTwo); + } + p.setContactsTemporaryIdTwo(payContactsManagementTemporaryTwo.getId()); + } + + + // 添加联系人三临时数据 + if(!StringUtils.isEmpty(p.getContactsTemporaryIdThree())){ + PayContactsManagementTemporary payContactsManagementTemporaryThree = payContactsManagementTemporaryService.getById(p.getContactsTemporaryIdThree()); + if(Objects.isNull(payContactsManagementTemporaryThree)){ + payContactsManagementTemporaryThree = payContactsManagementTemporaryService.insertContactsManagementTemporary(p.getContactsIdThree()); + }else { + payContactsManagementTemporaryThree.setCompanyId(payContactsManagementTemporaryThree.getId()); + payContactsManagementTemporaryThree.setId(null); + payContactsManagementTemporaryService.save(payContactsManagementTemporaryThree); + } + p.setContactsTemporaryIdThree(payContactsManagementTemporaryThree.getId()); + } + + + // 添加邮寄联系人临时数据 + PayContactsManagementTemporary payContactsManagementTemporaryMail = payContactsManagementTemporaryService.getById(p.getMailContactsId()); + if(Objects.isNull(payContactsManagementTemporaryMail)){ + payContactsManagementTemporaryMail = payContactsManagementTemporaryService.insertContactsManagementTemporary(p.getMailContactsId()); + } else { + payContactsManagementTemporaryMail.setCompanyId(payContactsManagementTemporaryMail.getId()); + payContactsManagementTemporaryMail.setId(null); + payContactsManagementTemporaryService.save(payContactsManagementTemporaryMail); + } + // 来款为合同，不复制合同编号 if(Objects.equals(p.getChargeWay(), PayProjectCommon.CHARGE_WAY2)){ p.setContractNum(null); @@ -193,6 +267,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl