feat:统计数据测试调整

shiyunteng

2026-05-25 633a003d232e37c79b7135ccda35eda1c69952c6

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java

@@ -64,7 +64,7 @@

   @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());
@@ -72,14 +72,14 @@
      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());
@@ -91,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())) {
@@ -106,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);
            }
@@ -125,31 +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);
@@ -161,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 -> {
@@ -172,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);
            }
@@ -191,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;
   }
@@ -220,11 +228,11 @@
      Contract contract = baseMapper.selectById(id);
      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("合同签订")) {
         //新增应收
         savePaymentConfirm(contract,fitstSchedule);
         savePaymentConfirm(contract, fitstSchedule);

         //新增合同履约记录
         ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
@@ -242,42 +250,36 @@
//            contract.setContractStatus(3);
//            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 if (fitstSchedule.getStageName().equals("调试完成或验收")) {
      } else if (fitstSchedule.getStageName().equals("调试完成或验收")) {
         //更新合同下个阶段
         contract.setNextScheduleName("调试完成或验收");
         baseMapper.updateById(contract);
      }else {
      } else {
         //新增应收
         savePaymentConfirm(contract,fitstSchedule);
         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());
@@ -288,14 +290,14 @@
            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()));
            if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
            if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
               paymentConfirmMapper.insert(newConfim);
            }
         }
@@ -303,25 +305,24 @@
         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.setBusinessType(schedule.getStageName() + "应收");
      paymentConfirm.setBusGuestId(contract.getPartyAId());
      paymentConfirm.setBusGuestName(contract.getPartyA());
      paymentConfirm.setContractId(contract.getId());
@@ -333,30 +334,30 @@
      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())
      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();
      }
      paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
      if (schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0){
      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)){
            .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())
         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){
            if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
               //新增完成付款合同 资金转出
               PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm,PaymentConfirm.class,"id","transationAmount",
                     "advanceAmount","receivableAmount","overdueAmount","totalAmount");
               PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm, PaymentConfirm.class, "id", "transationAmount",
                     "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
               outConfirm.setBusinessType("资金转出");
               outConfirm.setConfirmTime(new Date());
               outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
@@ -365,21 +366,21 @@
               outAmountList.add(outConfirm.getTransationAmount());
            }
         }
         if (ArrayUtil.isNotEmpty(outAmountList.toArray())){
         if (ArrayUtil.isNotEmpty(outAmountList.toArray())) {
            BigDecimal currentSum = new BigDecimal("0");
            for (BigDecimal currentAmount:outAmountList
                ) {
               currentSum=currentSum.add(currentAmount);
            for (BigDecimal currentAmount : outAmountList
            ) {
               currentSum = currentSum.add(currentAmount);
               //新增当前合同 资金转入
               PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm,PaymentConfirm.class,"id","transationAmount",
                     "advanceAmount","receivableAmount","overdueAmount","totalAmount");
               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){
               if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
                  inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
               }else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
               } else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
                  inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
               }
               paymentConfirmMapper.insert(inConfirm);
@@ -393,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());
            //应收超期
@@ -408,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());
@@ -420,7 +422,7 @@
            //判断当前阶段是否已生成上阶段应收超期
            PaymentConfirm oiverdueConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getScheduleId, contractPaymentSchedule.getId())
                  .eq(PaymentConfirm::getBusinessType, "应收超期"));
            if (ObjUtil.isNull(oiverdueConfirm)&&overdueConfirm.getTransationAmount().compareTo(new BigDecimal("0"))>0) {
            if (ObjUtil.isNull(oiverdueConfirm) && overdueConfirm.getTransationAmount().compareTo(new BigDecimal("0")) > 0) {
               overdueConfirm.setCompId(contractPaymentSchedule.getCompId());
               paymentConfirmMapper.insert(overdueConfirm);
            }
@@ -434,18 +436,18 @@
            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());
               if (currentOverdue.getReceivableAmount().compareTo(new BigDecimal("0"))>0){
               if (currentOverdue.getReceivableAmount().compareTo(new BigDecimal("0")) > 0) {
                  currentOverdueMapper.insert(currentOverdue);
               }
            }else {
               overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(),new Date(),true)));
            } else {
               overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
               currentOverdueMapper.updateById(overdue);
            }
         });
@@ -464,31 +466,31 @@
   @Override
   public R copyNewContract(Long id) {
      Contract oldContract = baseMapper.selectById(id);
      Contract newContract = BeanUtil.copyProperties(oldContract,Contract.class,"id","createTime");
      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())){
      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()));
         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));
      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");
         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));
      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");
         ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentSchedule, ContractPaymentSchedule.class, "id", "createTime");
         schedule.setContractId(newContract.getId());
         schedule.setPaymentStatus(0);
         schedule.setActualAmount(new BigDecimal("0"));
@@ -503,53 +505,53 @@
   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<>();
            .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("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<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());
         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);
      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());
      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());
      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();
@@ -567,7 +569,7 @@
               .bind("items", new LoopRowTableRenderPolicy()) // 将 items 绑定到行循环策略
               .build();
         // 2. 编译并渲染数据
         XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(),config).render(map);
         XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(), config).render(map);

         // 3. 设置响应头
         response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
@@ -580,7 +582,7 @@
         out.flush();
         out.close();
         xwpfTemplate.close(); // 重要：关闭模版释放资源
      }catch (IOException e) {
      } catch (IOException e) {
         e.printStackTrace();
      }
   }