feat:统计数据测试调整

shiyunteng

2026-05-25 633a003d232e37c79b7135ccda35eda1c69952c6

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

@@ -81,17 +81,17 @@

      //更新当前阶段
      if (ObjUtil.isNull(schedule.getEffectiveDate()) && ObjUtil.isNull(schedule.getEffectiveEndDate())) {
         schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
         schedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
         contractPaymentScheduleMapper.updateById(schedule);
      }

      //查询是否有之前阶段
      ContractPaymentSchedule beforeSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
            .lt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()).orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
      if (ObjUtil.isNotNull(beforeSchedule) && ObjUtil.isNull(beforeSchedule.getEffectiveEndDate())) {
         beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
         contractPaymentScheduleMapper.updateById(beforeSchedule);
      }
//      //查询是否有之前阶段
//      ContractPaymentSchedule beforeSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
//            .lt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()).orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
//      if (ObjUtil.isNotNull(beforeSchedule) && ObjUtil.isNull(beforeSchedule.getEffectiveEndDate())) {
//         beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
//         contractPaymentScheduleMapper.updateById(beforeSchedule);
//      }

      List<ContractOutBound> contractOutBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery().eq(ContractOutBound::getContractId, contract.getId())
            .isNotNull(ContractOutBound::getArrivalTime));
@@ -186,13 +186,11 @@
                  //最后阶段生效时间
                  ContractPaymentSchedule endSchedule = afterSchedule.get(0);
                  if (StrUtil.equals(endSchedule.getStageName(), "质保金")) {
                     endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
                     endSchedule.setEffectiveEndDate(contract.getExpirationDate());
                     endSchedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
                     contractPaymentScheduleMapper.updateById(endSchedule);
                     //当前阶段生效时间
                     schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
                     schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
                     contractPaymentScheduleMapper.updateById(schedule);
//                     schedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
//                     contractPaymentScheduleMapper.updateById(schedule);
                     //最后阶段应收
                     PaymentConfirm newConfim = new PaymentConfirm();
                     newConfim.setBusinessType(endSchedule.getStageName() + "应收");
@@ -228,8 +226,8 @@
                  contractMapper.updateById(contract);
               }
               if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
                  schedule.setEffectiveEndDate(contract.getExpirationDate());
                  contractPaymentScheduleMapper.updateById(schedule);
//                  schedule.setEffectiveEndDate(contract.getExpirationDate());
//                  contractPaymentScheduleMapper.updateById(schedule);
                  //更新合同下个阶段
                  contract.setNextScheduleName("无");
                  contractMapper.updateById(contract);
@@ -277,12 +275,10 @@
            //最后阶段生效时间
            ContractPaymentSchedule endSchedule = afterSchedule.get(0);
            if (StrUtil.equals(endSchedule.getStageName(), "质保金")) {
               endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
               endSchedule.setEffectiveEndDate(contract.getExpirationDate());
               endSchedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
               contractPaymentScheduleMapper.updateById(endSchedule);
               //当前阶段生效时间
               schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
               schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
               schedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
               contractPaymentScheduleMapper.updateById(schedule);
               //最后阶段应收
               PaymentConfirm newConfim = new PaymentConfirm();
@@ -319,8 +315,8 @@
            contractMapper.updateById(contract);
         }
         if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
            schedule.setEffectiveEndDate(contract.getExpirationDate());
            contractPaymentScheduleMapper.updateById(schedule);
//            schedule.setEffectiveEndDate(contract.getExpirationDate());
//            contractPaymentScheduleMapper.updateById(schedule);
            //更新合同下个阶段
            contract.setNextScheduleName("无");
            contractMapper.updateById(contract);
@@ -396,7 +392,7 @@
                  ContractPaymentSchedule::getPlannedAmount, ContractPaymentSchedule::getPlannedAmount,
                  ContractPaymentSchedule::getEffectiveEndDate, ContractPaymentSchedule::getPaymentDate,
                  ContractPaymentSchedule::getPaymentStatus, ContractPaymentSchedule::getActualAmount,
                  ContractPaymentSchedule::getAgreedDays)
                  ContractPaymentSchedule::getAgreedDays,ContractPaymentSchedule::getPaymentRatio)
            .select(ContractPaymentScheduleProcess::getProcessDate)
            .leftJoin(ContractPaymentScheduleProcess.class, ContractPaymentScheduleProcess::getScheduleId, ContractPaymentSchedule::getId)
            .eq(ContractPaymentSchedule::getContractId, id)