From 136230322223bbb2ce830713d2da96a874a14f3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Wed, 27 Oct 2021 15:41:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=EF=BC=8C?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9=E7=9B=AE=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BC=96=E5=8F=B7=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/PayWorkingGroupSubItem.java | 6 ++++ .../PayWorkingGroupSubItemServiceImpl.java | 35 +++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 7a204712..00f6bc9a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.jero.common.aspect.annotation.Dict; +import com.jero.contract.entity.PayIncomeContract; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -229,4 +230,9 @@ public class PayWorkingGroupSubItem implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "运行年份") private String year; + /** + * 合同数据 + */ + @TableField(exist = false) + private PayIncomeContract payIncomeContract; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 81a0b4c9..29ca3c6f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -16,6 +16,8 @@ import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.contract.entity.PayIncomeContract; +import com.jero.contract.entity.PayIncomeContractAssociated; +import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.contract.service.IPayIncomeContractService; import com.jero.meeting.entity.PayMeetingRemindRecord; import com.jero.meeting.service.IPayMeetingRemindRecordService; @@ -43,7 +45,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.IOException; import java.util.*; import java.util.stream.Collectors; @@ -81,7 +82,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl queryPageList(Page page, PayWorkingGroupSubItem payWorkingGroupSubitem,String paymentDate) { @@ -492,6 +494,17 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + }else{ + // 合同编号验证 + LambdaQueryWrapper queryPayIncomeContract = new LambdaQueryWrapper(); + queryPayIncomeContract.eq(PayIncomeContract::getContractNum,p.getContractNum()); + queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,p.getChargeCompanyId()); + List listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract); + if(CollectionUtils.isEmpty(listPayIncomeContract)){ + msg.append("第").append(count + 3).append("行:合同号不存在，请修改。
"); + }else{ + p.setPayIncomeContract(listPayIncomeContract.get(0)); + } } } if (Objects.equals(p.getChargeWay(), PayProjectCommon.CHARGE_WAY3)) { @@ -512,6 +525,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); } } + p.setChargeUse(PayProjectCommon.CHARGE_USE1); p.setPack(PayProjectCommon.PACKAGING0); p.setInAccount(PayProjectCommon.IN_ACCOUNT0); p.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0); @@ -527,6 +541,23 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl{ + PayIncomeContract payIncomeContract = p.getPayIncomeContract(); + // 合同存在 && 合同状态不为草稿，不为未通过 关联合同 + PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated(); + payIncomeContractAssociated.setContractId(payIncomeContract.getId()); + payIncomeContractAssociated.setProjectType(Integer.parseInt(PayProjectCommon.PROJECT_TYPE2)); + payIncomeContractAssociated.setProjectId(p.getId()); + payIncomeContractAssociatedService.save(payIncomeContractAssociated); + // 关联了合同,判断合同是否打包，更新项目打包状态，添加打包 + if(Objects.equals(payIncomeContract.getPack(),PayProjectCommon.PACKAGING1)){ + payPackCompanyProjectService.setPack(p.getChargeCompanyId(),p.getContactsIdOne(),payIncomeContract.getPackYear(),p.getId(),PayProjectCommon.PROJECT_TYPE2,payIncomeContract.getPack()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.eq(PayWorkingGroupSubItem::getId,p.getId()); + update.set(PayWorkingGroupSubItem::getPack,PayProjectCommon.PACKAGING1); + payWorkingGroupSubItemService.update(update); + } + }); } } }else{