feat:进行中合同导入

shiyunteng

2026-08-26 b967d23ae6c1f7761feb3c5328e3b591df6a735d

feat:进行中合同导入

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContracQueryDTO.java

@@ -10,6 +10,8 @@
@Data
public class ContracQueryDTO extends HomeQueryDTO{

    private String contractNo;

    @Schema(description = "合同名称")
    private String contractName;


 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java

@@ -176,7 +176,7 @@
    private String salesModel;

    @Schema(description = "已付款金额")
    @Column(columnDefinition = "decimal(20,2) comment '已付款金额'")
    @Column(columnDefinition = "decimal(20,2) default '0.00' comment '已付款金额'")
    private BigDecimal paidAmount;

    @Schema(description = "合同分类")

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java

@@ -249,6 +249,8 @@
    @Schema(description = "开票类型")
    private String invoiceType;

    private BigDecimal paidAmount;

    private List<ContractPaymentSchedule> contractPaymentSchedule;

    private List<ContractSubjectMatter> contractSubjectMatter;

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractExceVO.java

New file
@@ -0,0 +1,45 @@
package com.by4cloud.platformx.business.vo;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

@Data
public class ContractExceVO {

    @ExcelProperty("合同名称")
    private String contractName;

    @ExcelProperty("合同编号*")
    private String contractNo;

    @ExcelProperty("合同服务属性*")
    private String contractAttribute;

    @ExcelProperty("经济事项*")
    private String economicMatters;

    @ExcelProperty("供应属性*")
    private String supplyAttribute;

    @ExcelProperty("客户编码（erpcode）*")
    private String bcErpCode;

    @ExcelProperty("签署日期*")
    private String signDate;

    @ExcelProperty("到期日期*")
    private String expirationDate;

    @ExcelProperty("所属行业*")
    private String industryCode;

    @ExcelProperty("合同金额*")
    private String amount;

    @ExcelProperty("已收款金额*")
    private String paidAmount;

    @ExcelProperty("已开票金额*")
    private String billingAmout;

}

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPaymentScheduleExceVO.java

New file
@@ -0,0 +1,23 @@
package com.by4cloud.platformx.business.vo;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class ContractPaymentScheduleExceVO {

    @ExcelProperty("合同编号*")
    private String contractNo;

    @ExcelProperty("阶段名称*")
    private String stageName;

    @ExcelProperty("约定天数*")
    private String agreedDays;

    @ExcelProperty("付款比例*")
    private String paymentRatio;

}

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractSubjectMatterExceVO.java

New file
@@ -0,0 +1,36 @@
package com.by4cloud.platformx.business.vo;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

@Data
public class ContractSubjectMatterExceVO {

    @ExcelProperty("合同编号*")
    private String contractNo;

    @ExcelProperty("标的物名称")
    private String materialName;

    @ExcelProperty("产品编码（erpcode）*")
    private String materialCode;

    @ExcelProperty("产品名称（erpname）")
    private String materialInternalName;

    @ExcelProperty("客户编码（erpcode）*")
    private String bcErpCode;

    @ExcelProperty("规格型号")
    private String specification;

    @ExcelProperty("单价*")
    private String unitPrice;

    @ExcelProperty("数量*")
    private String quantity;

    @ExcelProperty("出库数量*")
    private String deliveredQuantity;

}

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java

@@ -25,6 +25,7 @@
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.math.BigDecimal;
import java.util.List;
@@ -361,4 +362,12 @@
    public R fourAssociation(@ParameterObject Page page,@ParameterObject ContractQueryDTO queryDTO) {
        return R.ok(contractService.fourAssociation(page,queryDTO));
    }

    @PostMapping("/importContractMultiSheet")
    public R importContractMultiSheet(@RequestParam("file") MultipartFile file) {
        if (file.isEmpty()) {
            return R.failed("文件不能为空");
        }
        return contractService.importContractMultiSheet(file);
    }
}

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

@@ -8,6 +8,7 @@
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.IIService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;

/**
 * @author 28254
@@ -68,4 +69,6 @@
    R addSimple(ContractAddDTO addDTO);

    R pushCenter(Long id);

    R importContractMultiSheet(MultipartFile file);
}

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

@@ -138,7 +138,8 @@
                                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&&
                                contract.getContractNo().startsWith("ZB-")){
                                    //新增完成付款合同 资金转出
                                    PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm,PaymentConfirm.class,"id","transationAmount",
                                            "advanceAmount","receivableAmount","overdueAmount","totalAmount");
@@ -167,13 +168,16 @@
                                    }else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
                                        inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
                                    }
                                    paymentConfirmMapper.insert(inConfirm);
                                    if (contract.getContractNo().startsWith("ZB-")) {
                                        paymentConfirmMapper.insert(inConfirm);
                                    }
                                }
                            }
                        }
                    }
                    currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
                    if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
                    if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0&&
                            contract.getContractNo().startsWith("ZB-")) {
                        paymentConfirmMapper.insert(currentConfim);
                        //更新当前阶段付款情况
                        if (lastTotal.compareTo(new BigDecimal("0"))>0){
@@ -222,7 +226,7 @@
                                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&&contract.getContractNo().startsWith("ZB-")){
                                paymentConfirmMapper.insert(newConfim);

                            }
@@ -276,7 +280,7 @@
                lastTotal = lastConfirm.getTotalAmount();
            }
            currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
            if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
            if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0&&contract.getContractNo().startsWith("ZB-")){
                paymentConfirmMapper.insert(currentConfim);
                //更新当前阶段付款情况
                if (lastTotal.compareTo(new BigDecimal("0"))>0){
@@ -388,7 +392,7 @@
                lastNewTotal = lastNewConfirm.getTotalAmount();
            }
            newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
            if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
            if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0&&contract.getContractNo().startsWith("ZB-")) {
                paymentConfirmMapper.insert(newConfim);
                //更新当前阶段付款情况
                if (lastNewTotal.compareTo(new BigDecimal("0"))>0){

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

@@ -11,25 +11,28 @@
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.read.metadata.ReadSheet;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.admin.api.entity.SysDept;
import com.by4cloud.platformx.admin.api.entity.SysDictItem;
import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
import com.by4cloud.platformx.admin.api.feign.RemoteDictService;
import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
import com.by4cloud.platformx.business.constant.FlowNameEnum;
import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.business.utils.BatchInsertListener;
import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
import com.by4cloud.platformx.business.utils.NetworkFileToBase64;
import com.by4cloud.platformx.business.vo.ContractDetailVo;
import com.by4cloud.platformx.business.vo.ContractInvoiceVo;
import com.by4cloud.platformx.business.vo.ContractSlipVo;
import com.by4cloud.platformx.business.vo.FourAssociationPageVo;
import com.by4cloud.platformx.business.vo.*;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.datascope.DataScope;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
@@ -45,6 +48,7 @@
import org.springframework.core.io.ClassPathResource;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.io.OutputStream;
@@ -84,6 +88,7 @@
    private final ContractInvoiceMapper contractInvoiceMapper;
    private final StringRedisTemplate redisTemplate;
    private final ContractOutBoundMapper contractOutBoundMapper;
    private final RemoteDictService remoteDictService;

    @Value("${erp.ymj}")
    private String ymjErp;
@@ -126,12 +131,12 @@
        Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
        contract.setPartyBId(SecurityUtils.getUser().getCompId());
        contract.setPartyB(SecurityUtils.getUser().getCompName());
        if (StrUtil.isEmpty(addDTO.getPartyA())){
        if (StrUtil.isEmpty(addDTO.getPartyA())) {
            BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
            if (ObjUtil.isNotNull(bc)){
            if (ObjUtil.isNotNull(bc)) {
                contract.setPartyA(bc.getCompanyName());
            }
            if (!StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)&&StrUtil.isEmpty(bc.getErpCompanyCode())){
            if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())) {
                return R.failed("请完善客户ERP编码");
            }
        }
@@ -141,17 +146,17 @@
        contract.setBillingAmout(new BigDecimal("0"));
        contract.setErpPushFlag("0");
        contract.setNickName(SecurityUtils.getUser().getNickname());
        if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())){
            contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(),addDTO.getDeliveryCycle()));
        if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
            contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
        }
        if (StrUtil.equals(addDTO.getContractCategory(), "water_house")){
            if(!addDTO.getContractSubjectMatter().stream().allMatch(item->StrUtil.equals(item.getMaterialCode(), "water_bill")||
                    StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
        if (StrUtil.equals(addDTO.getContractCategory(), "water_house")) {
            if (!addDTO.getContractSubjectMatter().stream().allMatch(item -> StrUtil.equals(item.getMaterialCode(), "water_bill") ||
                    StrUtil.equals(item.getMaterialCode(), "house_rental") || StrUtil.equals(item.getMaterialCode(), "electricity_bill"))) {
                return R.failed("请新增水/电代缴房屋租赁合同！");
            }
        }else {
            if(addDTO.getContractSubjectMatter().stream().anyMatch(item->StrUtil.equals(item.getMaterialCode(), "water_bill")||
                    StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
        } else {
            if (addDTO.getContractSubjectMatter().stream().anyMatch(item -> StrUtil.equals(item.getMaterialCode(), "water_bill") ||
                    StrUtil.equals(item.getMaterialCode(), "house_rental") || StrUtil.equals(item.getMaterialCode(), "electricity_bill"))) {
                return R.failed("水电代缴、房屋租赁产品只能在水/电代缴房屋租赁合同！");
            }
            // 假设 list 是你的 List<ContractSubjectMatterAddDTO>
@@ -165,32 +170,32 @@
            }
        }

        if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())){
        if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
            return R.failed("标的物不能为空");
        }

        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
                StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
                StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            contract.setContractNo(generateSMJContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
            contract.setContractNo(generateGYBContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
            contract.setContractNo(generateYMJContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
            contract.setContractNo(generateTFContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
            contract.setContractNo(generateJXCContractNo());
        }
        if (StrUtil.isNotEmpty(contract.getContractCategory())&&(StrUtil.equals(contract.getContractCategory(),"ymjjgcl")
                ||StrUtil.equals(contract.getContractCategory(),"ymjgypmm")||StrUtil.equals(contract.getContractCategory(),"ymjgkcpmm")
                ||StrUtil.equals(contract.getContractCategory(),"ymjcg")||StrUtil.equals(contract.getContractCategory(),"tfgsgypmm")
                ||StrUtil.equals(contract.getContractCategory(),"smjgypmm")||StrUtil.equals(contract.getContractCategory(),"jxcxsht"))
        ){
            contract.setContractName(contract.getContractName()+contract.getContractNo());
        if (StrUtil.isNotEmpty(contract.getContractCategory()) && (StrUtil.equals(contract.getContractCategory(), "ymjjgcl")
                || StrUtil.equals(contract.getContractCategory(), "ymjgypmm") || StrUtil.equals(contract.getContractCategory(), "ymjgkcpmm")
                || StrUtil.equals(contract.getContractCategory(), "ymjcg") || StrUtil.equals(contract.getContractCategory(), "tfgsgypmm")
                || StrUtil.equals(contract.getContractCategory(), "smjgypmm") || StrUtil.equals(contract.getContractCategory(), "jxcxsht"))
        ) {
            contract.setContractName(contract.getContractName() + contract.getContractNo());
        }
        baseMapper.insert(contract);

@@ -206,7 +211,7 @@
                //水电类必须有初次表号
                if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
                        ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
                    MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class,"id");
                    MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
                    record.setContractId(contract.getId());
                    record.setMatterId(subjectMatter.getId());
                    record.setContractName(contract.getContractName());
@@ -216,10 +221,10 @@
                    meterReadRecordMapper.insert(record);
                }
                if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "ymjcg")
                &&ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())&&ObjUtil.isNotNull(contract.getExpirationDate())
                    &&DateUtil.compare(contract.getExpirationDate(),subjectMatter.getPlannedDeliveryDate())>0) {
                        contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
                        baseMapper.updateById(contract);
                        && ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate()) && ObjUtil.isNotNull(contract.getExpirationDate())
                        && DateUtil.compare(contract.getExpirationDate(), subjectMatter.getPlannedDeliveryDate()) > 0) {
                    contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
                    baseMapper.updateById(contract);
                }
            });

@@ -276,13 +281,13 @@
        if (!StrUtil.equals(entity.getContractStatus() + "", "0")) {
            return R.failed("当前状态无法修改合同");
        }
        if (StrUtil.isEmpty(updateDTO.getPartyA())){
        if (StrUtil.isEmpty(updateDTO.getPartyA())) {
            BusinessCustomer bc = businessCustomerMapper.selectById(updateDTO.getPartyAId());
            if (ObjUtil.isNotNull(bc)){
            if (ObjUtil.isNotNull(bc)) {
                updateDTO.setPartyA(bc.getCompanyName());
            }
            if (StrUtil.isEmpty(bc.getErpCompanyCode())||StrUtil.isEmpty(bc.getRegisterName())||
                    StrUtil.isEmpty(bc.getBankName())||StrUtil.isEmpty(bc.getBankAccount())){
            if (StrUtil.isEmpty(bc.getErpCompanyCode()) || StrUtil.isEmpty(bc.getRegisterName()) ||
                    StrUtil.isEmpty(bc.getBankName()) || StrUtil.isEmpty(bc.getBankAccount())) {
                return R.failed("请完善改客户数据后再添加合同");
            }
        }
@@ -293,33 +298,33 @@
        contract.setPaidAmount(new BigDecimal("0"));
        contract.setBillingAmout(new BigDecimal("0"));
        contract.setNickName(SecurityUtils.getUser().getNickname());
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
                StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
                StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            contract.setContractNo(generateSMJContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
            contract.setContractNo(generateGYBContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
            contract.setContractNo(generateYMJContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
            contract.setContractNo(generateTFContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
            contract.setContractNo(generateJXCContractNo());
        }
        if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())){
            contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(),updateDTO.getDeliveryCycle()));
        if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())) {
            contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(), updateDTO.getDeliveryCycle()));
        }
        if (StrUtil.equals(updateDTO.getContractCategory(), "water_house")){
            if(!updateDTO.getContractSubjectMatter().stream().allMatch(item->StrUtil.equals(item.getMaterialCode(), "water_bill")||
                    StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
        if (StrUtil.equals(updateDTO.getContractCategory(), "water_house")) {
            if (!updateDTO.getContractSubjectMatter().stream().allMatch(item -> StrUtil.equals(item.getMaterialCode(), "water_bill") ||
                    StrUtil.equals(item.getMaterialCode(), "house_rental") || StrUtil.equals(item.getMaterialCode(), "electricity_bill"))) {
                return R.failed("请新增水/电代缴房屋租赁合同！");
            }
        }else {
            if(updateDTO.getContractSubjectMatter().stream().anyMatch(item->StrUtil.equals(item.getMaterialCode(), " ")||
                    StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
        } else {
            if (updateDTO.getContractSubjectMatter().stream().anyMatch(item -> StrUtil.equals(item.getMaterialCode(), " ") ||
                    StrUtil.equals(item.getMaterialCode(), "house_rental") || StrUtil.equals(item.getMaterialCode(), "electricity_bill"))) {
                return R.failed("水电代缴、房屋租赁产品只能在水/电代缴房屋租赁合同！");
            }
            // 假设 list 是你的 List<ContractSubjectMatterAddDTO>
@@ -350,7 +355,7 @@
                if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
                        ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
                    meterReadRecordMapper.delete(Wrappers.<MeterReadRecord>lambdaQuery().eq(MeterReadRecord::getContractId, contract.getId()));
                    MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class,"id");
                    MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
                    record.setContractId(contract.getId());
                    record.setMatterId(subjectMatter.getId());
                    record.setContractName(contract.getContractName());
@@ -407,26 +412,26 @@
        List<ContractPaymentSchedule> paymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
        detailVo.setContractPaymentSchedule(paymentScheduleList);
        BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
        if (ObjUtil.isNotNull(a)){
        if (ObjUtil.isNotNull(a)) {
            detailVo.setPartyAOrgCode(a.getCreditCode());
        }
        List<ContractOutBound> outBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
                .eq(ContractOutBound::getContractId,id).orderByAsc(ContractOutBound::getOutBoundTime));
        if (CollUtil.isNotEmpty(outBoundList)){
                .eq(ContractOutBound::getContractId, id).orderByAsc(ContractOutBound::getOutBoundTime));
        if (CollUtil.isNotEmpty(outBoundList)) {
            detailVo.setContractOutBound(outBoundList);
        }
        List<ContractInvoice> invoiceList = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
                .eq(ContractInvoice::getContractId,id).orderByAsc(ContractInvoice::getCreateTime));
        if (CollUtil.isNotEmpty(invoiceList)){
                .eq(ContractInvoice::getContractId, id).orderByAsc(ContractInvoice::getCreateTime));
        if (CollUtil.isNotEmpty(invoiceList)) {
            detailVo.setContractInvoice(invoiceList);
        }
        List<PaymentSlip> slipList = paymentSlipMapper.selectList(Wrappers.<PaymentSlip>lambdaQuery()
                .eq(PaymentSlip::getContractId,id).orderByAsc(PaymentSlip::getPaymentTime));
        if (CollUtil.isNotEmpty(slipList)){
                .eq(PaymentSlip::getContractId, id).orderByAsc(PaymentSlip::getPaymentTime));
        if (CollUtil.isNotEmpty(slipList)) {
            detailVo.setPaymentSlip(slipList);
        }
        BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
        if (ObjUtil.isNotNull(customer)){
        if (ObjUtil.isNotNull(customer)) {
            detailVo.setInvoiceType(customer.getInvoiceType());
        }
        return detailVo;
@@ -437,7 +442,7 @@
        Contract contract = baseMapper.selectById(id);

        //简易合同无法继续后续操作
        if (StrUtil.equals(contract.getContractCategory(), "simple")){
        if (StrUtil.equals(contract.getContractCategory(), "simple")) {
            return R.failed("请补充标的物和收款阶段后再进行操作！");
        }

@@ -462,13 +467,13 @@


        List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
                .eq(ContractSubjectMatter::getContractId,id));
                .eq(ContractSubjectMatter::getContractId, id));
        if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
            if (CollUtil.isNotEmpty(subjectMatterList)) {
                for (ContractSubjectMatter contractSubjectMatter: 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;
                                DateUtil.endOfWeek(contract.getExpirationDate()), true) + 1;
                        //循环日期
                        Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
                        for (int i = 0; i < weeksTrue.intValue(); i++) {
@@ -478,14 +483,14 @@
                            execDate.setMatterId(contractSubjectMatter.getId());
                            execDate.setExecDate(execDatei);
                            execDate.setGenFlag("0");
                            if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
                            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;
                                DateUtil.endOfMonth(contract.getExpirationDate()), true) + 1;
                        //循环日期
                        Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfMonth(contract.getEffectiveDate()), contract.getExecDay());
                        for (int i = 0; i < weeksTrue.intValue(); i++) {
@@ -495,25 +500,25 @@
                            execDate.setMatterId(contractSubjectMatter.getId());
                            execDate.setExecDate(execDatei);
                            execDate.setGenFlag("0");
                            if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
                            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;
                                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);
                            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())) {
                            if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                                contractExecDateMapper.insert(execDate);
                            }
                        }
@@ -523,36 +528,36 @@
                        Date endDate = contract.getExpirationDate();
                        Integer startMonth = DateUtil.month(contract.getEffectiveDate());
                        Integer endMonth = DateUtil.month(contract.getExpirationDate());
                        if (1<=startMonth&&startMonth<=6){
                        if (1 <= startMonth && startMonth <= 6) {
                            startDate = DateUtil.beginOfYear(startDate);
                        }
                        if (7<=startMonth&&startMonth<=12){
                            startDate = DateUtil.offsetMonth(DateUtil.beginOfYear(startDate),6);
                        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 (1 <= endMonth && endMonth <= 6) {
                            endDate = DateUtil.offsetMonth(DateUtil.endOfYear(endDate), -6);
                        }
                        if (7<=endMonth&&endMonth<=12){
                        if (7 <= endMonth && endMonth <= 12) {
                            endDate = DateUtil.endOfYear(endDate);
                        }
                        Long weeksTrue = (DateUtil.betweenMonth(startDate,endDate, true)+1)/6;
                        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);
                            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())) {
                            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;
                                DateUtil.endOfYear(contract.getExpirationDate()), true) + 1;
                        //循环日期
                        Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfYear(contract.getEffectiveDate()), contract.getExecDay());
                        for (int i = 0; i < weeksTrue.intValue(); i++) {
@@ -562,7 +567,7 @@
                            execDate.setMatterId(contractSubjectMatter.getId());
                            execDate.setExecDate(execDatei);
                            execDate.setGenFlag("0");
                            if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
                            if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
                                contractExecDateMapper.insert(execDate);
                            }
                        }
@@ -663,135 +668,135 @@
//        }
        }
        //erp推送
        new Thread(()->{
        new Thread(() -> {
            try {
                Thread.sleep(500);
                JSONObject request = new JSONObject();
                BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
                request.put("contractNo",contract.getContractNo());
                request.put("partyA",contract.getPartyA());
                request.put("partyACode",customer.getErpCompanyCode());
                if (StrUtil.equals(contract.getPartyBId()+"",ymj)&&StrUtil.isNotEmpty(ymjErp)){
                    request.put("customerCode",customer.getErpCompanyCode());
                    request.put("currencyId","RMB");
                    request.put("signDate",DateUtil.format(contract.getSignDate(),DatePattern.NORM_DATETIME_PATTERN));
                    request.put("dateDeliver",DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
                    request.put("moneySum",contract.getAmount());
                    request.put("signManner","面签");
                    request.put("salesman","");
                    if (ArrayUtil.isNotEmpty(subjectMatterList)){
                request.put("contractNo", contract.getContractNo());
                request.put("partyA", contract.getPartyA());
                request.put("partyACode", customer.getErpCompanyCode());
                if (StrUtil.equals(contract.getPartyBId() + "", ymj) && StrUtil.isNotEmpty(ymjErp)) {
                    request.put("customerCode", customer.getErpCompanyCode());
                    request.put("currencyId", "RMB");
                    request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
                    request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
                    request.put("moneySum", contract.getAmount());
                    request.put("signManner", "面签");
                    request.put("salesman", "");
                    if (ArrayUtil.isNotEmpty(subjectMatterList)) {
                        JSONArray subjectMatter = new JSONArray();
                        subjectMatterList.stream().forEach(contractSubjectMatter -> {
                            JSONObject subjectMatterItem = new JSONObject();
                            subjectMatterItem.put("itemNo",contractSubjectMatter.getMaterialCode());
                            subjectMatterItem.put("salePrice",contractSubjectMatter.getUnitPrice());
                            subjectMatterItem.put("qtyRequired",contractSubjectMatter.getQuantity());
                            subjectMatterItem.put("money",contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
                            Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId,contract.getCompId())
                                    .eq(Product::getErpCode,contractSubjectMatter.getMaterialCode()));
                            if (ObjUtil.isNotNull(product)){
                                subjectMatterItem.put("taxRate",new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
                            subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
                            subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
                            subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
                            subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
                            Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
                                    .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
                            if (ObjUtil.isNotNull(product)) {
                                subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
                            }
                            subjectMatterItem.put("dateDeliver",ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate())?
                                    DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(),DatePattern.NORM_DATETIME_PATTERN):
                                    DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
                            subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
                                    DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
                                    DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
                            subjectMatter.add(subjectMatterItem);
                        });
                        request.put("details",subjectMatter);
                        request.put("details", subjectMatter);
                    }

                    JSONObject loginJson = new JSONObject();
                    loginJson.put("username","admin");
                    loginJson.put("password","admin123");
                    log.info("一煤机合同推送获取token入参：{}",loginJson.toJSONString());
                    String loginResp = HttpUtil.post(ymjErp+"/api/account/v1/login",loginJson.toJSONString());
                    log.info("一煤机合同推送获取token回参：{}",loginResp);
                    loginJson.put("username", "admin");
                    loginJson.put("password", "admin123");
                    log.info("一煤机合同推送获取token入参：{}", loginJson.toJSONString());
                    String loginResp = HttpUtil.post(ymjErp + "/api/account/v1/login", loginJson.toJSONString());
                    log.info("一煤机合同推送获取token回参：{}", loginResp);
                    JSONObject respJson = JSONObject.parseObject(loginResp);
                    if (respJson.getInteger("code")==0){
                    if (respJson.getInteger("code") == 0) {
                        JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
                        log.info("一煤机合同推送erp入参：{}",request.toJSONString());
                        HttpResponse response = HttpRequest.post(ymjErp+"/api/contract-staging/v1/receive")
                        log.info("一煤机合同推送erp入参：{}", request.toJSONString());
                        HttpResponse response = HttpRequest.post(ymjErp + "/api/contract-staging/v1/receive")
                                .header("token", dataJson.getString("token"))       // 添加认证头
                                .header("Content-Type", "application/json")         // 设置内容类型
                                .body(request.toJSONString())                        // 设置请求体
                                .execute();                                         // 执行请求.post(ymjErp,request.toJSONString());
                        log.info("一煤机合同推送erp回参：{}",response.body());
                        log.info("一煤机合同推送erp回参：{}", response.body());
                        //保存请求记录
                        saveErpRequestRecord("ymj",request.toJSONString(),response.body());
                        saveErpRequestRecord("ymj", request.toJSONString(), response.body());
                        //更新合同erp推送标识
                        contract.setErpPushFlag("1");
                        baseMapper.updateById(contract);
                    }

                }
                if ((StrUtil.equals(contract.getPartyBId()+"",smj)||StrUtil.equals(contract.getPartyBId()+"",smjsc)||
                        StrUtil.equals(contract.getPartyBId()+"",smjzt))&&StrUtil.isNotEmpty(smjErp)){
                    request.put("customerCode",customer.getErpCompanyCode());
                    request.put("currencyId","RMB");
                    request.put("signDate",DateUtil.format(contract.getSignDate(),DatePattern.NORM_DATETIME_PATTERN));
                    request.put("dateDeliver",DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
                    request.put("moneySum",contract.getAmount());
                    request.put("signManner","面签");
                    request.put("salesman","");
                    if (ArrayUtil.isNotEmpty(subjectMatterList)){
                if ((StrUtil.equals(contract.getPartyBId() + "", smj) || StrUtil.equals(contract.getPartyBId() + "", smjsc) ||
                        StrUtil.equals(contract.getPartyBId() + "", smjzt)) && StrUtil.isNotEmpty(smjErp)) {
                    request.put("customerCode", customer.getErpCompanyCode());
                    request.put("currencyId", "RMB");
                    request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
                    request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
                    request.put("moneySum", contract.getAmount());
                    request.put("signManner", "面签");
                    request.put("salesman", "");
                    if (ArrayUtil.isNotEmpty(subjectMatterList)) {
                        JSONArray subjectMatter = new JSONArray();
                        subjectMatterList.stream().forEach(contractSubjectMatter -> {
                            JSONObject subjectMatterItem = new JSONObject();
                            subjectMatterItem.put("itemNo",contractSubjectMatter.getMaterialCode());
                            subjectMatterItem.put("salePrice",contractSubjectMatter.getUnitPrice());
                            subjectMatterItem.put("qtyRequired",contractSubjectMatter.getQuantity());
                            subjectMatterItem.put("money",contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
                            Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId,contract.getCompId())
                                    .eq(Product::getErpCode,contractSubjectMatter.getMaterialCode()));
                            if (ObjUtil.isNotNull(product)){
                                subjectMatterItem.put("taxRate",new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
                            subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
                            subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
                            subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
                            subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
                            Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
                                    .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
                            if (ObjUtil.isNotNull(product)) {
                                subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
                            }
                            subjectMatterItem.put("dateDeliver",ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate())?
                                    DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(),DatePattern.NORM_DATETIME_PATTERN):
                                    DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
                            subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
                                    DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
                                    DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
                            subjectMatter.add(subjectMatterItem);
                        });
                        request.put("details",subjectMatter);
                        request.put("details", subjectMatter);
                    }

                    JSONObject loginJson = new JSONObject();
                    loginJson.put("username","admin");
                    loginJson.put("password","Zimafold@2026");
                    log.info("石煤机合同推送获取token入参：{}",loginJson.toJSONString());
                    String loginResp = HttpUtil.post(smjErp+"/api/account/v1/login",loginJson.toJSONString());
                    log.info("石煤机合同推送获取token回参：{}",loginResp);
                    loginJson.put("username", "admin");
                    loginJson.put("password", "Zimafold@2026");
                    log.info("石煤机合同推送获取token入参：{}", loginJson.toJSONString());
                    String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
                    log.info("石煤机合同推送获取token回参：{}", loginResp);
                    JSONObject respJson = JSONObject.parseObject(loginResp);
                    if (respJson.getInteger("code")==0){
                    if (respJson.getInteger("code") == 0) {
                        JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
                        log.info("石煤机合同推送erp入参：{}",request.toJSONString());
                        HttpResponse response = HttpRequest.post(smjErp+"/api/contract/v1/createWithDetails")
                        log.info("石煤机合同推送erp入参：{}", request.toJSONString());
                        HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails")
                                .header("token", dataJson.getString("token"))       // 添加认证头
                                .header("Content-Type", "application/json")         // 设置内容类型
                                .body(request.toJSONString())                        // 设置请求体
                                .execute();                                         // 执行请求.post(ymjErp,request.toJSONString());
                        log.info("石煤机合同推送erp回参：{}",response.body());
                        log.info("石煤机合同推送erp回参：{}", response.body());
                        //保存请求记录
                        saveErpRequestRecord("smj",request.toJSONString(),response.body());
                        saveErpRequestRecord("smj", request.toJSONString(), response.body());
                        //更新合同erp推送标识
                        contract.setErpPushFlag("1");
                        baseMapper.updateById(contract);
                    }
                }

                if (StrUtil.equals(contract.getPartyBId()+"",jxc)&&StrUtil.isNotEmpty(jxcErp)){
                    log.info("机械厂合同推送erp入参：{}",request.toJSONString());
                    String result = HttpUtil.post(jxcErp,request.toJSONString());
                    log.info("机械厂合同推送erp回参：{}",result);
                if (StrUtil.equals(contract.getPartyBId() + "", jxc) && StrUtil.isNotEmpty(jxcErp)) {
                    log.info("机械厂合同推送erp入参：{}", request.toJSONString());
                    String result = HttpUtil.post(jxcErp, request.toJSONString());
                    log.info("机械厂合同推送erp回参：{}", result);
                    //保存请求记录
                    saveErpRequestRecord("jxc",request.toJSONString(),result);
                    saveErpRequestRecord("jxc", request.toJSONString(), result);
                    //更新合同erp推送标识
                    contract.setErpPushFlag("1");
                    baseMapper.updateById(contract);
                }
                if (StrUtil.equals(contract.getPartyBId()+"",tfgs)&&StrUtil.isNotEmpty(tfgsErp)){
                if (StrUtil.equals(contract.getPartyBId() + "", tfgs) && StrUtil.isNotEmpty(tfgsErp)) {
                    //通方公司通过系统录入
                }
                if (StrUtil.equals(contract.getPartyBId()+"",sgb)&&StrUtil.isNotEmpty(sgbErp)){
                if (StrUtil.equals(contract.getPartyBId() + "", sgb) && StrUtil.isNotEmpty(sgbErp)) {
                    //石工泵主动推送系统
                }
            } catch (Exception e) {
@@ -799,35 +804,35 @@
            }
        }).start();
        //合同中心推送
        new Thread(()->{
        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)
                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);
                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();
@@ -903,7 +908,7 @@
                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) {
                if (ObjUtil.isNotNull(contractLastConfirm) && contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
                    //新增完成付款合同 资金转出
                    PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm, PaymentConfirm.class, "id", "transationAmount",
                            "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
@@ -1030,20 +1035,20 @@
        newContract.setErpPushFlag("0");
        newContract.setContractStatus(0);
        newContract.setBillingAmout(new BigDecimal("0"));
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
                StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
                StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            newContract.setContractNo(generateSMJContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
            newContract.setContractNo(generateGYBContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
            newContract.setContractNo(generateYMJContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
            newContract.setContractNo(generateTFContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
            newContract.setContractNo(generateJXCContractNo());
        }
        baseMapper.insert(newContract);
@@ -1158,7 +1163,7 @@
    @Override
    public R genCycleReceiced() {
        List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
                .le(ContractExecDate::getExecDate, DateUtil.today()).eq(ContractExecDate::getGenFlag,"0"));
                .le(ContractExecDate::getExecDate, DateUtil.today()).eq(ContractExecDate::getGenFlag, "0"));
        if (ArrayUtil.isNotEmpty(execDateList)) {
            execDateList.stream().forEach(contractExecDate -> {
                Contract contract = baseMapper.selectById(contractExecDate.getContractId());
@@ -1168,17 +1173,17 @@
                //生成抄表单
                if (StrUtil.isNotEmpty(subjectMatter.getMeterReadCode()) &&
                        ObjUtil.isNotNull(subjectMatter.getMeterReadNum())) {
                    MeterReadRecord record = BeanUtil.copyProperties(subjectMatter, MeterReadRecord.class, "id","meterReadNum");
                    MeterReadRecord record = BeanUtil.copyProperties(subjectMatter, MeterReadRecord.class, "id", "meterReadNum");
                    record.setContractName(contract.getContractName());
                    record.setMatterId(subjectMatter.getId());
                    record.setBusGuestId(contract.getPartyAId());
                    record.setBusGuestName(contract.getPartyA());
                    meterReadRecordMapper.insert(record);
                }else {
                } else {
                    //创建收款节点
                    //查询上次收款节点
                    ContractPaymentSchedule lastSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
                            .eq(ContractPaymentSchedule::getContractId,contract.getId())
                            .eq(ContractPaymentSchedule::getContractId, contract.getId())
                            .orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
                    ContractPaymentSchedule schedule = new ContractPaymentSchedule();
                    schedule.setStageName("房租租赁缴费");
@@ -1187,15 +1192,15 @@
                    schedule.setPlannedAmount(subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
                    schedule.setEffectiveEndDate(contractExecDate.getExecDate());
                    schedule.setStageOrder(1);
                    if (ObjUtil.isNotNull(lastSchedule)){
                        schedule.setStageOrder(lastSchedule.getStageOrder()+1);
                    if (ObjUtil.isNotNull(lastSchedule)) {
                        schedule.setStageOrder(lastSchedule.getStageOrder() + 1);
                    }
                    schedule.setPaymentStatus(0);
                    schedule.setActualAmount(new BigDecimal("0"));
                    schedule.setCompId(contract.getCompId());
                    schedule.setSubjectMatterCode(subjectMatter.getMaterialCode());
                    schedule.setSubjectMatterName(subjectMatter.getMaterialInternalName());
                    schedule.setRemark(DateUtil.formatDate(contractExecDate.getExecDate())+schedule.getStageName());
                    schedule.setRemark(DateUtil.formatDate(contractExecDate.getExecDate()) + schedule.getStageName());
                    schedule.setInvoiceFlag("0");
                    contractPaymentScheduleMapper.insert(schedule);
                    //房屋租赁生成应收
@@ -1272,8 +1277,8 @@
            item.put("zongzhong", contractSubjectMatter.getTotalWight());
            item.put("unitPrice", contractSubjectMatter.getUnitPrice());
            item.put("price", contractSubjectMatter.getTotalAmount());
            if (no.get().equals(Integer.valueOf(0))){
                item.put("deliveryCycle",contract.getDeliveryCycle());
            if (no.get().equals(Integer.valueOf(0))) {
                item.put("deliveryCycle", contract.getDeliveryCycle());
            }
            items.add(item);
            no.updateAndGet(v -> v + 1);
@@ -1346,7 +1351,7 @@
        map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
        map.put("total", contract.getAmount());
        map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
        map.put("deliveryCycle",contract.getDeliveryCycle());
        map.put("deliveryCycle", contract.getDeliveryCycle());
        //标的物
        List<Map<String, Object>> items = new ArrayList<>();
        AtomicReference<Integer> no = new AtomicReference<>(0);
@@ -1432,30 +1437,30 @@
        map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
        map.put("total", contract.getAmount());
        map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
        map.put("environment",contract.getEnvironment());
        map.put("standard",contract.getStandard());
        map.put("useMonth",contract.getUseMonth());
        map.put("afterShipMonth",contract.getAfterShipMonth());
        map.put("shipMethod",contract.getShipMethod());
        map.put("shipAddress",contract.getShipAddress());
        map.put("packaging",contract.getPackaging());
        map.put("repairPeriod",contract.getRepairPeriod());
        map.put("repairBreachAmount",contract.getRepairBreachAmount());
        map.put("goodsShort",contract.getGoodsShort());
        map.put("goodsShortBreachAmount",contract.getGoodsShortBreachAmount());
        map.put("overdueBreachAmount",contract.getOverdueBreachAmount());
        map.put("terminateContract",contract.getTerminateContract());
        map.put("court",contract.getCourt());
        map.put("contractAttchment",contract.getContractAttchment());
        map.put("invoiceNotice",contract.getInvoiceNotice());
        map.put("city",contract.getCity());
        map.put("region",contract.getRegion());
        map.put("environment", contract.getEnvironment());
        map.put("standard", contract.getStandard());
        map.put("useMonth", contract.getUseMonth());
        map.put("afterShipMonth", contract.getAfterShipMonth());
        map.put("shipMethod", contract.getShipMethod());
        map.put("shipAddress", contract.getShipAddress());
        map.put("packaging", contract.getPackaging());
        map.put("repairPeriod", contract.getRepairPeriod());
        map.put("repairBreachAmount", contract.getRepairBreachAmount());
        map.put("goodsShort", contract.getGoodsShort());
        map.put("goodsShortBreachAmount", contract.getGoodsShortBreachAmount());
        map.put("overdueBreachAmount", contract.getOverdueBreachAmount());
        map.put("terminateContract", contract.getTerminateContract());
        map.put("court", contract.getCourt());
        map.put("contractAttchment", contract.getContractAttchment());
        map.put("invoiceNotice", contract.getInvoiceNotice());
        map.put("city", contract.getCity());
        map.put("region", contract.getRegion());

        //标的物
        List<Map<String, Object>> items = new ArrayList<>();
        AtomicReference<Integer> no = new AtomicReference<>(0);
        subjectMatterList.stream().forEach(contractSubjectMatter -> {
            Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,contractSubjectMatter.getMaterialCode()).last("limit 1"));
            Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()).last("limit 1"));
            Map<String, Object> item = new HashMap<>();
            item.put("no", no);
            item.put("materialName", contractSubjectMatter.getMaterialName());
@@ -1466,11 +1471,11 @@
            item.put("priceTax", contractSubjectMatter.getUnitPrice().multiply(contractSubjectMatter.getQuantity()).setScale(2, RoundingMode.HALF_UP));
            item.put("priceNoTax", contractSubjectMatter.getUnitPrice().multiply(contractSubjectMatter.getQuantity())
                    .subtract(contractSubjectMatter.getUnitPrice().multiply(contractSubjectMatter.getQuantity())
                            .divide(new BigDecimal("100").add(new BigDecimal(product.getTaxRate())),2, RoundingMode.HALF_UP).multiply(new BigDecimal(product.getTaxRate())))
                            .divide(new BigDecimal("100").add(new BigDecimal(product.getTaxRate())), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(product.getTaxRate())))
                    .setScale(2, RoundingMode.HALF_UP));
            item.put("deliveryDate", DateUtil.formatDate(contractSubjectMatter.getPlannedDeliveryDate()));
            item.put("remarks", contractSubjectMatter.getRemarks());
            map.put("taxRate",product.getTaxRate());
            map.put("taxRate", product.getTaxRate());
            items.add(item);
            no.updateAndGet(v -> v + 1);
        });
@@ -1479,24 +1484,24 @@
        List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
                .eq(ContractPaymentSchedule::getContractId, id).orderByAsc(ContractPaymentSchedule::getCreateTime));
        scheduleList.stream().forEach(contractPaymentSchedule -> {
            if (contractPaymentSchedule.getStageName().equals("合同签订")){
                map.put("htqdbl",contractPaymentSchedule.getPaymentRatio());
                map.put("htqdje",contractPaymentSchedule.getPlannedAmount());
                map.put("htqdjr",contractPaymentSchedule.getAgreedDays());
            if (contractPaymentSchedule.getStageName().equals("合同签订")) {
                map.put("htqdbl", contractPaymentSchedule.getPaymentRatio());
                map.put("htqdje", contractPaymentSchedule.getPlannedAmount());
                map.put("htqdjr", contractPaymentSchedule.getAgreedDays());
            }
            if (contractPaymentSchedule.getStageName().equals("发货前")){
                map.put("fhqbl",contractPaymentSchedule.getPaymentRatio());
                map.put("fhqje",contractPaymentSchedule.getPlannedAmount());
            if (contractPaymentSchedule.getStageName().equals("发货前")) {
                map.put("fhqbl", contractPaymentSchedule.getPaymentRatio());
                map.put("fhqje", contractPaymentSchedule.getPlannedAmount());
            }
            if (contractPaymentSchedule.getStageName().equals("调试完成或验收")){
                map.put("ysbl",contractPaymentSchedule.getPaymentRatio());
                map.put("ysje",contractPaymentSchedule.getPlannedAmount());
                map.put("ysjr",contractPaymentSchedule.getAgreedDays());
            if (contractPaymentSchedule.getStageName().equals("调试完成或验收")) {
                map.put("ysbl", contractPaymentSchedule.getPaymentRatio());
                map.put("ysje", contractPaymentSchedule.getPlannedAmount());
                map.put("ysjr", contractPaymentSchedule.getAgreedDays());
            }
            if (contractPaymentSchedule.getStageName().equals("质保金")){
                map.put("zbjbl",contractPaymentSchedule.getPaymentRatio());
                map.put("zbjje",contractPaymentSchedule.getPlannedAmount());
                map.put("zbjjr",contractPaymentSchedule.getAgreedDays());
            if (contractPaymentSchedule.getStageName().equals("质保金")) {
                map.put("zbjbl", contractPaymentSchedule.getPaymentRatio());
                map.put("zbjje", contractPaymentSchedule.getPlannedAmount());
                map.put("zbjjr", contractPaymentSchedule.getAgreedDays());
            }
        });
        map.put("items", items);
@@ -1555,19 +1560,19 @@
    @Override
    public R delayOutApproval(DelayOutApprovalDTO dto) {
        Contract contract = baseMapper.selectById(dto.getContractId());
        ContractDelayOut delayOut = BeanUtil.copyProperties(dto,ContractDelayOut.class);
        ContractDelayOut delayOut = BeanUtil.copyProperties(dto, ContractDelayOut.class);
        delayOut.setApplyTime(new Date());
        delayOut.setApplyName(SecurityUtils.getUser().getUsername());
        delayOut.setDelayStatus("0");
        Map<String,Object> map = new HashMap<>();
        map.put("contractId",contract.getId());
        map.put("contractName",contract.getContractName());
        map.put("partyA",contract.getPartyA());
        map.put("partyB",contract.getPartyB());
        map.put("delayDay",dto.getDelayDay());
        map.put("contractNo",contract.getContractNo());
        map.put("applyName",SecurityUtils.getUser().getUsername());
        map.put("applyTime",DateUtil.format(delayOut.getApplyTime(),DatePattern.NORM_DATETIME_FORMAT));
        Map<String, Object> map = new HashMap<>();
        map.put("contractId", contract.getId());
        map.put("contractName", contract.getContractName());
        map.put("partyA", contract.getPartyA());
        map.put("partyB", contract.getPartyB());
        map.put("delayDay", dto.getDelayDay());
        map.put("contractNo", contract.getContractNo());
        map.put("applyName", SecurityUtils.getUser().getUsername());
        map.put("applyTime", DateUtil.format(delayOut.getApplyTime(), DatePattern.NORM_DATETIME_FORMAT));
        //启动流程
        ProcessInstanceParamDto paramDto = new ProcessInstanceParamDto();
        paramDto.setParamMap(map);
@@ -1582,7 +1587,7 @@

    @Override
    public Page pageScope(Page page, ContracQueryDTO queryDTO) {
        return baseMapper.pageScope(page,queryDTO, DataScope.of("comp_id"));
        return baseMapper.pageScope(page, queryDTO, DataScope.of("comp_id"));
    }

    @Override
@@ -1671,17 +1676,17 @@

    @Override
    public R addContractSgb(ContractAddDTO addDTO) {
        if (ArrayUtil.isEmpty(addDTO.getContractSubjectMatter())){
        if (ArrayUtil.isEmpty(addDTO.getContractSubjectMatter())) {
            return R.failed("请添加标的物");
        }
        if (ArrayUtil.isEmpty(addDTO.getContractPaymentSchedule())){
        if (ArrayUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
            return R.failed("请添加付款阶段或付款阶段缺少");
        }
        if (!isValidPaymentStages(addDTO.getContractPaymentSchedule())){
        if (!isValidPaymentStages(addDTO.getContractPaymentSchedule())) {
            return R.failed("付款阶段信息异常");
        }
        if (addDTO.getContractPaymentSchedule().stream().map(item->item.getPaymentRatio()).reduce(BigDecimal.ZERO,BigDecimal::add)
                .compareTo(new BigDecimal("100.00"))!=0){
        if (addDTO.getContractPaymentSchedule().stream().map(item -> item.getPaymentRatio()).reduce(BigDecimal.ZERO, BigDecimal::add)
                .compareTo(new BigDecimal("100.00")) != 0) {
            return R.failed("付款阶段比例异常");
        }
        Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
@@ -1696,18 +1701,21 @@

        BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getErpCompanyCode,
                addDTO.getPartyACode()).last("limit 1"));
        if (ObjUtil.isNull(bc)){
        if (ObjUtil.isNull(bc)) {
            return R.failed("erp客户编码不存在");
        }
        contract.setPartyAId(bc.getId());
        contract.setPartyA(bc.getCompanyName());
        if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())){
            contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(),addDTO.getDeliveryCycle()));
        if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
            contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
        }

        if (ObjUtil.isNotNull(contract.getSignDate()) && ObjUtil.isNotNull(contract.getExpirationDate())) {
            Long bd = DateUtil.betweenDay(contract.getExpirationDate(), contract.getSignDate(), true);
            contract.setDeliveryCycle(bd.intValue());
        }
        contract.setContractNo(generateGYBContractNo());

        if (!StrUtil.equals(addDTO.getContractCategory(), "water_house")){
        if (!StrUtil.equals(addDTO.getContractCategory(), "water_house")) {
            // 假设 list 是你的 List<ContractSubjectMatterAddDTO>
            Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
                    .filter(item -> item.getPlannedDeliveryDate() != null) // 过滤掉日期为空的项，避免 NullPointerException
@@ -1732,7 +1740,7 @@
                //水电类必须有初次表号
                if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
                        ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
                    MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class,"id");
                    MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
                    record.setContractId(contract.getId());
                    record.setMatterId(subjectMatter.getId());
                    record.setContractName(contract.getContractName());
@@ -1742,8 +1750,8 @@
                    meterReadRecordMapper.insert(record);
                }
                if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "ymjcg")
                        &&ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())&&ObjUtil.isNotNull(contract.getExpirationDate())
                        &&DateUtil.compare(contract.getExpirationDate(),subjectMatter.getPlannedDeliveryDate())>0) {
                        && ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate()) && ObjUtil.isNotNull(contract.getExpirationDate())
                        && DateUtil.compare(contract.getExpirationDate(), subjectMatter.getPlannedDeliveryDate()) > 0) {
                    contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
                    baseMapper.updateById(contract);
                }
@@ -1794,30 +1802,30 @@

    @Override
    public R updateContractSgb(ContractUpdateDTO updateDTO) {
        if (ArrayUtil.isEmpty(updateDTO.getContractSubjectMatter())){
        if (ArrayUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
            return R.failed("请添加标的物");
        }
        if (ArrayUtil.isEmpty(updateDTO.getContractPaymentSchedule())){
        if (ArrayUtil.isEmpty(updateDTO.getContractPaymentSchedule())) {
            return R.failed("请添加付款阶段或付款阶段缺少");
        }
        if (!isValidPaymentStages(updateDTO.getContractPaymentSchedule())){
        if (!isValidPaymentStages(updateDTO.getContractPaymentSchedule())) {
            return R.failed("付款阶段信息异常");
        }
        if (updateDTO.getContractPaymentSchedule().stream().map(item->item.getPaymentRatio()).reduce(BigDecimal.ZERO,BigDecimal::add)
                .compareTo(new BigDecimal("100.00"))!=0){
        if (updateDTO.getContractPaymentSchedule().stream().map(item -> item.getPaymentRatio()).reduce(BigDecimal.ZERO, BigDecimal::add)
                .compareTo(new BigDecimal("100.00")) != 0) {
            return R.failed("付款阶段比例异常");
        }

        Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId,updateDTO.getDataId()).last("limit 1"));
        if (ObjUtil.isNull(contractOld)){
            return R.failed("合同数据ID：{}不存在，请先新增后再修改",updateDTO.getDataId());
        Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, updateDTO.getDataId()).last("limit 1"));
        if (ObjUtil.isNull(contractOld)) {
            return R.failed("合同数据ID：{}不存在，请先新增后再修改", updateDTO.getDataId());
        }
        Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
        contract.setId(contractOld.getId());
        if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())){
            contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(),updateDTO.getDeliveryCycle()));
        if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())) {
            contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(), updateDTO.getDeliveryCycle()));
        }
        if (!StrUtil.equals(updateDTO.getContractCategory(), "water_house")){
        if (!StrUtil.equals(updateDTO.getContractCategory(), "water_house")) {
            // 假设 list 是你的 List<ContractSubjectMatterAddDTO>
            Optional<ContractSubjectMatterAddDTO> maxDateObj = updateDTO.getContractSubjectMatter().stream()
                    .filter(item -> item.getPlannedDeliveryDate() != null) // 过滤掉日期为空的项，避免 NullPointerException
@@ -1844,7 +1852,7 @@
                if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
                        ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
                    meterReadRecordMapper.delete(Wrappers.<MeterReadRecord>lambdaQuery().eq(MeterReadRecord::getContractId, contract.getId()));
                    MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class,"id");
                    MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
                    record.setContractId(contract.getId());
                    record.setMatterId(subjectMatter.getId());
                    record.setContractName(contract.getContractName());
@@ -1899,6 +1907,7 @@

    /**
     * 判断付款阶段列表是否符合标准
     *
     * @param scheduleList 付款阶段列表
     * @return true 如果包含且仅包含标准的五个阶段，false 否则
     */
@@ -1930,7 +1939,7 @@
    /**
     * 生成格式为: yyyyMMdd + 4位序列号 (例如: 20260629000001)
     */
    public  String generateSMJContractNo() {
    public String generateSMJContractNo() {
        // 1. 获取当前日期字符串
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

@@ -1945,10 +1954,10 @@
        String seqStr = String.format("%04d", sequence);

        // 5. 拼接返回
        return "ZB-SMJ-"+dateStr + seqStr;
        return "ZB-SMJ-" + dateStr + seqStr;
    }

    public  String generateYMJContractNo() {
    public String generateYMJContractNo() {
        // 1. 获取当前日期字符串
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

@@ -1963,10 +1972,10 @@
        String seqStr = String.format("%04d", sequence);

        // 5. 拼接返回
        return "ZB-YMJ-"+dateStr + seqStr;
        return "ZB-YMJ-" + dateStr + seqStr;
    }

    public  String generateJXCContractNo() {
    public String generateJXCContractNo() {
        // 1. 获取当前日期字符串
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

@@ -1981,10 +1990,10 @@
        String seqStr = String.format("%04d", sequence);

        // 5. 拼接返回
        return "ZB-JXC-"+dateStr + seqStr;
        return "ZB-JXC-" + dateStr + seqStr;
    }

    public  String generateTFContractNo() {
    public String generateTFContractNo() {
        // 1. 获取当前日期字符串
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

@@ -1999,10 +2008,10 @@
        String seqStr = String.format("%04d", sequence);

        // 5. 拼接返回
        return "ZB-TF-"+dateStr + seqStr;
        return "ZB-TF-" + dateStr + seqStr;
    }

    public  String generateGYBContractNo() {
    public String generateGYBContractNo() {
        // 1. 获取当前日期字符串
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

@@ -2017,14 +2026,14 @@
        String seqStr = String.format("%04d", sequence);

        // 5. 拼接返回
        return "ZB-GYB-"+dateStr + seqStr;
        return "ZB-GYB-" + dateStr + seqStr;
    }

    @Override
    public R abortContractSgb(String dataId) {
        Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId,dataId).last("limit 1"));
        if (ObjUtil.isNull(contractOld)){
            return R.failed("合同数据ID：{}不存在，请先新增后再操作",dataId);
        Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, dataId).last("limit 1"));
        if (ObjUtil.isNull(contractOld)) {
            return R.failed("合同数据ID：{}不存在，请先新增后再操作", dataId);
        }
        contractOld.setContractStatus(4);
        baseMapper.updateById(contractOld);
@@ -2033,37 +2042,37 @@

    @Override
    public R delContractSgb(String dataId) {
        Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId,dataId).last("limit 1"));
        if (ObjUtil.isNull(contractOld)){
            return R.failed("合同数据ID：{}不存在，请先新增后再操作",dataId);
        Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, dataId).last("limit 1"));
        if (ObjUtil.isNull(contractOld)) {
            return R.failed("合同数据ID：{}不存在，请先新增后再操作", dataId);
        }

        contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contractOld.getId()));
        contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contractOld.getId()));
        paymentConfirmMapper.delete(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contractOld.getId()));
        contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contractOld.getId()));
        contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contractOld.getId()));
        paymentConfirmMapper.delete(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contractOld.getId()));
        baseMapper.deleteById(contractOld);
        return R.ok();
    }

    @Override
    public Page fourAssociation(Page page,ContractQueryDTO queryDTO) {
        Page<FourAssociationPageVo> page1 = baseMapper.fourAssociation(page,queryDTO,DataScope.of("comp_id"));
        if (ArrayUtil.isNotEmpty(page1.getRecords())){
    public Page fourAssociation(Page page, ContractQueryDTO queryDTO) {
        Page<FourAssociationPageVo> page1 = baseMapper.fourAssociation(page, queryDTO, DataScope.of("comp_id"));
        if (ArrayUtil.isNotEmpty(page1.getRecords())) {
            page1.getRecords().stream().forEach(fourAssociationPageVo -> {
                List<PaymentSlip> slips = paymentSlipMapper.selectList(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getContractId,fourAssociationPageVo.getId())
                List<PaymentSlip> slips = paymentSlipMapper.selectList(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getContractId, fourAssociationPageVo.getId())
                        .orderByAsc(PaymentSlip::getPaymentTime));
                if (ArrayUtil.isNotEmpty(slips)){
                    fourAssociationPageVo.setSlipVoList(BeanUtil.copyToList(slips,ContractSlipVo.class));
                if (ArrayUtil.isNotEmpty(slips)) {
                    fourAssociationPageVo.setSlipVoList(BeanUtil.copyToList(slips, ContractSlipVo.class));
                }
                List<ContractInvoice> invoices = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId,fourAssociationPageVo.getId())
                List<ContractInvoice> invoices = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId, fourAssociationPageVo.getId())
                        .orderByAsc(ContractInvoice::getInvoiceTime));
                if (ArrayUtil.isNotEmpty(invoices)){
                if (ArrayUtil.isNotEmpty(invoices)) {
                    fourAssociationPageVo.setInvoiceVoList(BeanUtil.copyToList(invoices, ContractInvoiceVo.class));
                }
                if (fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getPaidAmount())==0&&
                        fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getBillingAmout())==0&&
                    ArrayUtil.isNotEmpty(slips)&&ArrayUtil.isNotEmpty(invoices)
                ){
                if (fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getPaidAmount()) == 0 &&
                        fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getBillingAmout()) == 0 &&
                        ArrayUtil.isNotEmpty(slips) && ArrayUtil.isNotEmpty(invoices)
                ) {
                    fourAssociationPageVo.setAssociation("已完成");
                }
            });
@@ -2176,21 +2185,21 @@
        map.put("useMonth", contract.getUseMonth());
        map.put("afterShipMonth", contract.getAfterShipMonth());
        map.put("deliveryCycle", contract.getDeliveryCycle());
        map.put("advancePayment", contract.getAdvancePayment()+"%");
        map.put("advancePayment", contract.getAdvancePayment() + "%");
        map.put("inspectDay", contract.getInspectDay());
        map.put("acceptDay", contract.getAcceptDay());
        map.put("delayAcceptDay", contract.getDelayAcceptDay());
        map.put("acceptPassDay", contract.getAcceptPassDay());
        map.put("acceptPassAmount", contract.getAcceptPassAmount()+"%");
        map.put("acceptPassAmount", contract.getAcceptPassAmount() + "%");
        map.put("deliverDay", contract.getDeliverDay());
        map.put("deliverCompleteDay", contract.getDeliverCompleteDay());
        map.put("shipAddress", contract.getShipAddress());
        map.put("htqdr", scheduleList.get(0).getAgreedDays());
        map.put("htqdq", scheduleList.get(0).getPaymentRatio()+"%");
        map.put("fhqq", scheduleList.get(1).getPaymentRatio()+"%");
        map.put("htqdq", scheduleList.get(0).getPaymentRatio() + "%");
        map.put("fhqq", scheduleList.get(1).getPaymentRatio() + "%");
        map.put("dhhr", scheduleList.get(2).getAgreedDays());
        map.put("dhhq", scheduleList.get(2).getPaymentRatio()+"%");
        map.put("zbjq", scheduleList.get(4).getPaymentRatio()+"%");
        map.put("dhhq", scheduleList.get(2).getPaymentRatio() + "%");
        map.put("zbjq", scheduleList.get(4).getPaymentRatio() + "%");
        map.put("zbqm", scheduleList.get(4).getAgreedDays());
        map.put("paymentMethod", contract.getPaymentMethod());
        map.put("invoiceNotice", contract.getInvoiceNotice());
@@ -2199,21 +2208,20 @@
        map.put("buyerAgent", contract.getBuyerAgent());
        map.put("buyerAgentIDCard", contract.getBuyerAgentIdCard());
        map.put("agentAuthority", contract.getAgentAuthority());
        map.put("delayPayAdvancePayment", contract.getDelayPayAdvancePayment()+"%");
        map.put("delayPayAProcessPayment", contract.getDelayPayProcessPayment()+"%");
        map.put("delayPayAdvancePayment", contract.getDelayPayAdvancePayment() + "%");
        map.put("delayPayAProcessPayment", contract.getDelayPayProcessPayment() + "%");
        map.put("receiveAdvancePaymentMonth", contract.getReceiveAdvancePaymentMonth());
        map.put("noticeSupplierAcceptDay", contract.getNoticeSupplierAcceptDay());
        map.put("overdueDay", contract.getOverdueDay());
        map.put("lossAmount", contract.getLossAmount()+"%");
        map.put("liquidatedDamagesHighSupplier", contract.getLiquidatedDamagesHighSupplier()+"%");
        map.put("lossAmount", contract.getLossAmount() + "%");
        map.put("liquidatedDamagesHighSupplier", contract.getLiquidatedDamagesHighSupplier() + "%");
        map.put("overdueDayXf", contract.getOverdueDayXf());
        map.put("lossAmountXf", contract.getLossAmountXf()+"%");
        map.put("liquidatedDamagesHighBuyer", contract.getLiquidatedDamagesHighBuyer()+"%");
        map.put("lossAmountXf", contract.getLossAmountXf() + "%");
        map.put("liquidatedDamagesHighBuyer", contract.getLiquidatedDamagesHighBuyer() + "%");
        map.put("contractAttchment", contract.getContractAttchment());
        map.put("totalParts", contract.getTotalParts());
        map.put("supplierPart", contract.getSupplierPart());
        map.put("buyerPart", contract.getBuyerPart());



        //标的物
@@ -2287,9 +2295,9 @@
        Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
        contract.setPartyBId(SecurityUtils.getUser().getCompId());
        contract.setPartyB(SecurityUtils.getUser().getCompName());
        if (StrUtil.isEmpty(addDTO.getPartyA())){
        if (StrUtil.isEmpty(addDTO.getPartyA())) {
            BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
            if (ObjUtil.isNotNull(bc)){
            if (ObjUtil.isNotNull(bc)) {
                contract.setPartyA(bc.getCompanyName());
            }
        }
@@ -2300,20 +2308,20 @@
        contract.setErpPushFlag("0");
        contract.setNickName(SecurityUtils.getUser().getNickname());

        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
                StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
                StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
            contract.setContractNo(generateSMJContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
            contract.setContractNo(generateGYBContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
            contract.setContractNo(generateYMJContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
            contract.setContractNo(generateTFContractNo());
        }
        if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
        if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
            contract.setContractNo(generateJXCContractNo());
        }
        baseMapper.insert(contract);
@@ -2323,8 +2331,8 @@
    @Override
    public R pushCenter(Long id) {
        Contract contract = baseMapper.selectById(id);
        List<ContractSubjectMatter> subjectMatterList=contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
                .eq(ContractSubjectMatter::getContractId,id));
        List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
                .eq(ContractSubjectMatter::getContractId, id));
        JSONObject requestApply = new JSONObject();
        requestApply.put("fd_selectionmethod", "公开招标");
        requestApply.put("fd_isrelated", "是");
@@ -2381,4 +2389,220 @@
        }
        return R.ok();
    }

    @Override
    public R importContractMultiSheet(MultipartFile file) {

        // 用于收集所有 Sheet 解析后的最终结果（如果需要统一返回或处理）
        // 注意：如果数据量极大，建议在 Listener 中直接入库，不要全部加载到内存 List 中
        List<ContractExceVO> baseList = new ArrayList<>();
        List<ContractPaymentScheduleExceVO> scheduleList = new ArrayList<>();
        List<ContractSubjectMatterExceVO> matterList = new ArrayList<>();

        try (ExcelReader excelReader = EasyExcel.read(file.getInputStream()).build()) {

            // 1. 构建第一个 Sheet 的读取配置
            ReadSheet sheet0 = EasyExcel.readSheet(0)
                    .headRowNumber(1) // 表头行数
                    .head(ContractExceVO.class) // 指定实体类
                    .registerReadListener(new BatchInsertListener<ContractExceVO>(data -> {
                        baseList.addAll(data);
                        // 建议：在这里直接调用 service 保存，而不是 addTo List，除非数据量很小
                        // contractService.saveBaseInfo(data);
                    }))
                    .build();

            // 2. 构建第二个 Sheet 的读取配置
            ReadSheet sheet1 = EasyExcel.readSheet(1)
                    .headRowNumber(1)
                    .head(ContractSubjectMatterExceVO.class)
                    .registerReadListener(new BatchInsertListener<ContractSubjectMatterExceVO>(data -> {
                        matterList.addAll(data);
                        // contractService.saveSchedule(data);
                    }))
                    .build();

            // 3. 构建第三个 Sheet 的读取配置
            ReadSheet sheet2 = EasyExcel.readSheet(2)
                    .headRowNumber(1)
                    .head(ContractPaymentScheduleExceVO.class) // 注意：这里你原代码写的是 ContractPaymentScheduleExceVO，但变量是 matterList，需确认实体类是否一致
                    .registerReadListener(new BatchInsertListener<ContractPaymentScheduleExceVO>(data -> {
                        scheduleList.addAll(data);
                        // contractService.saveMatter(data);
                    }))
                    .build();

            // 4. 依次执行读取
            // 注意：excelReader.read(sheet) 会复用同一个输入流，所以必须用 try-with-resources 确保流管理正确
            excelReader.read(sheet0);
            excelReader.read(sheet1);
            excelReader.read(sheet2);
            // 后续处理 baseList, scheduleList, matterList
            log.info("主表数据量: " + baseList.size());
            log.info("进度表数据量: " + scheduleList.size());
            log.info("标的物数据量: " + matterList.size());
            List<Map<String, String>> errList = new ArrayList<>();
            for (int i = 0; i < baseList.size(); i++) {
                ContractExceVO contractExceVO = baseList.get(i);
                if (StrUtil.isBlank(contractExceVO.getContractNo())) {
                    Map<String, String> map = new HashMap<String, String>();
                    map.put("lineNum", "第" + (i + 1) + "行");
                    map.put("errors", "合同编号为空");
                    errList.add(map);
                    continue;
                }
                BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
                        .eq(BusinessCustomer::getErpCompanyCode, contractExceVO.getBcErpCode()));
                if (ObjUtil.isNull(bc)) {
                    Map<String, String> map = new HashMap<String, String>();
                    map.put("lineNum", "第" + (i + 1) + "行");
                    map.put("errors", "客户erp编码不存在");
                    errList.add(map);
                    continue;
                }
                R<List<SysDictItem>> rem = remoteDictService.getDictByType("economic_matters");
                if (!rem.isOk()) {
                    return R.failed("经济事项字典查询异常");
                }
                List<SysDictItem> itemList = rem.getData();
                for (SysDictItem dictItem : itemList
                ) {
                    if (StrUtil.equals(contractExceVO.getEconomicMatters(), dictItem.getLabel())) {
                        contractExceVO.setEconomicMatters(dictItem.getItemValue());
                        break;
                    }
                }
                R<List<SysDictItem>> rsa = remoteDictService.getDictByType("supply_attribute");
                if (!rsa.isOk()) {
                    return R.failed("供应属性字典查询异常");
                }
                for (SysDictItem dictItem : rsa.getData()
                ) {
                    if (StrUtil.equals(contractExceVO.getSupplyAttribute().replace(" ", ""), dictItem.getLabel())) {
                        contractExceVO.setSupplyAttribute(dictItem.getItemValue());
                        break;
                    }
                }
                R<List<SysDictItem>> rssa = remoteDictService.getDictByType("server_attribute");
                if (!rssa.isOk()) {
                    return R.failed("服务属性字典查询异常");
                }
                for (SysDictItem dictItem : rssa.getData()
                ) {
                    if (StrUtil.equals(contractExceVO.getContractAttribute().replace(" ", ""), dictItem.getLabel())) {
                        contractExceVO.setContractAttribute(dictItem.getItemValue());
                        break;
                    }
                }
                R<List<SysDictItem>> ris = remoteDictService.getDictByType("industry_sector");
                if (!ris.isOk()) {
                    return R.failed("服务属性字典查询异常");
                }
                for (SysDictItem dictItem : ris.getData()
                ) {
                    if (StrUtil.equals(contractExceVO.getIndustryCode(), dictItem.getLabel())) {
                        contractExceVO.setIndustryCode(dictItem.getItemValue());
                        break;
                    }
                }
                List<Contract> contractList = baseMapper.selectList(Wrappers.<Contract>lambdaQuery()
                        .eq(Contract::getContractNo, contractExceVO.getContractNo()));
                if (CollUtil.isNotEmpty(contractList)) {
                    Map<String, String> map = new HashMap<String, String>();
                    map.put("lineNum", "第" + (i + 1) + "行");
                    map.put("errors", "合同编号已存在");
                    errList.add(map);
                    continue;
                }
                Contract contract = BeanUtil.copyProperties(contractExceVO, Contract.class);
                if (ObjUtil.isNotNull(contract.getSignDate()) && ObjUtil.isNotNull(contract.getExpirationDate())) {
                    Long bd = DateUtil.betweenDay(contract.getExpirationDate(), contract.getSignDate(), true);
                    contract.setDeliveryCycle(bd.intValue());
                }
                contract.setPartyA(bc.getCompanyName());
                contract.setPartyAId(bc.getId());
                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.setBillingStatus("1");
                baseMapper.insert(contract);
                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());
                if (CollUtil.isNotEmpty(resultMatter)) {
                    for (ContractSubjectMatterExceVO subMatEx : resultMatter
                    ) {
                        ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(subMatEx, ContractSubjectMatter.class);
                        subjectMatter.setContractId(contract.getId());
                        subjectMatter.setDeliveredQuantity(StrUtil.isBlank(subMatEx.getDeliveredQuantity())
                                ? new BigDecimal("0") : new BigDecimal(subMatEx.getDeliveredQuantity()));
                        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);
                        contractSubjectMatterMapper.insert(subjectMatter);
                    }
                }
                List<ContractPaymentScheduleExceVO> resultSchedule = scheduleList.stream().filter(item ->
                        StrUtil.equals(item.getContractNo(), contract.getContractNo())).collect(Collectors.toList());
                if (CollUtil.isNotEmpty(resultSchedule)) {

                    for (int j = 0; j < resultSchedule.size(); j++) {
                        ContractPaymentSchedule schedule = new ContractPaymentSchedule();
                        schedule.setStageName(resultSchedule.get(j).getStageName());
                        schedule.setContractId(contract.getId());
                        schedule.setPaymentRatio(StrUtil.isBlank(resultSchedule.get(j).getPaymentRatio())
                                ? new BigDecimal("0") : new BigDecimal(resultSchedule.get(j).getPaymentRatio()));
                        schedule.setAgreedDays(StrUtil.isBlank(resultSchedule.get(j).getAgreedDays())
                                ? 0 : Integer.valueOf(resultSchedule.get(j).getPaymentRatio()));
                        schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio())
                                .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){
                            remainAmount = remainAmount.subtract(schedule.getPlannedAmount());
                            if (remainAmount.compareTo(new BigDecimal("0"))>=0){
                                schedule.setPaymentStatus(2);
                                schedule.setActualAmount(schedule.getPlannedAmount());
                            }
                            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){
                            PaymentConfirm confirm = new PaymentConfirm();
                            confirm.setBusGuestId(contract.getPartyAId());
                            confirm.setBusGuestName(contract.getPartyA());
                            confirm.setBusinessType("质保金应收");
                            confirm.setConfirmTime(new Date());
                            confirm.setContractId(contract.getId());
                            confirm.setContractName(contract.getContractName());
                            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.setReceivableAmount(confirm.getTransationAmount());
                            confirm.setTotalAmount(confirm.getTransationAmount().multiply(new BigDecimal("-1")));
                            paymentConfirmMapper.insert(confirm);
                        }
                    }
                }
            }
            if (CollUtil.isNotEmpty(errList)) {
                return R.failed(errList);
            }
        } catch (IOException e) {
            e.printStackTrace();
            return R.failed("文件解析失败: " + e.getMessage());
        }
        return R.ok();
    }
}

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

@@ -108,20 +108,20 @@
        //出库
        addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
            OutBound outBound = BeanUtil.copyProperties(outSubjectMatterAddDTO, OutBound.class);
            if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
                    StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
            if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
                    StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
                outBound.setBatchNumber(generateSMJContractCKNo());
            }
            if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
            if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
                outBound.setBatchNumber(generateGYBContractCKNo());
            }
            if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
            if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
                outBound.setBatchNumber(generateYMJContractCKNo());
            }
            if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
            if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
                outBound.setBatchNumber(generateTFContractCKNo());
            }
            if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
            if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
                outBound.setBatchNumber(generateJXCContractCKNo());
            }
            outBound.setBusGuestName(addDTO.getBusGuestName());
@@ -210,16 +210,16 @@
                    //合同金额
                    Contract contract = contractMapper.selectById(contractId);
                    //出库是否完成
                    if (outPirce.compareTo(contract.getBillingAmout())>0) {
                    if (outPirce.compareTo(contract.getBillingAmout()) > 0) {
                        contract.setBillingStatus("2");
                        contractMapper.updateById(contract);
                    }
                    if (outPirce.compareTo(contract.getBillingAmout())==0) {
                    if (outPirce.compareTo(contract.getBillingAmout()) == 0) {
                        contract.setBillingStatus("1");
                        contractMapper.updateById(contract);
                    }
                    if (outPirce.compareTo(contract.getAmount()) == 0&&
                            outPirce.compareTo(contract.getBillingAmout())==0) {
                    if (outPirce.compareTo(contract.getAmount()) == 0 &&
                            outPirce.compareTo(contract.getBillingAmout()) == 0) {
                        contract.setBillingStatus("3");
                        contractMapper.updateById(contract);
                    }
@@ -406,7 +406,7 @@
                        PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
                                .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
                        if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
                                &&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
                                && contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
                            //有预付且超过应收 关闭合同状态
                            contract.setContractStatus(3);
                            contractMapper.updateById(contract);
@@ -427,7 +427,7 @@
        contractOutBound.setBusGuestName(contract.getPartyA());
        contractOutBound.setSubjectMatterCode(subjectMatter.getMaterialCode());
        contractOutBound.setSubjectMatterName(subjectMatter.getMaterialInternalName());
        contractOutBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime())?addDTO.getOutBoundTime():new Date());
        contractOutBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime()) ? addDTO.getOutBoundTime() : new Date());
        contractOutBound.setOutBoundNum(subjectMatter.getLastDeliveredQuantity());
        contractOutBound.setOutBoundAttNames(addDTO.getOutBoundAttNames());
        contractOutBound.setOutBoundAttPaths(addDTO.getOutBoundAttPaths());
@@ -436,7 +436,7 @@
        contractOutBound.setInvoiceStatus("0");
        contractOutBound.setInvoiceNum(new BigDecimal("0"));
        contractOutBoundMapper.insert(contractOutBound);
        if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
        if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
            // 1. 确定用于比较的基准日期（优先级：计划交货日期 > 合同到期日期）
            Date deadline = subjectMatter.getPlannedDeliveryDate();
            if (ObjUtil.isNull(deadline)) {
@@ -495,44 +495,44 @@
        if (ObjUtil.isNull(contract)) {
            return R.failed("合同信息查询失败");
        }
        if (addDTO.getSubjectMatterList().stream().allMatch(item->item.getOutBoundNum().compareTo(new BigDecimal("0"))==0)){
        if (addDTO.getSubjectMatterList().stream().allMatch(item -> item.getOutBoundNum().compareTo(new BigDecimal("0")) == 0)) {
            return R.failed("出库数量不能都为为0");
        }
        addDTO.setSubjectMatterList(addDTO.getSubjectMatterList().stream().filter(item->item.getOutBoundNum().compareTo(new BigDecimal("0"))>0).collect(Collectors.toList()));
        addDTO.setSubjectMatterList(addDTO.getSubjectMatterList().stream().filter(item -> item.getOutBoundNum().compareTo(new BigDecimal("0")) > 0).collect(Collectors.toList()));
        //出库数量校验
        for (OutSubjectMatterAddDTO outSubjectMatterAddDTO:    addDTO.getSubjectMatterList()) {
        for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
            ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
                    .eq(ContractSubjectMatter::getContractId,contract.getId())
                    .eq(ContractSubjectMatter::getMaterialCode,outSubjectMatterAddDTO.getSubjectMatterCode())
                    .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()),ContractSubjectMatter::getLineNo,outSubjectMatterAddDTO.getLineNo())
                    .eq(ContractSubjectMatter::getContractId, contract.getId())
                    .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
                    .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
                    .last("limit 1"));
            if (ObjUtil.isNull(subjectMatter)){
            if (ObjUtil.isNull(subjectMatter)) {
                continue;
            }
            if (subjectMatter.getDeliveryStatus()==0){
                if (outSubjectMatterAddDTO.getOutBoundNum().compareTo(subjectMatter.getQuantity())>0){
                    return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode()+"出库数不能超过合同中数量");
            if (subjectMatter.getDeliveryStatus() == 0) {
                if (outSubjectMatterAddDTO.getOutBoundNum().compareTo(subjectMatter.getQuantity()) > 0) {
                    return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode() + "出库数不能超过合同中数量");
                }
            }
            if (subjectMatter.getDeliveryStatus()==1){
                if (outSubjectMatterAddDTO.getOutBoundNum().compareTo(subjectMatter.getRemainingQuantity())>0){
                    return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode()+"出库数不能超过未出库数量");
            if (subjectMatter.getDeliveryStatus() == 1) {
                if (outSubjectMatterAddDTO.getOutBoundNum().compareTo(subjectMatter.getRemainingQuantity()) > 0) {
                    return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode() + "出库数不能超过未出库数量");
                }
            }
            if (subjectMatter.getDeliveryStatus()==2){
                return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode()+"已出库完成，不能超额出库");
            if (subjectMatter.getDeliveryStatus() == 2) {
                return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode() + "已出库完成，不能超额出库");
            }
        }


        addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
                ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
                    .eq(ContractSubjectMatter::getContractId,contract.getId())
                    .eq(ContractSubjectMatter::getMaterialCode,outSubjectMatterAddDTO.getSubjectMatterCode())
                    .ne(ContractSubjectMatter::getDeliveryStatus,2)
                    .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()),ContractSubjectMatter::getLineNo,outSubjectMatterAddDTO.getLineNo())
            ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
                    .eq(ContractSubjectMatter::getContractId, contract.getId())
                    .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
                    .ne(ContractSubjectMatter::getDeliveryStatus, 2)
                    .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
                    .last("limit 1"));
            if (ObjUtil.isNull(subjectMatter)){
            if (ObjUtil.isNull(subjectMatter)) {
                return;
            }
            subjectMatter.setLastDeliveredQuantity(outSubjectMatterAddDTO.getOutBoundNum());
@@ -553,20 +553,20 @@
            contractSubjectMatterMapper.updateById(subjectMatter);
            //
            OutBound outBound = new OutBound();
            if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
                    StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
            if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
                    StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
                outBound.setBatchNumber(generateSMJContractCKNo());
            }
            if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
            if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
                outBound.setBatchNumber(generateGYBContractCKNo());
            }
            if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
            if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
                outBound.setBatchNumber(generateYMJContractCKNo());
            }
            if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
            if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
                outBound.setBatchNumber(generateTFContractCKNo());
            }
            if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
            if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
                outBound.setBatchNumber(generateJXCContractCKNo());
            }
            outBound.setOutBoundNum(outSubjectMatterAddDTO.getOutBoundNum());
@@ -574,11 +574,11 @@
            outBound.setOutBoundAttPaths(addDTO.getOutBoundAttPaths());
            outBound.setBusGuestName(contract.getPartyA());
            outBound.setBusGuestId(contract.getPartyAId());
            outBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime())?addDTO.getOutBoundTime():new Date());
            outBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime()) ? addDTO.getOutBoundTime() : new Date());
            outBound.setSubjectMatterCode(outSubjectMatterAddDTO.getSubjectMatterCode());
            outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
            outBound.setOutBoundType("1");
            if (StrUtil.isEmpty(addDTO.getOutBoundType())){
            if (StrUtil.isEmpty(addDTO.getOutBoundType())) {
                outBound.setOutBoundType("0");
            }
            baseMapper.insert(outBound);
@@ -590,7 +590,7 @@
                .eq(ContractSubjectMatter::getContractId, contract.getId()).ne(ContractSubjectMatter::getDeliveryStatus, 0));
        //查询合同是否有出库阶段
        ContractPaymentSchedule schedule = scheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId())
                .eq(ContractPaymentSchedule::getStageName, "发货前"));
                .eq(ContractPaymentSchedule::getStageName, "发货前").gt(ContractPaymentSchedule::getPaymentRatio,0).last("limit 1"));
        //存在出库阶段
        if (ObjUtil.isNotNull(schedule)) {
            //当前出库金额
@@ -598,104 +598,107 @@
                    .map(item -> (item.getDeliveryStatus() == 1 ? item.getDeliveredQuantity().multiply(item.getUnitPrice()) : item.getQuantity().multiply(item.getUnitPrice())))
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            //出库是否完成
            if (outPirce.compareTo(contract.getBillingAmout())>0) {
            if (outPirce.compareTo(contract.getBillingAmout()) > 0) {
                contract.setBillingStatus("2");
                contractMapper.updateById(contract);
            }
            if (outPirce.compareTo(contract.getBillingAmout())==0) {
            if (outPirce.compareTo(contract.getBillingAmout()) == 0) {
                contract.setBillingStatus("1");
                contractMapper.updateById(contract);
            }
            if (outPirce.compareTo(contract.getAmount()) == 0&&
                    outPirce.compareTo(contract.getBillingAmout())==0) {
            if (outPirce.compareTo(contract.getAmount()) == 0 &&
                    outPirce.compareTo(contract.getBillingAmout()) == 0) {
                contract.setBillingStatus("3");
                contractMapper.updateById(contract);
            }
            //计算发货前应收更新资金明细
            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(schedule.getId());
            paymentConfirm.setScheduleName(schedule.getStageName());
            paymentConfirm.setConfirmTime(addDTO.getOutBoundTime());
            //计算出库金额
            BigDecimal outAmount = addDTO.getSubjectMatterList().stream().map(item->item.getUnitPrice().multiply(item.getOutBoundNum())).reduce(BigDecimal.ZERO, BigDecimal::add);
            paymentConfirm.setTransationAmount(outAmount.divide(new BigDecimal("100")).multiply(schedule.getPaymentRatio()));
            if (ObjUtil.isNotNull(contract.getOutBoundAmout())){
                contract.setOutBoundAmout(outAmount.add(contract.getOutBoundAmout()));
            }else {
                contract.setOutBoundAmout(outAmount);
            }
            contractMapper.updateById(contract);
            //最近明细
            PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
                    .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
            if (ObjUtil.isNotNull(lastConfirm)) {
            //导入数据不生成应收
            if (targetContractNo.startsWith("ZB-")) {
                //计算发货前应收更新资金明细
                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(schedule.getId());
                paymentConfirm.setScheduleName(schedule.getStageName());
                paymentConfirm.setConfirmTime(addDTO.getOutBoundTime());
                //计算出库金额
                BigDecimal outAmount = addDTO.getSubjectMatterList().stream().map(item -> item.getUnitPrice().multiply(item.getOutBoundNum())).reduce(BigDecimal.ZERO, BigDecimal::add);
                paymentConfirm.setTransationAmount(outAmount.divide(new BigDecimal("100")).multiply(schedule.getPaymentRatio()));
                if (ObjUtil.isNotNull(contract.getOutBoundAmout())) {
                    contract.setOutBoundAmout(outAmount.add(contract.getOutBoundAmout()));
                } else {
                    contract.setOutBoundAmout(outAmount);
                }
                contractMapper.updateById(contract);
                //最近明细
                PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
                        .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
                if (ObjUtil.isNotNull(lastConfirm)) {
                    //不存在发货应收 出库总额
                    paymentConfirm.setTotalAmount(lastConfirm.getTotalAmount().subtract(paymentConfirm.getTransationAmount()));
                    if (paymentConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
                    if (paymentConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
                        paymentConfirm.setAdvanceAmount(paymentConfirm.getTotalAmount());
                    }
                    if (paymentConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
                    if (paymentConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
                        paymentConfirm.setReceivableAmount(paymentConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
                    }
                    if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
                        paymentConfirmMapper.insert(paymentConfirm);
                    }
//                }
            } else {
                //无之前阶段应收
                paymentConfirm.setTotalAmount(paymentConfirm.getTransationAmount().multiply(new BigDecimal("-1")));
                if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
                    paymentConfirmMapper.insert(paymentConfirm);
                    //客户付款完成合同
                    List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
                            .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
                    if (CollUtil.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",
                } else {
                    //无之前阶段应收
                    paymentConfirm.setTotalAmount(paymentConfirm.getTransationAmount().multiply(new BigDecimal("-1")));
                    if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
                        paymentConfirmMapper.insert(paymentConfirm);
                        //客户付款完成合同
                        List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
                                .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
                        if (CollUtil.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 (CollUtil.isNotEmpty(outAmountList)) {
                                BigDecimal currentInSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
                                //新增当前合同 资金转入
                                PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, 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());
                                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(paymentConfirm.getTotalAmount().subtract(currentInSum));
                                    schedule.setPaymentStatus(1);
                                }
                                paymentConfirmMapper.insert(inConfirm);
                                //更新当前阶段实际收款 和 收款状态
                                scheduleMapper.updateById(schedule);
                            }
                        }
                        if (CollUtil.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(paymentConfirm.getTotalAmount().subtract(currentInSum));
                                schedule.setPaymentStatus(1);
                            }
                            paymentConfirmMapper.insert(inConfirm);
                            //更新当前阶段实际收款 和 收款状态
                            scheduleMapper.updateById(schedule);
                        }
                    }
                }
@@ -723,7 +726,7 @@
                    .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
                    .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder())
                    .orderByAsc(ContractPaymentSchedule::getCreateTime));
            if (CollUtil.isNotEmpty(afterSchedule)&&contract.getOutBoundAmout().compareTo(contract.getAmount())==0) {
            if (CollUtil.isNotEmpty(afterSchedule) && contract.getOutBoundAmout().compareTo(contract.getAmount()) == 0) {
                contract.setNextScheduleName(afterSchedule.get(0).getStageName());
                contractMapper.updateById(contract);
            }
@@ -738,7 +741,7 @@
                PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
                        .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
                if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
                        &&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
                        && contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
                    //有预付且超过应收 关闭合同状态
                    contract.setContractStatus(3);
                    contractMapper.updateById(contract);
@@ -751,7 +754,7 @@
    /**
     * 生成格式为: yyyyMMdd + 4位序列号 (例如: 20260629000001)
     */
    public  String generateSMJContractCKNo() {
    public String generateSMJContractCKNo() {
        // 1. 获取当前日期字符串
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

@@ -766,10 +769,10 @@
        String seqStr = String.format("%04d", sequence);

        // 5. 拼接返回
        return "ZB-SMJ-CK-"+dateStr + seqStr;
        return "ZB-SMJ-CK-" + dateStr + seqStr;
    }

    public  String generateYMJContractCKNo() {
    public String generateYMJContractCKNo() {
        // 1. 获取当前日期字符串
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

@@ -784,10 +787,10 @@
        String seqStr = String.format("%04d", sequence);

        // 5. 拼接返回
        return "ZB-YMJ-CK-"+dateStr + seqStr;
        return "ZB-YMJ-CK-" + dateStr + seqStr;
    }

    public  String generateJXCContractCKNo() {
    public String generateJXCContractCKNo() {
        // 1. 获取当前日期字符串
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

@@ -802,10 +805,10 @@
        String seqStr = String.format("%04d", sequence);

        // 5. 拼接返回
        return "ZB-JXC-CK-"+dateStr + seqStr;
        return "ZB-JXC-CK-" + dateStr + seqStr;
    }

    public  String generateTFContractCKNo() {
    public String generateTFContractCKNo() {
        // 1. 获取当前日期字符串
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

@@ -820,10 +823,10 @@
        String seqStr = String.format("%04d", sequence);

        // 5. 拼接返回
        return "ZB-TF-CK-"+dateStr + seqStr;
        return "ZB-TF-CK-" + dateStr + seqStr;
    }

    public  String generateGYBContractCKNo() {
    public String generateGYBContractCKNo() {
        // 1. 获取当前日期字符串
        String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

@@ -838,42 +841,42 @@
        String seqStr = String.format("%04d", sequence);

        // 5. 拼接返回
        return "ZB-GYB-CK-"+dateStr + seqStr;
        return "ZB-GYB-CK-" + dateStr + seqStr;
    }

    @Override
    public R delOutBound(String batchNumber) {
        List<OutBound> outBoundList = baseMapper.selectList(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber,batchNumber));
        if (CollUtil.isEmpty(outBoundList)){
        List<OutBound> outBoundList = baseMapper.selectList(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber, batchNumber));
        if (CollUtil.isEmpty(outBoundList)) {
            return R.failed("出库信息异常，请联系营销系统管理人员");
        }
        List<ContractOutBound> contractOutBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
                .in(ContractOutBound::getOutBoundId,outBoundList.stream().map(OutBound::getId).collect(Collectors.toList())));
        if (CollUtil.isEmpty(contractOutBoundList)){
                .in(ContractOutBound::getOutBoundId, outBoundList.stream().map(OutBound::getId).collect(Collectors.toList())));
        if (CollUtil.isEmpty(contractOutBoundList)) {
            return R.failed("出库信息异常，请联系营销系统管理人员");
        }
        boolean allZero = true;
        for (ContractOutBound item : contractOutBoundList) {
            // 假设 invoiceNum 是 Integer 对象
            if (item.getInvoiceNum() == null || item.getInvoiceNum().compareTo(new BigDecimal("0"))!=0) {
            if (item.getInvoiceNum() == null || item.getInvoiceNum().compareTo(new BigDecimal("0")) != 0) {
                allZero = false;
                break; // 发现一个不符合即退出
            }
        }
        if (!allZero){
        if (!allZero) {
            return R.failed("请先冲减所有蓝牌后在操作");
        }
        for (ContractOutBound item : contractOutBoundList) {
            ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
                    .eq(ContractSubjectMatter::getContractId,item.getContractId()).eq(ContractSubjectMatter::getMaterialCode,item.getSubjectMatterCode())
                    .eq(ContractSubjectMatter::getLineNo,item.getLineNo()));
            if (ObjUtil.isNotNull(subjectMatter)){
                    .eq(ContractSubjectMatter::getContractId, item.getContractId()).eq(ContractSubjectMatter::getMaterialCode, item.getSubjectMatterCode())
                    .eq(ContractSubjectMatter::getLineNo, item.getLineNo()));
            if (ObjUtil.isNotNull(subjectMatter)) {
                subjectMatter.setDeliveredQuantity(subjectMatter.getDeliveredQuantity().subtract(item.getOutBoundNum()));
                subjectMatter.setRemainingQuantity(subjectMatter.getRemainingQuantity().add(item.getOutBoundNum()));
                if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0"))==0){
                if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) == 0) {
                    subjectMatter.setDeliveryStatus(0);
                }
                if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0"))>0){
                if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
                    subjectMatter.setDeliveryStatus(1);
                }
                //标的物更新
@@ -898,7 +901,7 @@
            //出库记录删除
            contractOutBoundMapper.deleteById(item);
        }
        baseMapper.delete(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber,batchNumber));
        baseMapper.delete(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber, batchNumber));
        return R.ok();
    }
}

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/utils/BatchInsertListener.java

New file
@@ -0,0 +1,49 @@
package com.by4cloud.platformx.business.utils;

import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.List;

@Slf4j
public class BatchInsertListener<T> extends AnalysisEventListener<T> {

    private final List<T> cachedDataList = new ArrayList<>();
    private final static int BATCH_COUNT = 1000;
    private final ServiceCallback<T> callback;

    // 函数式接口，用于回调业务逻辑
    @FunctionalInterface
    public interface ServiceCallback<T> {
        void invoke(List<T> data);
    }

    public BatchInsertListener(ServiceCallback<T> callback) {
        this.callback = callback;
    }

    @Override
    public void invoke(T data, AnalysisContext context) {
        cachedDataList.add(data);
        // 达到阈值，执行一次数据库操作
        if (cachedDataList.size() >= BATCH_COUNT) {
            saveData();
            cachedDataList.clear();
        }
    }

    @Override
    public void doAfterAllAnalysed(AnalysisContext context) {
        // 处理剩余数据
        saveData();
        log.info("所有数据解析完成！");
    }

    private void saveData() {
        if (!cachedDataList.isEmpty()) {
            // 调用外部传入的业务逻辑进行保存
            callback.invoke(cachedDataList);
        }
    }
}

 platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml

@@ -1106,6 +1106,9 @@
        <if test="queryDTO.contractName !=null and queryDTO.contractName !=''">
            AND contract_name LIKE CONCAT('%', #{queryDTO.contractName}, '%')
        </if>
        <if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
            AND contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
        </if>
        <if test="queryDTO.partyA !=null and queryDTO.partyA !=''">
            AND party_a LIKE CONCAT('%', #{queryDTO.partyA}, '%')
        </if>