feat:合同审核、出库及履约阶段代码优化

shiyunteng

2026-08-27 b1b3da5393c75ced1afa1467be69d60af5403878

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

@@ -28,6 +28,8 @@
import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
import com.by4cloud.platformx.business.service.ContractPaymentScheduleService;
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.business.utils.BatchInsertListener;
import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
@@ -89,6 +91,7 @@
   private final StringRedisTemplate redisTemplate;
   private final ContractOutBoundMapper contractOutBoundMapper;
   private final RemoteDictService remoteDictService;
   private final ContractPaymentScheduleProcessService processService;

   @Value("${erp.ymj}")
   private String ymjErp;
@@ -136,8 +139,9 @@
         if (ObjUtil.isNotNull(bc)) {
            contract.setPartyA(bc.getCompanyName());
         }
         if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())) {
            return R.failed("请完善客户ERP编码");
         if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())
               && StrUtil.isEmpty(bc.getCreditCode())) {
            return R.failed("请完善客户ERP编码或组织机构代码");
         }
      }

@@ -464,209 +468,90 @@
      Contract contract = baseMapper.selectById(id);
      contract.setContractStatus(2);
      baseMapper.updateById(contract);


      //水电房租 执行日
      List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
            .eq(ContractSubjectMatter::getContractId, id));
      if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
         if (CollUtil.isNotEmpty(subjectMatterList)) {
            for (ContractSubjectMatter contractSubjectMatter : subjectMatterList) {
               if (StrUtil.equals(contract.getExecFrequency(), "1")) {
                  Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfWeek(contract.getEffectiveDate()),
                        DateUtil.endOfWeek(contract.getExpirationDate()), true) + 1;
                  //循环日期
                  Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
                  for (int i = 0; i < weeksTrue.intValue(); i++) {
                     Date execDatei = DateUtil.offsetWeek(execDate0, i);
                     ContractExecDate execDate = new ContractExecDate();
                     execDate.setContractId(contract.getId());
                     execDate.setMatterId(contractSubjectMatter.getId());
                     execDate.setExecDate(execDatei);
                     execDate.setGenFlag("0");
                     if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                        contractExecDateMapper.insert(execDate);
                     }
                  }
               }
               if (StrUtil.equals(contract.getExecFrequency(), "2")) {
                  Long weeksTrue = DateUtil.betweenMonth(DateUtil.beginOfMonth(contract.getEffectiveDate()),
                        DateUtil.endOfMonth(contract.getExpirationDate()), true) + 1;
                  //循环日期
                  Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfMonth(contract.getEffectiveDate()), contract.getExecDay());
                  for (int i = 0; i < weeksTrue.intValue(); i++) {
                     Date execDatei = DateUtil.offsetMonth(execDate0, i);
                     ContractExecDate execDate = new ContractExecDate();
                     execDate.setContractId(contract.getId());
                     execDate.setMatterId(contractSubjectMatter.getId());
                     execDate.setExecDate(execDatei);
                     execDate.setGenFlag("0");
                     if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                        contractExecDateMapper.insert(execDate);
                     }
                  }
               }
               if (StrUtil.equals(contract.getExecFrequency(), "3")) {
                  Long weeksTrue = (DateUtil.betweenMonth(DateUtil.beginOfQuarter(contract.getEffectiveDate()),
                        DateUtil.endOfQuarter(contract.getExpirationDate()), true) + 1) / 3;

                  //循环日期
                  Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfQuarter(contract.getEffectiveDate()), contract.getExecDay());
                  for (int i = 0; i < weeksTrue.intValue(); i++) {
                     Date execDatei = DateUtil.offsetMonth(execDate0, i * 3);
                     ContractExecDate execDate = new ContractExecDate();
                     execDate.setContractId(contract.getId());
                     execDate.setMatterId(contractSubjectMatter.getId());
                     execDate.setExecDate(execDatei);
                     execDate.setGenFlag("0");
                     if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                        contractExecDateMapper.insert(execDate);
                     }
                  }
               }
               if (StrUtil.equals(contract.getExecFrequency(), "4")) {
                  Date startDate = contract.getEffectiveDate();
                  Date endDate = contract.getExpirationDate();
                  Integer startMonth = DateUtil.month(contract.getEffectiveDate());
                  Integer endMonth = DateUtil.month(contract.getExpirationDate());
                  if (1 <= startMonth && startMonth <= 6) {
                     startDate = DateUtil.beginOfYear(startDate);
                  }
                  if (7 <= startMonth && startMonth <= 12) {
                     startDate = DateUtil.offsetMonth(DateUtil.beginOfYear(startDate), 6);
                  }
                  if (1 <= endMonth && endMonth <= 6) {
                     endDate = DateUtil.offsetMonth(DateUtil.endOfYear(endDate), -6);
                  }
                  if (7 <= endMonth && endMonth <= 12) {
                     endDate = DateUtil.endOfYear(endDate);
                  }
                  Long weeksTrue = (DateUtil.betweenMonth(startDate, endDate, true) + 1) / 6;
                  //循环日期
                  Date execDate0 = DateUtil.offsetDay(startDate, contract.getExecDay());
                  for (int i = 0; i < weeksTrue.intValue(); i++) {
                     Date execDatei = DateUtil.offsetMonth(execDate0, i * 6);
                     ContractExecDate execDate = new ContractExecDate();
                     execDate.setContractId(contract.getId());
                     execDate.setMatterId(contractSubjectMatter.getId());
                     execDate.setExecDate(execDatei);
                     execDate.setGenFlag("0");
                     if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                        contractExecDateMapper.insert(execDate);
                     }
                  }
               }
               if (StrUtil.equals(contract.getExecFrequency(), "5")) {
                  Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfYear(contract.getEffectiveDate()),
                        DateUtil.endOfYear(contract.getExpirationDate()), true) + 1;
                  //循环日期
                  Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfYear(contract.getEffectiveDate()), contract.getExecDay());
                  for (int i = 0; i < weeksTrue.intValue(); i++) {
                     Date execDatei = DateUtil.offsetWeek(execDate0, i);
                     ContractExecDate execDate = new ContractExecDate();
                     execDate.setContractId(contract.getId());
                     execDate.setMatterId(contractSubjectMatter.getId());
                     execDate.setExecDate(execDatei);
                     execDate.setGenFlag("0");
                     if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                        contractExecDateMapper.insert(execDate);
                     }
                  }
               }

            }
         }
      } else {
         ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId())
               .orderByAsc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
         if (fitstSchedule.getStageName().equals("合同签订")) {
            //新增应收
            savePaymentConfirm(contract, fitstSchedule);

            //新增合同履约记录
            ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
            process.setContractId(contract.getId());
            process.setContractName(contract.getContractName());
            process.setScheduleId(fitstSchedule.getId());
            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 (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("货到签收")) {
            //更新合同下个阶段
            contract.setNextScheduleName("货到签收");
            baseMapper.updateById(contract);
         } else if (fitstSchedule.getStageName().equals("调试完成或验收")) {
            //更新合同下个阶段
            contract.setNextScheduleName("调试完成或验收");
            baseMapper.updateById(contract);
         } else {
            //新增应收
            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) && afterSchedule.size() == 1) {
            //最后阶段生效时间
            ContractPaymentSchedule endSchedule = afterSchedule.get(0);
            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.setBusGuestId(contract.getPartyAId());
               newConfim.setBusGuestName(contract.getPartyA());
               newConfim.setContractId(contract.getId());
               newConfim.setContractName(contract.getContractName());
               newConfim.setContractNo(contract.getContractNo());
               newConfim.setScheduleId(endSchedule.getId());
               newConfim.setScheduleName(endSchedule.getStageName());
               newConfim.setConfirmTime(new Date());
               newConfim.setTransationAmount(endSchedule.getPlannedAmount());
               newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
               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();
               }
               newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
               if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
                  paymentConfirmMapper.insert(newConfim);
               }
            }
            //更新合同下个阶段
            contract.setNextScheduleName(endSchedule.getStageName());
            baseMapper.updateById(contract);
         }
         if (ArrayUtil.isNotEmpty(afterSchedule) && afterSchedule.size() > 1) {
            //第一阶段生效时间
//         fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
//         contractPaymentScheduleMapper.updateById(fitstSchedule);
            //更新合同下个阶段
            contract.setNextScheduleName(afterSchedule.get(0).getStageName());
            baseMapper.updateById(contract);
         }
         //只有当前合同签字阶段
//      if(ArrayUtil.isEmpty(afterSchedule)){
//         fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
//         contractPaymentScheduleMapper.updateById(fitstSchedule);
//      }
         handleWaterHouseCycle(contract,subjectMatterList);
         return;
      }
      //资金明细
      savePaymentConfirm(contract);

      //合同推送子公司
      pushSubCompany(contract,subjectMatterList);

      //合同中心推送
      pusnContractCenter(contract,subjectMatterList);

      contract.setNextScheduleName("发货前");
      baseMapper.updateById(contract);
   }

   private void pusnContractCenter(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
      new Thread(() -> {
         try {
            JSONObject requestApply = new JSONObject();
            requestApply.put("fd_selectionmethod", "公开招标");
            requestApply.put("fd_isrelated", "是");
            requestApply.put("fd_bizId", contract.getId());
            requestApply.put("fd_remark", contract.getRemark());
            requestApply.put("fd_MainContent", "");
            requestApply.put("fd_settlementType", "00");
            requestApply.put("fd_applyType", "外销");
            requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
            requestApply.put("fd_docNumber", contract.getContractNo());
            requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
            requestApply.put("fd_name", contract.getContractName());
            requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
            requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
            requestApply.put("fd_contractCreater", contract.getNickName());
            requestApply.put("fd_currency", "人民币");
            requestApply.put("fd_ContractAmount", contract.getAmount());
            requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
                  .multiply(new BigDecimal("87")));
            requestApply.put("fd_docStatus", "20");
            requestApply.put("fd_taxRates", 13);
            requestApply.put("fd_customerName", contract.getPartyA());
            requestApply.put("fd_systemSource", "非煤销售系统");
            requestApply.put("fd_type", "00");
            log.info("合同中心合同起草接口入参：{}", requestApply.toJSONString());
            String respApply = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
            log.info("合同中心合同起草接口回参：{}", respApply);
            JSONObject applyResp = JSONObject.parseObject(respApply);
            if (applyResp.getString("code").equals("00")) {
               JSONObject request = new JSONObject();
               request.put("fd_docNumber", contract.getContractNo());
               request.put("fd_singer", contract.getNickName());
               request.put("fd_signTime", DateUtil.formatDate(contract.getSignDate()));
               request.put("fd_linkPerson", "");
               request.put("fd_linkPhone", "");
               request.put("fd_address", contract.getSignPlace());
               request.put("fd_receivedTime", DateUtil.format(contract.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
               request.put("fd_receivedNum", 1);
               request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
               request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
               request.put("fd_reviewerNo", contract.getNickName());
               request.put("fd_docStatus", "20");
               request.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
               request.put("fd_attName", contract.getAttachmentName());
               request.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
               log.info("合同中心同步合同接口入参：{}", request.toJSONString());
               String resp = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addContractReview", request.toJSONString());
               log.info("合同中心同步合同接口回参：{}", resp);
               JSONObject respJson = JSONObject.parseObject(resp);
               if (respJson.getString("code").equals("00")) {
                  contract.setCenterPushFlag("1");
                  baseMapper.updateById(contract);
               }
            }
         } catch (Exception e) {
            e.printStackTrace();
         }
      }).start();
   }

   private void pushSubCompany(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
      //erp推送
      new Thread(() -> {
         try {
@@ -803,67 +688,127 @@
            e.printStackTrace();
         }
      }).start();
      //合同中心推送
      new Thread(() -> {
         try {
            JSONObject requestApply = new JSONObject();
            requestApply.put("fd_selectionmethod", "公开招标");
            requestApply.put("fd_isrelated", "是");
            requestApply.put("fd_bizId", contract.getId());
            requestApply.put("fd_remark", contract.getRemark());
            requestApply.put("fd_MainContent", "");
            requestApply.put("fd_settlementType", "00");
            requestApply.put("fd_applyType", "外销");
            requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
            requestApply.put("fd_docNumber", contract.getContractNo());
            requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
            requestApply.put("fd_name", contract.getContractName());
            requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
            requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
            requestApply.put("fd_contractCreater", contract.getNickName());
            requestApply.put("fd_currency", "人民币");
            requestApply.put("fd_ContractAmount", contract.getAmount());
            requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
                  .multiply(new BigDecimal("87")));
            requestApply.put("fd_docStatus", "20");
            requestApply.put("fd_taxRates", 13);
            requestApply.put("fd_customerName", contract.getPartyA());
            requestApply.put("fd_systemSource", "非煤销售系统");
            requestApply.put("fd_type", "00");
            log.info("合同中心合同起草接口入参：{}", requestApply.toJSONString());
            String respApply = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
            log.info("合同中心合同起草接口回参：{}", respApply);
            JSONObject applyResp = JSONObject.parseObject(respApply);
            if (applyResp.getString("code").equals("00")) {
               JSONObject request = new JSONObject();
               request.put("fd_docNumber", contract.getContractNo());
               request.put("fd_singer", contract.getNickName());
               request.put("fd_signTime", DateUtil.formatDate(contract.getSignDate()));
               request.put("fd_linkPerson", "");
               request.put("fd_linkPhone", "");
               request.put("fd_address", contract.getSignPlace());
               request.put("fd_receivedTime", DateUtil.format(contract.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
               request.put("fd_receivedNum", 1);
               request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
               request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
               request.put("fd_reviewerNo", contract.getNickName());
               request.put("fd_docStatus", "20");
               request.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
               request.put("fd_attName", contract.getAttachmentName());
               request.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
               log.info("合同中心同步合同接口入参：{}", request.toJSONString());
               String resp = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addContractReview", request.toJSONString());
               log.info("合同中心同步合同接口回参：{}", resp);
               JSONObject respJson = JSONObject.parseObject(resp);
               if (respJson.getString("code").equals("00")) {
                  contract.setCenterPushFlag("1");
                  baseMapper.updateById(contract);

   }

   private void saveScheduleProcess(Contract contract,ContractPaymentSchedule schedule) {
      //新增合同履约记录
      ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
      process.setContractId(contract.getId());
      process.setContractName(contract.getContractName());
      process.setScheduleId(schedule.getId());
      process.setScheduleName(schedule.getStageName());
      process.setProcessDate(contract.getSignDate());
      contractPaymentScheduleProcessMapper.insert(process);
   }

   private void handleWaterHouseCycle(Contract contract, List<ContractSubjectMatter> subjectMatterList) {
      if (CollUtil.isNotEmpty(subjectMatterList)) {
         for (ContractSubjectMatter contractSubjectMatter : subjectMatterList) {
            if (StrUtil.equals(contract.getExecFrequency(), "1")) {
               Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfWeek(contract.getEffectiveDate()),
                     DateUtil.endOfWeek(contract.getExpirationDate()), true) + 1;
               //循环日期
               Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
               for (int i = 0; i < weeksTrue.intValue(); i++) {
                  Date execDatei = DateUtil.offsetWeek(execDate0, i);
                  ContractExecDate execDate = new ContractExecDate();
                  execDate.setContractId(contract.getId());
                  execDate.setMatterId(contractSubjectMatter.getId());
                  execDate.setExecDate(execDatei);
                  execDate.setGenFlag("0");
                  if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                     contractExecDateMapper.insert(execDate);
                  }
               }
            }
         } catch (Exception e) {
            e.printStackTrace();
            if (StrUtil.equals(contract.getExecFrequency(), "2")) {
               Long weeksTrue = DateUtil.betweenMonth(DateUtil.beginOfMonth(contract.getEffectiveDate()),
                     DateUtil.endOfMonth(contract.getExpirationDate()), true) + 1;
               //循环日期
               Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfMonth(contract.getEffectiveDate()), contract.getExecDay());
               for (int i = 0; i < weeksTrue.intValue(); i++) {
                  Date execDatei = DateUtil.offsetMonth(execDate0, i);
                  ContractExecDate execDate = new ContractExecDate();
                  execDate.setContractId(contract.getId());
                  execDate.setMatterId(contractSubjectMatter.getId());
                  execDate.setExecDate(execDatei);
                  execDate.setGenFlag("0");
                  if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                     contractExecDateMapper.insert(execDate);
                  }
               }
            }
            if (StrUtil.equals(contract.getExecFrequency(), "3")) {
               Long weeksTrue = (DateUtil.betweenMonth(DateUtil.beginOfQuarter(contract.getEffectiveDate()),
                     DateUtil.endOfQuarter(contract.getExpirationDate()), true) + 1) / 3;

               //循环日期
               Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfQuarter(contract.getEffectiveDate()), contract.getExecDay());
               for (int i = 0; i < weeksTrue.intValue(); i++) {
                  Date execDatei = DateUtil.offsetMonth(execDate0, i * 3);
                  ContractExecDate execDate = new ContractExecDate();
                  execDate.setContractId(contract.getId());
                  execDate.setMatterId(contractSubjectMatter.getId());
                  execDate.setExecDate(execDatei);
                  execDate.setGenFlag("0");
                  if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                     contractExecDateMapper.insert(execDate);
                  }
               }
            }
            if (StrUtil.equals(contract.getExecFrequency(), "4")) {
               Date startDate = contract.getEffectiveDate();
               Date endDate = contract.getExpirationDate();
               Integer startMonth = DateUtil.month(contract.getEffectiveDate());
               Integer endMonth = DateUtil.month(contract.getExpirationDate());
               if (1 <= startMonth && startMonth <= 6) {
                  startDate = DateUtil.beginOfYear(startDate);
               }
               if (7 <= startMonth && startMonth <= 12) {
                  startDate = DateUtil.offsetMonth(DateUtil.beginOfYear(startDate), 6);
               }
               if (1 <= endMonth && endMonth <= 6) {
                  endDate = DateUtil.offsetMonth(DateUtil.endOfYear(endDate), -6);
               }
               if (7 <= endMonth && endMonth <= 12) {
                  endDate = DateUtil.endOfYear(endDate);
               }
               Long weeksTrue = (DateUtil.betweenMonth(startDate, endDate, true) + 1) / 6;
               //循环日期
               Date execDate0 = DateUtil.offsetDay(startDate, contract.getExecDay());
               for (int i = 0; i < weeksTrue.intValue(); i++) {
                  Date execDatei = DateUtil.offsetMonth(execDate0, i * 6);
                  ContractExecDate execDate = new ContractExecDate();
                  execDate.setContractId(contract.getId());
                  execDate.setMatterId(contractSubjectMatter.getId());
                  execDate.setExecDate(execDatei);
                  execDate.setGenFlag("0");
                  if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                     contractExecDateMapper.insert(execDate);
                  }
               }
            }
            if (StrUtil.equals(contract.getExecFrequency(), "5")) {
               Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfYear(contract.getEffectiveDate()),
                     DateUtil.endOfYear(contract.getExpirationDate()), true) + 1;
               //循环日期
               Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfYear(contract.getEffectiveDate()), contract.getExecDay());
               for (int i = 0; i < weeksTrue.intValue(); i++) {
                  Date execDatei = DateUtil.offsetWeek(execDate0, i);
                  ContractExecDate execDate = new ContractExecDate();
                  execDate.setContractId(contract.getId());
                  execDate.setMatterId(contractSubjectMatter.getId());
                  execDate.setExecDate(execDatei);
                  execDate.setGenFlag("0");
                  if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                     contractExecDateMapper.insert(execDate);
                  }
               }
            }

         }
      }).start();
      }
   }

   private void saveErpRequestRecord(String ymj, String toJSONString, String result) {
@@ -874,80 +819,44 @@
      erpRequestRecordMapper.insert(record);
   }

   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 (ObjUtil.isNotNull(contractLastConfirm) && 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());
   private void savePaymentConfirm(Contract contract) {
      ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
            .eq(ContractPaymentSchedule::getContractId, contract.getId())
            .eq(ContractPaymentSchedule::getStageName,"合同签订")
            .last("limit 1"));
      fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
      contractPaymentScheduleMapper.updateById(fitstSchedule);
      //报错履约记录
      saveScheduleProcess(contract,fitstSchedule);
      //保存资金明细
      if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
         //新增应收
         PaymentConfirm currentConfim = new PaymentConfirm();
         currentConfim.setBusinessType(fitstSchedule.getStageName() + "应收");
         currentConfim.setBusGuestId(contract.getPartyAId());
         currentConfim.setBusGuestName(contract.getPartyA());
         currentConfim.setContractId(contract.getId());
         currentConfim.setContractName(contract.getContractName());
         currentConfim.setContractNo(contract.getContractNo());
         currentConfim.setScheduleId(fitstSchedule.getId());
         currentConfim.setScheduleName(fitstSchedule.getStageName());
         currentConfim.setConfirmTime(contract.getSignDate());
         currentConfim.setTransationAmount(fitstSchedule.getPlannedAmount());
         currentConfim.setReceivableAmount(fitstSchedule.getPlannedAmount());
         PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
               .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
         if (ObjUtil.isNotNull(lastConfirm)) {
            currentConfim.setTotalAmount(lastConfirm.getTotalAmount().subtract(currentConfim.getTransationAmount()));
            if (contract.getContractNo().startsWith("ZB-")) {
               paymentConfirmMapper.insert(currentConfim);
            }
            return;
         }
         if (ArrayUtil.isNotEmpty(outAmountList)) {
            BigDecimal currentInSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
            //新增当前合同 资金转入
            PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, PaymentConfirm.class, "id", "transationAmount",
                  "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
            inConfirm.setBusinessType("资金转入");
            inConfirm.setConfirmTime(new Date());
            inConfirm.setTransationAmount(currentInSum);
            inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentInSum));
            //更新当前阶段实际收款 和 收款状态
            schedule.setActualAmount(inConfirm.getTransationAmount());
            schedule.setPaymentStatus(2);
            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")));
               schedule.setActualAmount(currentInSum);
               schedule.setPaymentStatus(1);
            }
            paymentConfirmMapper.insert(inConfirm);
            //更新当前阶段实际收款 和 收款状态
            contractPaymentScheduleMapper.updateById(schedule);
         }


      } else {
         paymentConfirmMapper.insert(paymentConfirm);
         currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
         paymentConfirmMapper.insert(currentConfim);
         processService.handleBeforeRemain(currentConfim,contract);
      }

   }

   @Override
@@ -2524,13 +2433,13 @@
            contract.setPartyB(SecurityUtils.getUser().getCompName());
            contract.setPartyBId(SecurityUtils.getUser().getCompId());
            contract.setContractStatus(2);
            contract.setPaidAmount(ObjUtil.isNotNull(contract.getPaidAmount())?
                  contract.getPaidAmount():new BigDecimal("0"));
            contract.setBillingAmout(ObjUtil.isNotNull(contract.getBillingAmout())?
                  contract.getBillingAmout():new BigDecimal("0"));
            contract.setPaidAmount(ObjUtil.isNotNull(contract.getPaidAmount()) ?
                  contract.getPaidAmount() : new BigDecimal("0"));
            contract.setBillingAmout(ObjUtil.isNotNull(contract.getBillingAmout()) ?
                  contract.getBillingAmout() : new BigDecimal("0"));
            contract.setBillingStatus("1");
            baseMapper.insert(contract);
            BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount())?contract.getPaidAmount():new BigDecimal("0");
            BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
            List<ContractSubjectMatterExceVO> resultMatter = matterList.stream().filter(item ->
                  StrUtil.isNotBlank(item.getMaterialCode()) &&
                        StrUtil.equals(item.getContractNo(), contract.getContractNo())).collect(Collectors.toList());
@@ -2544,7 +2453,28 @@
                  subjectMatter.setRemainingQuantity(subjectMatter.getQuantity().subtract(subjectMatter.getDeliveredQuantity()));
                  subjectMatter.setDeliveryStatus(subjectMatter.getRemainingQuantity().compareTo(subjectMatter.getQuantity()) == 0 ? 0
                        : subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0 ? 1 : 2);
                  subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
                  contractSubjectMatterMapper.insert(subjectMatter);
                  if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
                     //出库单
                     ContractOutBound outBound = new ContractOutBound();
                     outBound.setBusGuestId(contract.getPartyAId());
                     outBound.setBusGuestName(contract.getPartyA());
                     outBound.setContractId(contract.getId());
                     outBound.setContractName(contract.getContractName());
                     outBound.setInvoiceNum(new BigDecimal("0"));
                     outBound.setInvoiceStatus("0");
                     outBound.setOutBoundTime(new Date());
                     outBound.setOutBoundNum(subjectMatter.getDeliveredQuantity());
                     outBound.setSubjectMatterName(subjectMatter.getMaterialInternalName());
                     outBound.setSubjectMatterCode(subjectMatter.getMaterialCode());
                     contractOutBoundMapper.insert(outBound);
                     if (contract.getBillingAmout().compareTo(new BigDecimal("0")) == 0) {
                        contract.setBillingStatus("2");
                        baseMapper.updateById(contract);
                     }
                  }

               }
            }
            List<ContractPaymentScheduleExceVO> resultSchedule = scheduleList.stream().filter(item ->
@@ -2563,20 +2493,20 @@
                        .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
                  schedule.setPaymentStatus(0);
                  schedule.setStageOrder(j + 1);
                  if (remainAmount.compareTo(new BigDecimal("0"))>0&&schedule.getPlannedAmount().compareTo(new BigDecimal("0"))>0){
                  if (remainAmount.compareTo(new BigDecimal("0")) > 0 && schedule.getPlannedAmount().compareTo(new BigDecimal("0")) > 0) {
                     remainAmount = remainAmount.subtract(schedule.getPlannedAmount());
                     if (remainAmount.compareTo(new BigDecimal("0"))>=0){
                     if (remainAmount.compareTo(new BigDecimal("0")) >= 0) {
                        schedule.setPaymentStatus(2);
                        schedule.setActualAmount(schedule.getPlannedAmount());
                     }
                     if (remainAmount.compareTo(new BigDecimal("0"))<0){
                     if (remainAmount.compareTo(new BigDecimal("0")) < 0) {
                        schedule.setPaymentStatus(1);
                        schedule.setActualAmount(schedule.getPlannedAmount().add(remainAmount));
                     }
                  }
                  contractPaymentScheduleMapper.insert(schedule);
                  if (schedule.getStageName().equals("质保金")&&contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount())?
                        contract.getPaidAmount():new BigDecimal("0")).compareTo(new BigDecimal("0"))>0){
                  if (schedule.getStageName().equals("质保金") && contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount()) ?
                        contract.getPaidAmount() : new BigDecimal("0")).compareTo(new BigDecimal("0")) > 0) {
                     PaymentConfirm confirm = new PaymentConfirm();
                     confirm.setBusGuestId(contract.getPartyAId());
                     confirm.setBusGuestName(contract.getPartyA());
@@ -2587,8 +2517,8 @@
                     confirm.setContractNo(contract.getContractNo());
                     confirm.setScheduleId(schedule.getId());
                     confirm.setScheduleName(schedule.getStageName());
                     confirm.setTransationAmount(contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount())?
                           contract.getPaidAmount():new BigDecimal("0")));
                     confirm.setTransationAmount(contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount()) ?
                           contract.getPaidAmount() : new BigDecimal("0")));
                     confirm.setReceivableAmount(confirm.getTransationAmount());
                     confirm.setTotalAmount(confirm.getTransationAmount().multiply(new BigDecimal("-1")));
                     paymentConfirmMapper.insert(confirm);