From 633a003d232e37c79b7135ccda35eda1c69952c6 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 25 五月 2026 17:28:01 +0800
Subject: [PATCH] feat:统计数据测试调整
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 437 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 312 insertions(+), 125 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index 82307fb..5d43f90 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -1,12 +1,16 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.admin.api.entity.SysDept;
+import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
import com.by4cloud.platformx.business.constant.FlowNameEnum;
import com.by4cloud.platformx.business.dto.ContractAddDTO;
@@ -18,17 +22,23 @@
import com.by4cloud.platformx.business.vo.ContractDetailVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
-import com.by4cloud.platformx.flow.task.api.feign.RemoteBusinessService;
import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.data.RowRenderData;
+import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
-import java.io.Serializable;
+import java.io.IOException;
+import java.io.OutputStream;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
/**
* @author cd
@@ -44,25 +54,32 @@
private final ContractPaymentScheduleProcessMapper contractPaymentScheduleProcessMapper;
private final PaymentConfirmMapper paymentConfirmMapper;
private final CurrentOverdueMapper currentOverdueMapper;
+ private final BusinessCustomerMapper businessCustomerMapper;
private final RemoteFlowProcessService remoteFlowProcessService;
+ private final ContractTemplateMapper contractTemplateMapper;
+ private final RemoteDeptService remoteDeptService;
+
+ @Value("${file.local.base-path}")
+ private String basePath;
@Override
public R add(ContractAddDTO addDTO) {
- Contract contract = BeanUtil.copyProperties(addDTO,Contract.class);
+ Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
contract.setPartyBId(SecurityUtils.getUser().getCompId());
contract.setPartyB(SecurityUtils.getUser().getCompName());
contract.setContractNo(ContractNumberGenerator.generateContractNumber());
+ contract.setPaidAmount(new BigDecimal("0"));
contract.setBillingStatus("0");
contract.setErpPushFlag("0");
List<Contract> contracts;
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
- while (ArrayUtil.isNotEmpty(contracts.toArray())){
+ contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
+ while (ArrayUtil.isNotEmpty(contracts.toArray())) {
contract.setContractNo(ContractNumberGenerator.generateContractNumber());
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
+ contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
}
baseMapper.insert(contract);
- if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())){
+ if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
subjectMatter.setContractId(contract.getId());
@@ -74,13 +91,13 @@
});
}
- if (ArrayUtil.isNotEmpty(addDTO.getContractPaymentSchedule())){
+ if (ArrayUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
AtomicInteger index = new AtomicInteger(1);
addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
int currentIndex = index.getAndIncrement();
ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
- if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")){
- schedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),contractPaymentScheduleAddDTO.getAgreedDays()));
+ if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+ schedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
}
if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
if (schedule.getEffectiveDate().before(DateUtil.date())) {
@@ -89,17 +106,21 @@
schedule.setFulfillmentStatus(0);
}
}
- schedule.setPaymentStatus(0);
+ if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ schedule.setPaymentStatus(0);
+ }else {
+ schedule.setPaymentStatus(3);
+ }
schedule.setContractId(contract.getId());
schedule.setContractName(contract.getContractName());
schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
schedule.setStageOrder(currentIndex);
contractPaymentScheduleMapper.insert(schedule);
- if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")){
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
contract.setArrivalScheduleId(schedule.getId());
baseMapper.updateById(contract);
}
- if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")){
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
contract.setAcceptScheduleId(schedule.getId());
baseMapper.updateById(contract);
}
@@ -108,30 +129,30 @@
}
-
return R.ok();
}
@Override
public R edit(ContractUpdateDTO updateDTO) {
Contract entity = baseMapper.selectById(updateDTO.getId());
- if (!StrUtil.equals(entity.getContractStatus()+"","0")){
+ if (!StrUtil.equals(entity.getContractStatus() + "", "0")) {
return R.failed("褰撳墠鐘舵�佹棤娉曚慨鏀瑰悎鍚�");
}
- Contract contract = BeanUtil.copyProperties(updateDTO,Contract.class);
+ Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
contract.setContractNo(ContractNumberGenerator.generateContractNumber());
contract.setBillingStatus("0");
contract.setErpPushFlag("0");
+ contract.setPaidAmount(new BigDecimal("0"));
List<Contract> contracts;
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
- while (ArrayUtil.isNotEmpty(contracts.toArray())){
+ contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
+ while (ArrayUtil.isNotEmpty(contracts.toArray())) {
contract.setContractNo(ContractNumberGenerator.generateContractNumber());
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
+ contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
}
baseMapper.updateById(contract);
- if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())){
- contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contract.getId()));
+ if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+ contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
@@ -143,8 +164,8 @@
});
}
- if (ArrayUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())){
- contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contract.getId()));
+ if (ArrayUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
+ contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
AtomicInteger index = new AtomicInteger(1);
updateDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
@@ -154,12 +175,17 @@
schedule.setContractName(contract.getContractName());
schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
schedule.setStageOrder(currentIndex);
+ if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ schedule.setPaymentStatus(0);
+ }else {
+ schedule.setPaymentStatus(3);
+ }
contractPaymentScheduleMapper.insert(schedule);
- if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")){
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
contract.setArrivalScheduleId(schedule.getId());
baseMapper.updateById(contract);
}
- if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")){
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
contract.setAcceptScheduleId(schedule.getId());
baseMapper.updateById(contract);
}
@@ -173,10 +199,10 @@
@Override
public ContractDetailVo detail(Long id) {
Contract contract = baseMapper.selectById(id);
- ContractDetailVo detailVo = BeanUtil.copyProperties(contract,ContractDetailVo.class);
- List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,id));
+ ContractDetailVo detailVo = BeanUtil.copyProperties(contract, ContractDetailVo.class);
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, id));
detailVo.setContractSubjectMatter(subjectMatterList);
- List<ContractPaymentSchedule> paymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contract.getId()));
+ List<ContractPaymentSchedule> paymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
detailVo.setContractPaymentSchedule(paymentScheduleList);
return detailVo;
}
@@ -193,40 +219,21 @@
if (r1.getCode() == 1) {
return R.failed("娴佺▼鍚姩澶辫触");
}
- contract.setContractStatus(2);
+ contract.setContractStatus(1);
baseMapper.updateById(contract);
return R.ok();
}
public void takeEffect(Long id) {
Contract contract = baseMapper.selectById(id);
- contract.setContractStatus(1);
+ contract.setContractStatus(2);
baseMapper.updateById(contract);
- ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contract.getId())
+ ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId())
.orderByAsc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
- if (fitstSchedule.getStageName().equals("鍚堝悓绛捐")){
+ if (fitstSchedule.getStageName().equals("鍚堝悓绛捐")) {
//鏂板搴旀敹
- PaymentConfirm paymentConfirm = new PaymentConfirm();
- paymentConfirm.setBusinessType("鍚堝悓绛捐搴旀敹");
- paymentConfirm.setBusGuestId(contract.getPartyAId());
- paymentConfirm.setBusGuestName(contract.getPartyA());
- paymentConfirm.setContractId(contract.getId());
- paymentConfirm.setContractName(contract.getContractName());
- paymentConfirm.setContractNo(contract.getContractNo());
- paymentConfirm.setScheduleId(fitstSchedule.getId());
- paymentConfirm.setScheduleName(fitstSchedule.getStageName());
- paymentConfirm.setConfirmTime(new Date());
- paymentConfirm.setTransationAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setReceivableAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setTotalAmount(fitstSchedule.getPlannedAmount().multiply(new BigDecimal("-1")));
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- BigDecimal lastNewTotal = new BigDecimal("0");
- if(ObjUtil.isNotNull(lastNewConfirm)){
- lastNewTotal = lastNewConfirm.getTotalAmount();
- }
- paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
- paymentConfirmMapper.insert(paymentConfirm);
+ savePaymentConfirm(contract, fitstSchedule);
+
//鏂板鍚堝悓灞ョ害璁板綍
ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
process.setContractId(contract.getId());
@@ -235,70 +242,44 @@
process.setScheduleName(fitstSchedule.getStageName());
process.setProcessDate(contract.getSignDate());
contractPaymentScheduleProcessMapper.insert(process);
- //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
- PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- if (newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
- //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
- contract.setContractStatus(3);
- baseMapper.updateById(contract);
- }
- }else if (fitstSchedule.getStageName().equals("鍙戣揣鍓�")) {
+// //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
+// PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+// .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+// if (ObjUtil.isNotNull(newConfirm)&&newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
+// //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
+// contract.setContractStatus(3);
+// baseMapper.updateById(contract);
+// }
+ } else if (fitstSchedule.getStageName().equals("鍙戣揣鍓�")) {
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName("鏃�");
baseMapper.updateById(contract);
- }else if (fitstSchedule.getStageName().equals("璐у埌绛炬敹")) {
+ } else if (fitstSchedule.getStageName().equals("璐у埌绛炬敹")) {
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName("璐у埌绛炬敹");
baseMapper.updateById(contract);
- }else if (fitstSchedule.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+ } else if (fitstSchedule.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName("璋冭瘯瀹屾垚鎴栭獙鏀�");
baseMapper.updateById(contract);
- }else {
+ } else {
//鏂板搴旀敹
- PaymentConfirm paymentConfirm = new PaymentConfirm();
- paymentConfirm.setBusinessType("璐ㄤ繚閲�");
- paymentConfirm.setBusGuestId(contract.getPartyAId());
- paymentConfirm.setBusGuestName(contract.getPartyA());
- paymentConfirm.setContractId(contract.getId());
- paymentConfirm.setContractName(contract.getContractName());
- paymentConfirm.setContractNo(contract.getContractNo());
- paymentConfirm.setScheduleId(fitstSchedule.getId());
- paymentConfirm.setScheduleName(fitstSchedule.getStageName());
- paymentConfirm.setConfirmTime(new Date());
- paymentConfirm.setTransationAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setReceivableAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setTotalAmount(fitstSchedule.getPlannedAmount().multiply(new BigDecimal("-1")));
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- BigDecimal lastNewTotal = new BigDecimal("0");
- if(ObjUtil.isNotNull(lastNewConfirm)){
- lastNewTotal = lastNewConfirm.getTotalAmount();
- }
- paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
- paymentConfirmMapper.insert(paymentConfirm);
+ savePaymentConfirm(contract, fitstSchedule);
}
//鏌ヨ鏄惁鏈夊悗缁樁娈�
List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.eq(ContractPaymentSchedule::getContractId, fitstSchedule.getContractId())
.gt(ContractPaymentSchedule::getStageOrder, fitstSchedule.getStageOrder())
.orderByAsc(ContractPaymentSchedule::getCreateTime));
- if (ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()==1){
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() == 1) {
//鏈�鍚庨樁娈电敓鏁堟椂闂�
ContractPaymentSchedule endSchedule = afterSchedule.get(0);
- if (StrUtil.equals(endSchedule.getStageName(),"璐ㄤ繚閲�")){
- endSchedule.setEffectiveDate(DateUtil.offsetDay(new Date(),endSchedule.getAgreedDays()));
- endSchedule.setEffectiveEndDate(contract.getExpirationDate());
- contractPaymentScheduleMapper.updateById(endSchedule);
- //绗竴闃舵鐢熸晥鏃堕棿
- fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
- fitstSchedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
- contractPaymentScheduleMapper.updateById(fitstSchedule);
-
+ if (StrUtil.equals(endSchedule.getStageName(), "璐ㄤ繚閲�")) {
+// endSchedule.setEffectiveEndDate(DateUtil.offsetDay(new Date(),endSchedule.getAgreedDays()));
+// contractPaymentScheduleMapper.updateById(endSchedule);
//鏈�鍚庨樁娈靛簲鏀�
PaymentConfirm newConfim = new PaymentConfirm();
- newConfim.setBusinessType(endSchedule.getStageName()+"搴旀敹");
+ newConfim.setBusinessType(endSchedule.getStageName() + "搴旀敹");
newConfim.setBusGuestId(contract.getPartyAId());
newConfim.setBusGuestName(contract.getPartyA());
newConfim.setContractId(contract.getId());
@@ -309,32 +290,103 @@
newConfim.setConfirmTime(new Date());
newConfim.setTransationAmount(endSchedule.getPlannedAmount());
newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
BigDecimal lastNewTotal = new BigDecimal("0");
- if(ObjUtil.isNotNull(lastNewConfirm)){
+ if (ObjUtil.isNotNull(lastNewConfirm)) {
lastNewTotal = lastNewConfirm.getTotalAmount();
}
newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
- paymentConfirmMapper.insert(newConfim);
+ if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(newConfim);
+ }
}
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName(endSchedule.getStageName());
baseMapper.updateById(contract);
}
- if(ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()>1){
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() > 1) {
//绗竴闃舵鐢熸晥鏃堕棿
- fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
- contractPaymentScheduleMapper.updateById(fitstSchedule);
+// fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
+// contractPaymentScheduleMapper.updateById(fitstSchedule);
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName(afterSchedule.get(0).getStageName());
baseMapper.updateById(contract);
}
//鍙湁褰撳墠鍚堝悓绛惧瓧闃舵
- if(ArrayUtil.isEmpty(afterSchedule.toArray())){
- fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
- fitstSchedule.setEffectiveEndDate(contract.getExpirationDate());
- contractPaymentScheduleMapper.updateById(fitstSchedule);
+// if(ArrayUtil.isEmpty(afterSchedule.toArray())){
+// fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
+// contractPaymentScheduleMapper.updateById(fitstSchedule);
+// }
+ }
+
+ private void savePaymentConfirm(Contract contract, ContractPaymentSchedule schedule) {
+ PaymentConfirm paymentConfirm = new PaymentConfirm();
+ paymentConfirm.setBusinessType(schedule.getStageName() + "搴旀敹");
+ paymentConfirm.setBusGuestId(contract.getPartyAId());
+ paymentConfirm.setBusGuestName(contract.getPartyA());
+ paymentConfirm.setContractId(contract.getId());
+ paymentConfirm.setContractName(contract.getContractName());
+ paymentConfirm.setContractNo(contract.getContractNo());
+ paymentConfirm.setScheduleId(schedule.getId());
+ paymentConfirm.setScheduleName(schedule.getStageName());
+ paymentConfirm.setConfirmTime(new Date());
+ paymentConfirm.setTransationAmount(schedule.getPlannedAmount());
+ paymentConfirm.setReceivableAmount(schedule.getPlannedAmount());
+ paymentConfirm.setTotalAmount(schedule.getPlannedAmount().multiply(new BigDecimal("-1")));
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ BigDecimal lastNewTotal = new BigDecimal("0");
+ if (ObjUtil.isNotNull(lastNewConfirm)) {
+ lastNewTotal = lastNewConfirm.getTotalAmount();
+ }
+ paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
+ //瀹㈡埛浠樻瀹屾垚鍚堝悓
+ List<Contract> customerCompleteContractList = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
+ .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
+ if (ArrayUtil.isNotEmpty(customerCompleteContractList)) {
+ List<BigDecimal> outAmountList = new ArrayList<>();
+ for (Contract completeContract : customerCompleteContractList
+ ) {
+ PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, completeContract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ //鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
+ if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
+ //鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
+ PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm, PaymentConfirm.class, "id", "transationAmount",
+ "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
+ outConfirm.setBusinessType("璧勯噾杞嚭");
+ outConfirm.setConfirmTime(new Date());
+ outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
+ outConfirm.setTotalAmount(new BigDecimal("0"));
+ paymentConfirmMapper.insert(outConfirm);
+ outAmountList.add(outConfirm.getTransationAmount());
+ }
+ }
+ if (ArrayUtil.isNotEmpty(outAmountList.toArray())) {
+ BigDecimal currentSum = new BigDecimal("0");
+ for (BigDecimal currentAmount : outAmountList
+ ) {
+ currentSum = currentSum.add(currentAmount);
+ //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
+ PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, PaymentConfirm.class, "id", "transationAmount",
+ "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
+ inConfirm.setBusinessType("璧勯噾杞叆");
+ inConfirm.setConfirmTime(new Date());
+ inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
+ inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentSum));
+ if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
+ inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
+ } else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
+ inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+ }
+ paymentConfirmMapper.insert(inConfirm);
+ }
+ }
+
}
}
@@ -342,8 +394,9 @@
public R genCurrentOverdue() {
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.lt(ContractPaymentSchedule::getEffectiveEndDate, DateUtil.today())
- .ne(ContractPaymentSchedule::getPaymentStatus,"2"));
- if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
+ .ne(ContractPaymentSchedule::getPaymentStatus, "2")
+ .ne(ContractPaymentSchedule::getPaymentStatus,3));
+ if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
scheduleList.stream().forEach(contractPaymentSchedule -> {
Contract contract = baseMapper.selectById(contractPaymentSchedule.getContractId());
//搴旀敹瓒呮湡
@@ -357,10 +410,10 @@
overdueConfirm.setConfirmTime(new Date());
overdueConfirm.setScheduleId(contractPaymentSchedule.getId());
overdueConfirm.setScheduleName(contractPaymentSchedule.getStageName());
- PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+ PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- overdueConfirm.setTransationAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus()+"","0")?
- contractPaymentSchedule.getPlannedAmount():
+ overdueConfirm.setTransationAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
+ contractPaymentSchedule.getPlannedAmount() :
contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
overdueConfirm.setReceivableAmount(newLastConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
overdueConfirm.setOverdueAmount(overdueConfirm.getTransationAmount());
@@ -369,7 +422,7 @@
//鍒ゆ柇褰撳墠闃舵鏄惁宸茬敓鎴愪笂闃舵搴旀敹瓒呮湡
PaymentConfirm oiverdueConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getScheduleId, contractPaymentSchedule.getId())
.eq(PaymentConfirm::getBusinessType, "搴旀敹瓒呮湡"));
- if (ObjUtil.isNull(oiverdueConfirm)) {
+ if (ObjUtil.isNull(oiverdueConfirm) && overdueConfirm.getTransationAmount().compareTo(new BigDecimal("0")) > 0) {
overdueConfirm.setCompId(contractPaymentSchedule.getCompId());
paymentConfirmMapper.insert(overdueConfirm);
}
@@ -383,20 +436,154 @@
currentOverdue.setScheduleName(contractPaymentSchedule.getStageName());
currentOverdue.setCompId(contract.getCompId());
currentOverdue.setContractExpirTime(contractPaymentSchedule.getEffectiveEndDate());
- currentOverdue.setReceivableAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus()+"","0")?
- contractPaymentSchedule.getPlannedAmount():contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
- currentOverdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(),new Date(),true)));
- CurrentOverdue overdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getContractId,currentOverdue.getContractId())
- .eq(CurrentOverdue::getScheduleId,currentOverdue.getScheduleId()).last("limit 1"));
- if (ObjUtil.isNull(overdue)){
+ currentOverdue.setReceivableAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
+ contractPaymentSchedule.getPlannedAmount() : contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
+ currentOverdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
+ CurrentOverdue overdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getContractId, currentOverdue.getContractId())
+ .eq(CurrentOverdue::getScheduleId, currentOverdue.getScheduleId()).last("limit 1"));
+ if (ObjUtil.isNull(overdue)) {
currentOverdue.setCompId(contractPaymentSchedule.getCompId());
- currentOverdueMapper.insert(currentOverdue);
- }else {
- overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(),new Date(),true)));
+ if (currentOverdue.getReceivableAmount().compareTo(new BigDecimal("0")) > 0) {
+ currentOverdueMapper.insert(currentOverdue);
+ }
+ } else {
+ overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
currentOverdueMapper.updateById(overdue);
}
});
}
return R.ok();
}
+
+ @Override
+ public R refuseApproval(Long id) {
+ Contract contract = baseMapper.selectById(id);
+ contract.setContractStatus(0);
+ baseMapper.updateById(contract);
+ return R.ok();
+ }
+
+ @Override
+ public R copyNewContract(Long id) {
+ Contract oldContract = baseMapper.selectById(id);
+ Contract newContract = BeanUtil.copyProperties(oldContract, Contract.class, "id", "createTime");
+ newContract.setContractNo(ContractNumberGenerator.generateContractNumber());
+ newContract.setPaidAmount(new BigDecimal("0"));
+ newContract.setBillingStatus("0");
+ newContract.setErpPushFlag("0");
+ newContract.setContractStatus(0);
+ List<Contract> contracts;
+ contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, newContract.getContractNo()));
+ while (ArrayUtil.isNotEmpty(contracts.toArray())) {
+ newContract.setContractNo(ContractNumberGenerator.generateContractNumber());
+ contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, newContract.getContractNo()));
+ }
+ baseMapper.insert(newContract);
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, id));
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatter, ContractSubjectMatter.class, "id", "createTime");
+ subjectMatter.setContractId(newContract.getId());
+ subjectMatter.setDeliveryStatus(0);
+ subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+ subjectMatter.setRemainingQuantity(new BigDecimal("0"));
+ contractSubjectMatterMapper.insert(subjectMatter);
+ });
+ List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, id));
+ scheduleList.stream().forEach(contractPaymentSchedule -> {
+ ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentSchedule, ContractPaymentSchedule.class, "id", "createTime");
+ schedule.setContractId(newContract.getId());
+ schedule.setPaymentStatus(0);
+ schedule.setActualAmount(new BigDecimal("0"));
+ schedule.setEffectiveDate(null);
+ schedule.setEffectiveEndDate(null);
+ contractPaymentScheduleMapper.insert(schedule);
+ });
+ return R.ok();
+ }
+
+ @Override
+ public void exportContractYMJJGCLWord(Long id, HttpServletResponse response) {
+ Contract contract = baseMapper.selectById(id);
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId, id).orderByAsc(ContractSubjectMatter::getCreateTime));
+ Map<String, Object> map = new HashMap<>();
+ //鍚堝悓鍩烘湰淇℃伅
+ map.put("partyA", contract.getPartyA());
+ map.put("partyB", contract.getPartyB());
+ map.put("contractNo", contract.getContractNo());
+ map.put("signPlace", contract.getSignPlace());
+ map.put("signDate", DateUtil.formatDate(contract.getSignDate()));
+ map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
+ map.put("total", contract.getAmount());
+ map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
+ //鏍囩殑鐗�
+ List<Map<String, Object>> items = new ArrayList<>();
+ List<RowRenderData> dataList = new ArrayList<>();
+ AtomicReference<Integer> no = new AtomicReference<>(0);
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ Map<String, Object> item = new HashMap<>();
+ item.put("no", no);
+ item.put("materialName", contractSubjectMatter.getMaterialName());
+ item.put("guige", "");
+ item.put("unit", "");
+ item.put("quantity", contractSubjectMatter.getQuantity());
+ item.put("danzhong", "");
+ item.put("zongzhong", "");
+ item.put("unitPrice", contractSubjectMatter.getUnitPrice());
+ item.put("price", contractSubjectMatter.getTotalAmount());
+ items.add(item);
+ no.updateAndGet(v -> v + 1);
+ });
+ map.put("items", items);
+ //瀹氬埗鏂�
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ map.put("companyName", customer.getCompanyName());
+ map.put("legalPerson", customer.getLegalPerson());
+ map.put("contactPhone", customer.getContactPhone());
+ map.put("bankName", customer.getBankName());
+ map.put("bankAccount", customer.getBankAccount());
+
+ //鎵挎徑鏂�
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ SysDept dept = r.getData();
+ map.put("companyName", dept.getOrgName());
+ map.put("legalPerson1", StrUtil.isNotEmpty(dept.getLegalPerson()) ? dept.getLegalPerson() : "");
+ map.put("entrustedAgent", StrUtil.isNotEmpty(dept.getLegalPerson()) ? "" : dept.getEntrustedAgent());
+ map.put("orgContact", dept.getOrgContact());
+ map.put("orgBank", dept.getOrgBank());
+ map.put("orgBankAccount", dept.getOrgBankAccount());
+
+ //鐢熸垚鏂囦欢鍚�
+ Long time = new Date().getTime();
+ // 鐢熸垚鐨剋ord鏍煎紡
+ String formatSuffix = ".docx";
+ // 鎷兼帴鍚庣殑鏂囦欢鍚�
+ String fileName = time + formatSuffix;//鏂囦欢鍚� 甯﹀悗缂�
+ //瀵煎嚭word
+ try {
+ // 1. 鍔犺浇妯＄増
+ // 鍋囪妯＄増鍦� resources/templates/template.docx
+ ClassPathResource resource = new ClassPathResource("template/ymjjgclht.docx");
+ // 閰嶇疆鍒楄〃绛栫暐
+ Configure config = Configure.builder()
+ .bind("items", new LoopRowTableRenderPolicy()) // 灏� items 缁戝畾鍒拌寰幆绛栫暐
+ .build();
+ // 2. 缂栬瘧骞舵覆鏌撴暟鎹�
+ XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(), config).render(map);
+
+ // 3. 璁剧疆鍝嶅簲澶�
+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".docx");
+
+ // 4. 鍐欏叆杈撳嚭娴�
+ OutputStream out = response.getOutputStream();
+ xwpfTemplate.write(out);
+ out.flush();
+ out.close();
+ xwpfTemplate.close(); // 閲嶈锛氬叧闂ā鐗堥噴鏀捐祫婧�
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.9.1