From 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 30 九月 2026 16:12:49 +0800
Subject: [PATCH] feat:合同新增关联单位  开票可根据甲方或关联单位选择开票单位  收款去掉强制确认 收款只关联合同甲方或关联单位

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 3060 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 2,634 insertions(+), 426 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index a9cf047..3add066 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -1,28 +1,38 @@
 package com.by4cloud.platformx.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
+import 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.ContracQueryDTO;
-import com.by4cloud.platformx.business.dto.ContractAddDTO;
-import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
-import com.by4cloud.platformx.business.dto.DelayOutApprovalDTO;
+import com.by4cloud.platformx.business.dto.*;
 import com.by4cloud.platformx.business.entity.*;
 import com.by4cloud.platformx.business.mapper.*;
+import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
 import com.by4cloud.platformx.business.service.ContractService;
-import com.by4cloud.platformx.business.utils.ContractNumberGenerator;
-import com.by4cloud.platformx.business.vo.ContractDetailVo;
+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.*;
 import com.by4cloud.platformx.common.core.util.R;
 import com.by4cloud.platformx.common.data.datascope.DataScope;
 import com.by4cloud.platformx.common.security.util.SecurityUtils;
@@ -33,8 +43,13 @@
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -43,12 +58,16 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+;
 
 /**
  * @author cd
  * @description
  * @date 2026/4/29 14:07
  **/
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> implements ContractService {
@@ -65,33 +84,156 @@
 	private final ProductMapper productMapper;
 	private final RemoteDeptService remoteDeptService;
 	private final ContractDelayOutMapper contractDelayOutMapper;
+	private final ErpRequestRecordMapper erpRequestRecordMapper;
+	private final PaymentSlipMapper paymentSlipMapper;
+	private final ContractInvoiceMapper contractInvoiceMapper;
+	private final StringRedisTemplate redisTemplate;
+	private final ContractOutBoundMapper contractOutBoundMapper;
+	private final RemoteDictService remoteDictService;
+	private final ContractPaymentScheduleProcessService processService;
+	private final ContractSubjectMatterChangeMapper changeMapper;
+	private final ContractApprovalMapper contractApprovalMapper;
+
+	@Value("${erp.ymj}")
+	private String ymjErp;
+
+	@Value("${erp.smj}")
+	private String smjErp;
+
+	@Value("${erp.smjsc}")
+	private String smjscErp;
+
+	@Value("${erp.smjzt}")
+	private String smjztErp;
+
+	@Value("${erp.sgb}")
+	private String sgbErp;
+
+	@Value("${erp.jxc}")
+	private String jxcErp;
+
+	@Value("${erp.tfgs}")
+	private String tfgsErp;
+
+	@Value("${dept.smj}")
+	private String smj;
+
+	@Value("${dept.smjsc}")
+	private String smjsc;
+
+	@Value("${dept.smjzt}")
+	private String smjzt;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
+
+	@Value("${dept.sgb}")
+	private String sgb;
+
+	@Value("${dept.jxc}")
+	private String jxc;
+
+	@Value("${dept.tfgs}")
+	private String tfgs;
+
+	@Value("${dept.ymj}")
+	private String ymj;
+
+	@Value("${tmp.smj}")
+	private String tempSMJ;
+
+	@Value("${tmp.sgb}")
+	private String tempSGB;
+
+	@Value("${tmp.jxc}")
+	private String tempJXC;
+
+	@Value("${tmp.tfgs}")
+	private String tempTFGS;
+
+	@Value("${tmp.ymj}")
+	private String tempYMJ;
 
 	@Override
 	public R add(ContractAddDTO addDTO) {
 		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
 		contract.setPartyBId(SecurityUtils.getUser().getCompId());
 		contract.setPartyB(SecurityUtils.getUser().getCompName());
-		contract.setContractNo(ContractNumberGenerator.generateContractNumber());
-		contract.setPaidAmount(new BigDecimal("0"));
-		contract.setBillingStatus("0");
-		contract.setErpPushFlag("0");
-
-		if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && (
-				StrUtil.equals(addDTO.getContractCategory(), "ymjgkcpmm")||StrUtil.equals(addDTO.getContractCategory(), "ymjgypmm"))) {
-			contract.setExpirationDate(DateUtil.offsetDay(contract.getSignDate(),contract.getDeliveryCycle()));
+		if (StrUtil.isEmpty(addDTO.getPartyA())) {
+			BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
+			if (ObjUtil.isNotNull(bc)) {
+				contract.setPartyA(bc.getCompanyName());
+			}
+			if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())
+					&& StrUtil.isEmpty(bc.getCreditCode())) {
+				return R.failed("璇峰畬鍠勫鎴稥RP缂栫爜鎴栫粍缁囨満鏋勪唬鐮�");
+			}
 		}
-		List<Contract> contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
-		while (ArrayUtil.isNotEmpty(contracts.toArray())) {
-			contract.setContractNo(ContractNumberGenerator.generateContractNumber());
-			contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
+
+		contract.setPaidAmount(new BigDecimal("0"));
+		contract.setBillingStatus("1");
+		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 (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"))) {
+				return R.failed("姘寸數浠g即銆佹埧灞嬬璧佷骇鍝佸彧鑳藉湪姘�/鐢典唬缂存埧灞嬬璧佸悎鍚岋紒");
+			}
+			// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+			Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
+					.filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+					.max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+			if (maxDateObj.isPresent()) {
+				contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+			}
+		}
+
+		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)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			contract.setContractNo(generateSMJContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+			contract.setContractNo(generateGYBContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+			contract.setContractNo(generateYMJContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+			contract.setContractNo(generateTFContractNo());
+		}
+		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());
 		}
 		baseMapper.insert(contract);
 
-		if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+		if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
 			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 				subjectMatter.setContractId(contract.getId());
-				subjectMatter.setContractName(contract.getContractName());
+				subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
 				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
 				subjectMatter.setDeliveryStatus(0);
 				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
@@ -99,7 +241,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());
@@ -109,16 +251,16 @@
 					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);
 				}
 			});
 
 		}
 
-		if (ArrayUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+		if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
 			AtomicInteger index = new AtomicInteger(1);
 			addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
 				int currentIndex = index.getAndIncrement();
@@ -151,6 +293,10 @@
 					contract.setAcceptScheduleId(schedule.getId());
 					baseMapper.updateById(contract);
 				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐ㄤ繚閲�")) {
+					contract.setWarrantyScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
 			});
 
 		}
@@ -165,34 +311,82 @@
 		if (!StrUtil.equals(entity.getContractStatus() + "", "0")) {
 			return R.failed("褰撳墠鐘舵�佹棤娉曚慨鏀瑰悎鍚�");
 		}
+		if (StrUtil.isEmpty(updateDTO.getPartyA())) {
+			BusinessCustomer bc = businessCustomerMapper.selectById(updateDTO.getPartyAId());
+			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())) {
+				return R.failed("璇峰畬鍠勬敼瀹㈡埛鏁版嵁鍚庡啀娣诲姞鍚堝悓");
+			}
+		}
+
 		Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
-		contract.setContractNo(ContractNumberGenerator.generateContractNumber());
-		contract.setBillingStatus("0");
+		contract.setBillingStatus("1");
 		contract.setErpPushFlag("0");
 		contract.setPaidAmount(new BigDecimal("0"));
-		List<Contract> contracts;
-		contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
-		while (ArrayUtil.isNotEmpty(contracts.toArray())) {
-			contract.setContractNo(ContractNumberGenerator.generateContractNumber());
-			contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
+		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)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			contract.setContractNo(generateSMJContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+			contract.setContractNo(generateGYBContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+			contract.setContractNo(generateYMJContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+			contract.setContractNo(generateTFContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+			contract.setContractNo(generateJXCContractNo());
+		}
+		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"))) {
+				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"))) {
+				return R.failed("姘寸數浠g即銆佹埧灞嬬璧佷骇鍝佸彧鑳藉湪姘�/鐢典唬缂存埧灞嬬璧佸悎鍚岋紒");
+			}
+			// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+			// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+			Optional<ContractSubjectMatterAddDTO> maxDateObj = updateDTO.getContractSubjectMatter().stream()
+					.filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+					.max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+			if (maxDateObj.isPresent()) {
+				contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+			}
 		}
 		baseMapper.updateById(contract);
 
-		if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+		if (CollUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
 			contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
 
 			updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 				subjectMatter.setContractId(contract.getId());
-				subjectMatter.setContractName(contract.getContractName());
+				subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
 				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
 				subjectMatter.setDeliveryStatus(0);
+				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
 				contractSubjectMatterMapper.insert(subjectMatter);
 				//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
 				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());
@@ -204,7 +398,7 @@
 			});
 		}
 
-		if (ArrayUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
+		if (CollUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
 			contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
 
 			AtomicInteger index = new AtomicInteger(1);
@@ -229,6 +423,10 @@
 					contract.setAcceptScheduleId(schedule.getId());
 					baseMapper.updateById(contract);
 				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐ㄤ繚閲�")) {
+					contract.setWarrantyScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
 			});
 
 		}
@@ -245,24 +443,197 @@
 		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)) {
+			detailVo.setContractOutBound(outBoundList);
+		}
+		List<ContractInvoice> invoiceList = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
+				.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)) {
+			detailVo.setPaymentSlip(slipList);
+		}
+		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+
+		ContractInvoiceBipVo bipVo = new ContractInvoiceBipVo();
+		bipVo.setDjrq(DateUtil.today());
+		R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+		if (r.isOk()) {
+			bipVo.setKpzz(r.getData().getBipCode());
+		}
+
+		if (ObjUtil.isNotNull(customer)) {
+			detailVo.setInvoiceType(customer.getInvoiceType());
+			bipVo.setYwzz(r.getData().getBipCode());
+		}
+		R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
+		if (rDept.isOk()) {
+			bipVo.setBm(rDept.getData().getOrgCode());
+			bipVo.setHsdy(rDept.getData().getOrgCode());
+		}
+		bipVo.setYwy(SecurityUtils.getUser().getNickname());
+		bipVo.setPzzdr(SecurityUtils.getUser().getNickname());
+		bipVo.setJylx("ZBYXGLXT");
+		bipVo.setWldxlx("1");
+		bipVo.setKh(customer.getCreditCode());
+		bipVo.setBz("浜烘皯甯�");
+		bipVo.setFjzs("1");
+		bipVo.setSfzy("鏄�");
+		bipVo.setSfnbwl("鏄�");
+		bipVo.setSfjyjs("鍚�");
+		bipVo.setDjfx("1");
+		detailVo.setBipVo(bipVo);
 		return detailVo;
 	}
 
 	@Override
 	public R startApproval(Long id) {
+
 		Contract contract = baseMapper.selectById(id);
-		//鍚姩娴佺▼
-		ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
-		Map<String, Object> map = BeanUtil.beanToMap(contract);
-		dto.setParamMap(map);
-		dto.setFlowName(FlowNameEnum.鍚堝悓瀹℃壒.name());
-		R r1 = remoteFlowProcessService.startProcessInstance(dto);
-		if (r1.getCode() == 1) {
-			return R.failed("娴佺▼鍚姩澶辫触");
+
+		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+		if (ObjUtil.isNull(customer)){
+			return R.failed("瀹㈡埛鏌ヨ寮傚父");
 		}
+
+		R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+		if (!r.isOk()){
+			return R.failed("淇℃伅鏌ヨ寮傚父");
+		}
+		SysDept comp = r.getData();
+		//绠�鏄撳悎鍚屾棤娉曠户缁悗缁搷浣�
+		if (StrUtil.equals(contract.getContractCategory(), "simple")) {
+			return R.failed("璇疯ˉ鍏呮爣鐨勭墿鍜屾敹娆鹃樁娈靛悗鍐嶈繘琛屾搷浣滐紒");
+		}
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().
+				eq(ContractSubjectMatter::getContractId,contract.getId()));
+		//鍚堝悓涓績瀹℃牳
+		JSONObject requestApply = new JSONObject();
+		requestApply.put("fd_selectionmethod", contract.getSelectionMethod());
+		requestApply.put("fd_isrelated", contract.getIsRelated());
+		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", "澶栭攢");
+		if (CollUtil.isNotEmpty(subjectMatterList)) {
+			requestApply.put("fd_contractSubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
+		}
+		requestApply.put("fd_docNumber", contract.getContractNo());
+//		requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			requestApply.put("fd_templateId", tempSMJ);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+			requestApply.put("fd_templateId", tempSGB);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+			requestApply.put("fd_templateId", tempYMJ);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+			requestApply.put("fd_templateId", tempTFGS);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+			requestApply.put("fd_templateId", tempJXC);
+		}
+		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", SecurityUtils.getUser().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", "10");
+		requestApply.put("fd_taxRates", 13);
+		requestApply.put("fd_customerName", contract.getPartyA());
+		requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
+		requestApply.put("fd_type", "00");
+		requestApply.put("fd_baozhangren", comp.getBaozhangren());
+		requestApply.put("fd_summary",contract.getSummary());
+		JSONArray signList = new JSONArray();
+		JSONObject j = new JSONObject();
+		j.put("fd_standing","鐢�");
+		j.put("fd_Iden",customer.getCreditCode());
+		j.put("fd_signMain","2");
+		signList.add(j);
+		JSONObject y = new JSONObject();
+		y.put("fd_standing","涔�");
+		y.put("fd_Iden",comp.getOrgCode());
+		y.put("fd_signMain","1");
+		signList.add(y);
+		requestApply.put("fd_signList", signList);
+		if (StrUtil.isNotBlank(contract.getAttachmentUrl())) {
+			JSONArray attList = new JSONArray();
+			JSONObject att = new JSONObject();
+			att.put("fd_attNum", "1");
+			att.put("fd_attName", contract.getAttachmentName());
+			att.put("fd_attType", contract.getAttachmentName().substring(contract.getAttachmentName().lastIndexOf('.')+1));
+			att.put("fd_attQuality", "00");
+			att.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
+			attList.add(att);
+			requestApply.put("attList", attList);
+		}
+		if (CollUtil.isNotEmpty(subjectMatterList)){
+			JSONArray materialList = new JSONArray();
+			subjectMatterList.stream().forEach(subjectMatter->{
+				JSONObject material = new JSONObject();
+				material.put("fd_materiaCode", subjectMatter.getMaterialCode());
+				material.put("fd_materiaName", subjectMatter.getMaterialInternalName());
+				material.put("fd_specification", StrUtil.isNotBlank(subjectMatter.getSpecification())?subjectMatter.getSpecification():"");
+				material.put("fd_figureNumber", "");
+				material.put("fd_measureUnit", subjectMatter.getUnit());
+				material.put("fd_number", subjectMatter.getQuantity());
+				material.put("fd_price", subjectMatter.getUnitPrice());
+				Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode()).last("limit 1"));
+				if (ObjUtil.isNotNull(product)){
+					material.put("fd_rate", product.getTaxRate().toString());
+				}
+				material.put("fd_amount", subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
+				material.put("fd_requirements", "");
+				material.put("fd_standard", "");
+				material.put("fd_factory", "");
+				material.put("fd_Deadlines", ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())?subjectMatter.getPlannedDeliveryDate():"");
+				material.put("fd_delivery", "");
+				material.put("fd_des", "");
+				materialList.add(material);
+			});
+			requestApply.put("materialList", materialList);
+		}
+		log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
+		String respApply = HttpUtil.post("https://oa.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")){
+			return R.failed("鍚堝悓涓績鎺ㄩ�佸鏍稿け璐ワ紝鍘熷洜涓�:{}",applyResp.getString("msg"));
+		}
+		//鍚姩娴佺▼-绯荤粺鑷甫瀹℃壒娴�
+//		ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
+//		Map<String, Object> map = BeanUtil.beanToMap(contract);
+//		dto.setParamMap(map);
+//		dto.setFlowName(FlowNameEnum.鍚堝悓瀹℃壒.name());
+//		R r1 = remoteFlowProcessService.startProcessInstance(dto);
+//		if (r1.getCode() == 1) {
+//			return R.failed("娴佺▼鍚姩澶辫触");
+//		}
+
+		//宸ヤ笟娉典笉鐢ㄥ鏍� 鐩存帴閫氳繃
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+			contract.setContractStatus(2);
+			baseMapper.updateById(contract);
+			return R.ok();
+		}
+
 		contract.setContractStatus(1);
 		baseMapper.updateById(contract);
 		return R.ok();
@@ -272,284 +643,541 @@
 		Contract contract = baseMapper.selectById(id);
 		contract.setContractStatus(2);
 		baseMapper.updateById(contract);
+		//姘寸數鎴跨 鎵ц鏃�
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId, id));
 		if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
-			List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
-					.eq(ContractSubjectMatter::getContractId,id));
+			handleWaterHouseCycle(contract,subjectMatterList);
+			return;
+		}
+		//璧勯噾鏄庣粏
+		savePaymentConfirm(contract);
 
-			if (ArrayUtil.isNotEmpty(subjectMatterList.toArray())) {
-				for (ContractSubjectMatter contractSubjectMatter: subjectMatterList)  {
-					if (StrUtil.equals(contract.getExecFrequency(), "1")) {
-						Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfWeek(contract.getEffectiveDate()),
-								DateUtil.endOfWeek(contract.getExpirationDate()), true)+1;
-						//寰幆鏃ユ湡
-						Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
-						for (int i = 0; i < weeksTrue.intValue(); i++) {
-							Date execDatei = DateUtil.offsetWeek(execDate0, i);
-							ContractExecDate execDate = new ContractExecDate();
-							execDate.setContractId(contract.getId());
-							execDate.setMatterId(contractSubjectMatter.getId());
-							execDate.setExecDate(execDatei);
-							execDate.setGenFlag("0");
-							if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
-								contractExecDateMapper.insert(execDate);
-							}
-						}
-					}
-					if (StrUtil.equals(contract.getExecFrequency(), "2")) {
-						Long weeksTrue = DateUtil.betweenMonth(DateUtil.beginOfMonth(contract.getEffectiveDate()),
-								DateUtil.endOfMonth(contract.getExpirationDate()), true)+1;
-						//寰幆鏃ユ湡
-						Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfMonth(contract.getEffectiveDate()), contract.getExecDay());
-						for (int i = 0; i < weeksTrue.intValue(); i++) {
-							Date execDatei = DateUtil.offsetMonth(execDate0, i);
-							ContractExecDate execDate = new ContractExecDate();
-							execDate.setContractId(contract.getId());
-							execDate.setMatterId(contractSubjectMatter.getId());
-							execDate.setExecDate(execDatei);
-							execDate.setGenFlag("0");
-							if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
-								contractExecDateMapper.insert(execDate);
-							}
-						}
-					}
-					if (StrUtil.equals(contract.getExecFrequency(), "3")) {
-						Long weeksTrue = (DateUtil.betweenMonth(DateUtil.beginOfQuarter(contract.getEffectiveDate()),
-								DateUtil.endOfQuarter(contract.getExpirationDate()), true)+1)/3;
+		//鍚堝悓鎺ㄩ�佸瓙鍏徃
+		pushSubCompany(contract,subjectMatterList);
 
-						//寰幆鏃ユ湡
-						Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfQuarter(contract.getEffectiveDate()), contract.getExecDay());
-						for (int i = 0; i < weeksTrue.intValue(); i++) {
-							Date execDatei = DateUtil.offsetMonth(execDate0, i*3);
-							ContractExecDate execDate = new ContractExecDate();
-							execDate.setContractId(contract.getId());
-							execDate.setMatterId(contractSubjectMatter.getId());
-							execDate.setExecDate(execDatei);
-							execDate.setGenFlag("0");
-							if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
-								contractExecDateMapper.insert(execDate);
-							}
-						}
-					}
-					if (StrUtil.equals(contract.getExecFrequency(), "4")) {
-						Date startDate = contract.getEffectiveDate();
-						Date endDate = contract.getExpirationDate();
-						Integer startMonth = DateUtil.month(contract.getEffectiveDate());
-						Integer endMonth = DateUtil.month(contract.getExpirationDate());
-						if (1<=startMonth&&startMonth<=6){
-							startDate = DateUtil.beginOfYear(startDate);
-						}
-						if (7<=startMonth&&startMonth<=12){
-							startDate = DateUtil.offsetMonth(DateUtil.beginOfYear(startDate),6);
-						}
-						if (1<=endMonth&&endMonth<=6){
-							endDate = DateUtil.offsetMonth(DateUtil.endOfYear(endDate),-6);
-						}
-						if (7<=endMonth&&endMonth<=12){
-							endDate = DateUtil.endOfYear(endDate);
-						}
-						Long weeksTrue = (DateUtil.betweenMonth(startDate,endDate, true)+1)/6;
-						//寰幆鏃ユ湡
-						Date execDate0 = DateUtil.offsetDay(startDate, contract.getExecDay());
-						for (int i = 0; i < weeksTrue.intValue(); i++) {
-							Date execDatei = DateUtil.offsetMonth(execDate0, i*6);
-							ContractExecDate execDate = new ContractExecDate();
-							execDate.setContractId(contract.getId());
-							execDate.setMatterId(contractSubjectMatter.getId());
-							execDate.setExecDate(execDatei);
-							execDate.setGenFlag("0");
-							if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
-								contractExecDateMapper.insert(execDate);
-							}
-						}
-					}
-					if (StrUtil.equals(contract.getExecFrequency(), "5")) {
-						Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfYear(contract.getEffectiveDate()),
-								DateUtil.endOfYear(contract.getExpirationDate()), true)+1;
-						//寰幆鏃ユ湡
-						Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfYear(contract.getEffectiveDate()), contract.getExecDay());
-						for (int i = 0; i < weeksTrue.intValue(); i++) {
-							Date execDatei = DateUtil.offsetWeek(execDate0, i);
-							ContractExecDate execDate = new ContractExecDate();
-							execDate.setContractId(contract.getId());
-							execDate.setMatterId(contractSubjectMatter.getId());
-							execDate.setExecDate(execDatei);
-							execDate.setGenFlag("0");
-							if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
-								contractExecDateMapper.insert(execDate);
-							}
-						}
-					}
+		//鍚堝悓涓績鎺ㄩ��
+//		pusnContractCenter(contract,subjectMatterList);
 
-				}
-			}
-		} else {
-			ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId())
-					.orderByAsc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
-			if (fitstSchedule.getStageName().equals("鍚堝悓绛捐")) {
-				//鏂板搴旀敹
-				savePaymentConfirm(contract, fitstSchedule);
+		contract.setNextScheduleName("鍙戣揣鍓�");
+		baseMapper.updateById(contract);
+	}
 
-				//鏂板鍚堝悓灞ョ害璁板綍
-				ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
-				process.setContractId(contract.getId());
-				process.setContractName(contract.getContractName());
-				process.setScheduleId(fitstSchedule.getId());
-				process.setScheduleName(fitstSchedule.getStageName());
-				process.setProcessDate(contract.getSignDate());
-				contractPaymentScheduleProcessMapper.insert(process);
-//			//褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
-//			PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
-//					.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-//			if (ObjUtil.isNotNull(newConfirm)&&newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
-//				//鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
-//				contract.setContractStatus(3);
-//				baseMapper.updateById(contract);
-//			}
-			} else if (fitstSchedule.getStageName().equals("鍙戣揣鍓�")) {
-				//鏇存柊鍚堝悓涓嬩釜闃舵
-				contract.setNextScheduleName("鏃�");
-				baseMapper.updateById(contract);
-			} else if (fitstSchedule.getStageName().equals("璐у埌绛炬敹")) {
-				//鏇存柊鍚堝悓涓嬩釜闃舵
-				contract.setNextScheduleName("璐у埌绛炬敹");
-				baseMapper.updateById(contract);
-			} else if (fitstSchedule.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
-				//鏇存柊鍚堝悓涓嬩釜闃舵
-				contract.setNextScheduleName("璋冭瘯瀹屾垚鎴栭獙鏀�");
-				baseMapper.updateById(contract);
-			} else {
-				//鏂板搴旀敹
-				savePaymentConfirm(contract, fitstSchedule);
-			}
-			//鏌ヨ鏄惁鏈夊悗缁樁娈�
-			List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
-					.eq(ContractPaymentSchedule::getContractId, fitstSchedule.getContractId())
-					.gt(ContractPaymentSchedule::getStageOrder, fitstSchedule.getStageOrder())
-					.orderByAsc(ContractPaymentSchedule::getCreateTime));
-			if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() == 1) {
-				//鏈�鍚庨樁娈电敓鏁堟椂闂�
-				ContractPaymentSchedule endSchedule = afterSchedule.get(0);
-				if (StrUtil.equals(endSchedule.getStageName(), "璐ㄤ繚閲�")) {
-//				endSchedule.setEffectiveEndDate(DateUtil.offsetDay(new Date(),endSchedule.getAgreedDays()));
-//				contractPaymentScheduleMapper.updateById(endSchedule);
-					//鏈�鍚庨樁娈靛簲鏀�
-					PaymentConfirm newConfim = new PaymentConfirm();
-					newConfim.setBusinessType(endSchedule.getStageName() + "搴旀敹");
-					newConfim.setBusGuestId(contract.getPartyAId());
-					newConfim.setBusGuestName(contract.getPartyA());
-					newConfim.setContractId(contract.getId());
-					newConfim.setContractName(contract.getContractName());
-					newConfim.setContractNo(contract.getContractNo());
-					newConfim.setScheduleId(endSchedule.getId());
-					newConfim.setScheduleName(endSchedule.getStageName());
-					newConfim.setConfirmTime(new Date());
-					newConfim.setTransationAmount(endSchedule.getPlannedAmount());
-					newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
-					PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
-							.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-					BigDecimal lastNewTotal = new BigDecimal("0");
-					if (ObjUtil.isNotNull(lastNewConfirm)) {
-						lastNewTotal = lastNewConfirm.getTotalAmount();
-					}
-					newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
-					if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
-						paymentConfirmMapper.insert(newConfim);
+	private void pusnContractCenter(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
+		new Thread(() -> {
+			try {
+				JSONObject requestApply = new JSONObject();
+				requestApply.put("fd_selectionmethod", "鍏紑鎷涙爣");
+				requestApply.put("fd_isrelated", "鏄�");
+				requestApply.put("fd_bizId", contract.getId());
+				requestApply.put("fd_remark", contract.getRemark());
+				requestApply.put("fd_MainContent", "");
+				requestApply.put("fd_settlementType", "00");
+				requestApply.put("fd_applyType", "澶栭攢");
+				requestApply.put("fd_contractSubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
+				requestApply.put("fd_docNumber", contract.getContractNo());
+				requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
+				requestApply.put("fd_name", contract.getContractName());
+				requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
+				requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
+				requestApply.put("fd_contractCreater", contract.getNickName());
+				requestApply.put("fd_currency", "浜烘皯甯�");
+				requestApply.put("fd_ContractAmount", contract.getAmount());
+				requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
+						.multiply(new BigDecimal("87")));
+				requestApply.put("fd_docStatus", "20");
+				requestApply.put("fd_taxRates", 13);
+				requestApply.put("fd_customerName", contract.getPartyA());
+				requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
+				requestApply.put("fd_type", "00");
+				log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
+				String respApply = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
+				log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍥炲弬锛歿}", respApply);
+				JSONObject applyResp = JSONObject.parseObject(respApply);
+				if (applyResp.getString("code").equals("00")) {
+					JSONObject request = new JSONObject();
+					request.put("fd_docNumber", contract.getContractNo());
+					request.put("fd_singer", contract.getNickName());
+					request.put("fd_signTime", DateUtil.formatDate(contract.getSignDate()));
+					request.put("fd_linkPerson", "");
+					request.put("fd_linkPhone", "");
+					request.put("fd_address", contract.getSignPlace());
+					request.put("fd_receivedTime", DateUtil.format(contract.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
+					request.put("fd_receivedNum", 1);
+					request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
+					request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
+					request.put("fd_reviewerNo", SecurityUtils.getUser().getNickname());
+					request.put("fd_docStatus", "20");
+					request.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
+					request.put("fd_attName", contract.getAttachmentName());
+					request.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
+					log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍏ュ弬锛歿}", request.toJSONString());
+					String resp = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addContractReview", request.toJSONString());
+					log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍥炲弬锛歿}", resp);
+					JSONObject respJson = JSONObject.parseObject(resp);
+					if (respJson.getString("code").equals("00")) {
+						contract.setCenterPushFlag("1");
+						baseMapper.updateById(contract);
 					}
 				}
-				//鏇存柊鍚堝悓涓嬩釜闃舵
-				contract.setNextScheduleName(endSchedule.getStageName());
-				baseMapper.updateById(contract);
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
-			if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() > 1) {
-				//绗竴闃舵鐢熸晥鏃堕棿
-//			fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
-//			contractPaymentScheduleMapper.updateById(fitstSchedule);
-				//鏇存柊鍚堝悓涓嬩釜闃舵
-				contract.setNextScheduleName(afterSchedule.get(0).getStageName());
-				baseMapper.updateById(contract);
+		}).start();
+	}
+
+	private void pushSubCompany(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
+		//erp鎺ㄩ��
+		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 (CollUtil.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("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);
+					}
+					String token = "";
+					if (redisTemplate.hasKey("YMJ_ERP_TOKEN")) {
+						token = (String) redisTemplate.opsForValue().get("YMJ_ERP_TOKEN");
+					} else {
+						token = getYmjErpToken();
+					}
+					if (StrUtil.isEmpty(token)){
+						log.error("涓�鐓ゆ満鐧诲綍鑾峰彇token澶辫触");
+						return;
+					}
+					log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
+					HttpResponse response = HttpRequest.post(ymjErp + "/api/contract-staging/v1/receive")
+							.header("token", token)       // 娣诲姞璁よ瘉澶�
+							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
+							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
+							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+					log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
+					//淇濆瓨璇锋眰璁板綍
+					saveErpRequestRecord("ymj", request.toJSONString(), response.body());
+					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+					contract.setErpPushFlag("1");
+					baseMapper.updateById(contract);
+
+				}
+				if ((StrUtil.equals(contract.getPartyBId() + "", smj) ||
+						StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) && 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", "");
+					request.put("tenantId", "tenant1");
+					if (CollUtil.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("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);
+					}
+
+
+					String token = "";
+					if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+						token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+					} else {
+						token = getErpToken();
+					}
+					if (StrUtil.isEmpty(token)){
+						log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+						return;
+					}
+
+					log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
+					HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails?tenantId=tenant1")
+							.header("token", token)       // 娣诲姞璁よ瘉澶�
+							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
+							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
+							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+					log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}", response.body());
+					//淇濆瓨璇锋眰璁板綍
+					saveErpRequestRecord("smj", request.toJSONString(), response.body());
+					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+					contract.setErpPushFlag("1");
+					baseMapper.updateById(contract);
+				}
+				if (StrUtil.equals(contract.getPartyBId() + "", smjsc) && StrUtil.isNotEmpty(smjscErp)) {
+					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", "");
+					request.put("tenantId", "tenant2");
+					if (CollUtil.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("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);
+					}
+
+					String token = "";
+					if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+						token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+					} else {
+						token = getErpToken();
+					}
+					if (StrUtil.isEmpty(token)){
+						log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+						return;
+					}
+
+					log.info("鐭崇叅鏈洪殢杞﹀垎鍏徃鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
+					HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails?tenantId=tenant2")
+							.header("token", token)       // 娣诲姞璁よ瘉澶�
+							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
+							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
+							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+					log.info("鐭崇叅鏈洪殢杞﹀垎鍏徃鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
+					//淇濆瓨璇锋眰璁板綍
+					saveErpRequestRecord("smj", request.toJSONString(), response.body());
+					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+					contract.setErpPushFlag("1");
+					baseMapper.updateById(contract);
+				}
+				if (StrUtil.equals(contract.getPartyBId() + "", smjzt) && StrUtil.isNotEmpty(smjztErp)) {
+					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", "");
+					request.put("tenantId", "tenant3");
+					if (CollUtil.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("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);
+					}
+
+					String token = "";
+					if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+						token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+					} else {
+						token = getErpToken();
+					}
+					if (StrUtil.isEmpty(token)){
+						log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+						return;
+					}
+
+					log.info("鐭崇叅鏈洪捇鎺㈠垎鍏徃鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
+					HttpResponse response = HttpRequest.post(smjztErp + "/api/contract/v1/createWithDetails?tenantId=tenant3")
+							.header("token", token)       // 娣诲姞璁よ瘉澶�
+							.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
+							.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
+							.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+					log.info("鐭崇叅鏈洪捇鎺㈠垎鍏徃鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", 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("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
+					String result = HttpUtil.post(jxcErp, request.toJSONString());
+					log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍥炲弬锛歿}", result);
+					//淇濆瓨璇锋眰璁板綍
+					saveErpRequestRecord("jxc", request.toJSONString(), result);
+					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+					contract.setErpPushFlag("1");
+					baseMapper.updateById(contract);
+				}
+				if (StrUtil.equals(contract.getPartyBId() + "", tfgs) && StrUtil.isNotEmpty(tfgsErp)) {
+					//閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
+				}
+
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
-			//鍙湁褰撳墠鍚堝悓绛惧瓧闃舵
-//		if(ArrayUtil.isEmpty(afterSchedule.toArray())){
-//			fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
-//			contractPaymentScheduleMapper.updateById(fitstSchedule);
-//		}
+		}).start();
+
+	}
+
+	private String getErpToken() {
+		JSONObject loginJson = new JSONObject();
+		loginJson.put("username", "admin");
+		loginJson.put("password", "Zimafold@2026");
+		log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
+		String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
+		log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
+		JSONObject respJson = JSONObject.parseObject(loginResp);
+		if (respJson.getInteger("code") == 0) {
+			JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
+			redisTemplate.opsForValue().set("SMJ_ERP_TOKEN",dataJson.getString("token"));
+			log.info("鐭崇叅鏈篹rp token涓猴細{}",dataJson.getString("token"));
+			return dataJson.getString("token");
+		}
+		return "";
+	}
+
+	private String getYmjErpToken(){
+		JSONObject loginJson = new JSONObject();
+		loginJson.put("username", "admin");
+		loginJson.put("password", "admin123");
+		log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
+		String loginResp = HttpUtil.post(ymjErp + "/api/account/v1/login", loginJson.toJSONString());
+		log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
+		JSONObject respJson = JSONObject.parseObject(loginResp);
+		if (respJson.getInteger("code") == 0) {
+			JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
+			redisTemplate.opsForValue().set("YMJ_ERP_TOKEN",dataJson.getString("token"));
+			log.info("涓�鐓ゆ満erp token涓猴細{}",dataJson.getString("token"));
+			return dataJson.getString("token");
+		}
+		return "";
+	}
+
+	private void saveScheduleProcess(Contract contract,ContractPaymentSchedule schedule) {
+		//鏂板鍚堝悓灞ョ害璁板綍
+		ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
+		process.setContractId(contract.getId());
+		process.setContractName(contract.getContractName());
+		process.setScheduleId(schedule.getId());
+		process.setScheduleName(schedule.getStageName());
+		process.setProcessDate(contract.getSignDate());
+		ContractPaymentScheduleProcess lastProcess = contractPaymentScheduleProcessMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery()
+				.eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
+				.eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
+		if (ObjUtil.isNull(lastProcess)) {
+			contractPaymentScheduleProcessMapper.insert(process);
 		}
 	}
 
-	private void savePaymentConfirm(Contract contract, ContractPaymentSchedule schedule) {
-		PaymentConfirm paymentConfirm = new PaymentConfirm();
-		paymentConfirm.setBusinessType(schedule.getStageName() + "搴旀敹");
-		paymentConfirm.setBusGuestId(contract.getPartyAId());
-		paymentConfirm.setBusGuestName(contract.getPartyA());
-		paymentConfirm.setContractId(contract.getId());
-		paymentConfirm.setContractName(contract.getContractName());
-		paymentConfirm.setContractNo(contract.getContractNo());
-		paymentConfirm.setScheduleId(schedule.getId());
-		paymentConfirm.setScheduleName(schedule.getStageName());
-		paymentConfirm.setConfirmTime(new Date());
-		paymentConfirm.setTransationAmount(schedule.getPlannedAmount());
-		paymentConfirm.setReceivableAmount(schedule.getPlannedAmount());
-		paymentConfirm.setTotalAmount(schedule.getPlannedAmount().multiply(new BigDecimal("-1")));
-		PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
-				.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-		BigDecimal lastNewTotal = new BigDecimal("0");
-		if (ObjUtil.isNotNull(lastNewConfirm)) {
-			lastNewTotal = lastNewConfirm.getTotalAmount();
-		}
-		paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
-		if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
-			paymentConfirmMapper.insert(paymentConfirm);
-		}
-		//瀹㈡埛浠樻瀹屾垚鍚堝悓
-		List<Contract> customerCompleteContractList = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
-				.eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
-		if (ArrayUtil.isNotEmpty(customerCompleteContractList)) {
-			List<BigDecimal> outAmountList = new ArrayList<>();
-			for (Contract completeContract : customerCompleteContractList
-			) {
-				PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, completeContract.getId())
-						.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-				//鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
-				if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
-					//鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
-					PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm, PaymentConfirm.class, "id", "transationAmount",
-							"advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
-					outConfirm.setBusinessType("璧勯噾杞嚭");
-					outConfirm.setConfirmTime(new Date());
-					outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
-					outConfirm.setTotalAmount(new BigDecimal("0"));
-					paymentConfirmMapper.insert(outConfirm);
-					outAmountList.add(outConfirm.getTransationAmount());
+	private void handleWaterHouseCycle(Contract contract, List<ContractSubjectMatter> subjectMatterList) {
+		if (CollUtil.isNotEmpty(subjectMatterList)) {
+			for (ContractSubjectMatter contractSubjectMatter : subjectMatterList) {
+				if (StrUtil.equals(contract.getExecFrequency(), "1")) {
+					Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfWeek(contract.getEffectiveDate()),
+							DateUtil.endOfWeek(contract.getExpirationDate()), true) + 1;
+					//寰幆鏃ユ湡
+					Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
+					for (int i = 0; i < weeksTrue.intValue(); i++) {
+						Date execDatei = DateUtil.offsetWeek(execDate0, i);
+						ContractExecDate execDate = new ContractExecDate();
+						execDate.setContractId(contract.getId());
+						execDate.setMatterId(contractSubjectMatter.getId());
+						execDate.setExecDate(execDatei);
+						execDate.setGenFlag("0");
+						if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+							contractExecDateMapper.insert(execDate);
+						}
+					}
 				}
-			}
-			if (ArrayUtil.isNotEmpty(outAmountList.toArray())) {
-				BigDecimal currentInSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
-				//鏂板褰撳墠鍚堝悓 璧勯噾杞叆
-				PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, PaymentConfirm.class, "id", "transationAmount",
-						"advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
-				inConfirm.setBusinessType("璧勯噾杞叆");
-				inConfirm.setConfirmTime(new Date());
-				inConfirm.setTransationAmount(currentInSum);
-				inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentInSum));
-				//鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
-				schedule.setActualAmount(inConfirm.getTransationAmount());
-				schedule.setPaymentStatus(2);
-				if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
-					inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
-				} else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
-					inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
-					schedule.setActualAmount(currentInSum);
-					schedule.setPaymentStatus(1);
+				if (StrUtil.equals(contract.getExecFrequency(), "2")) {
+					Long weeksTrue = DateUtil.betweenMonth(DateUtil.beginOfMonth(contract.getEffectiveDate()),
+							DateUtil.endOfMonth(contract.getExpirationDate()), true) + 1;
+					//寰幆鏃ユ湡
+					Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfMonth(contract.getEffectiveDate()), contract.getExecDay());
+					for (int i = 0; i < weeksTrue.intValue(); i++) {
+						Date execDatei = DateUtil.offsetMonth(execDate0, i);
+						ContractExecDate execDate = new ContractExecDate();
+						execDate.setContractId(contract.getId());
+						execDate.setMatterId(contractSubjectMatter.getId());
+						execDate.setExecDate(execDatei);
+						execDate.setGenFlag("0");
+						if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+							contractExecDateMapper.insert(execDate);
+						}
+					}
 				}
-				paymentConfirmMapper.insert(inConfirm);
-				//鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
-				contractPaymentScheduleMapper.updateById(schedule);
+				if (StrUtil.equals(contract.getExecFrequency(), "3")) {
+					Long weeksTrue = (DateUtil.betweenMonth(DateUtil.beginOfQuarter(contract.getEffectiveDate()),
+							DateUtil.endOfQuarter(contract.getExpirationDate()), true) + 1) / 3;
+
+					//寰幆鏃ユ湡
+					Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfQuarter(contract.getEffectiveDate()), contract.getExecDay());
+					for (int i = 0; i < weeksTrue.intValue(); i++) {
+						Date execDatei = DateUtil.offsetMonth(execDate0, i * 3);
+						ContractExecDate execDate = new ContractExecDate();
+						execDate.setContractId(contract.getId());
+						execDate.setMatterId(contractSubjectMatter.getId());
+						execDate.setExecDate(execDatei);
+						execDate.setGenFlag("0");
+						if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+							contractExecDateMapper.insert(execDate);
+						}
+					}
+				}
+				if (StrUtil.equals(contract.getExecFrequency(), "4")) {
+					Date startDate = contract.getEffectiveDate();
+					Date endDate = contract.getExpirationDate();
+					Integer startMonth = DateUtil.month(contract.getEffectiveDate());
+					Integer endMonth = DateUtil.month(contract.getExpirationDate());
+					if (1 <= startMonth && startMonth <= 6) {
+						startDate = DateUtil.beginOfYear(startDate);
+					}
+					if (7 <= startMonth && startMonth <= 12) {
+						startDate = DateUtil.offsetMonth(DateUtil.beginOfYear(startDate), 6);
+					}
+					if (1 <= endMonth && endMonth <= 6) {
+						endDate = DateUtil.offsetMonth(DateUtil.endOfYear(endDate), -6);
+					}
+					if (7 <= endMonth && endMonth <= 12) {
+						endDate = DateUtil.endOfYear(endDate);
+					}
+					Long weeksTrue = (DateUtil.betweenMonth(startDate, endDate, true) + 1) / 6;
+					//寰幆鏃ユ湡
+					Date execDate0 = DateUtil.offsetDay(startDate, contract.getExecDay());
+					for (int i = 0; i < weeksTrue.intValue(); i++) {
+						Date execDatei = DateUtil.offsetMonth(execDate0, i * 6);
+						ContractExecDate execDate = new ContractExecDate();
+						execDate.setContractId(contract.getId());
+						execDate.setMatterId(contractSubjectMatter.getId());
+						execDate.setExecDate(execDatei);
+						execDate.setGenFlag("0");
+						if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+							contractExecDateMapper.insert(execDate);
+						}
+					}
+				}
+				if (StrUtil.equals(contract.getExecFrequency(), "5")) {
+					Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfYear(contract.getEffectiveDate()),
+							DateUtil.endOfYear(contract.getExpirationDate()), true) + 1;
+					//寰幆鏃ユ湡
+					Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfYear(contract.getEffectiveDate()), contract.getExecDay());
+					for (int i = 0; i < weeksTrue.intValue(); i++) {
+						Date execDatei = DateUtil.offsetWeek(execDate0, i);
+						ContractExecDate execDate = new ContractExecDate();
+						execDate.setContractId(contract.getId());
+						execDate.setMatterId(contractSubjectMatter.getId());
+						execDate.setExecDate(execDatei);
+						execDate.setGenFlag("0");
+						if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+							contractExecDateMapper.insert(execDate);
+						}
+					}
+				}
+
 			}
-
-
-		} else {
-			paymentConfirmMapper.insert(paymentConfirm);
 		}
+	}
+
+	private void saveErpRequestRecord(String ymj, String toJSONString, String result) {
+		ErpRequestRecord record = new ErpRequestRecord();
+		record.setErpName(ymj);
+		record.setRequestParams(toJSONString);
+		record.setResponseParams(result);
+		erpRequestRecordMapper.insert(record);
+	}
+
+	private void savePaymentConfirm(Contract contract) {
+		ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+				.eq(ContractPaymentSchedule::getContractId, contract.getId())
+				.eq(ContractPaymentSchedule::getStageName,"鍚堝悓绛捐")
+				.last("limit 1"));
+		fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
+		contractPaymentScheduleMapper.updateById(fitstSchedule);
+		//鎶ラ敊灞ョ害璁板綍
+		saveScheduleProcess(contract,fitstSchedule);
+		//淇濆瓨璧勯噾鏄庣粏
+		if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+			//鏂板搴旀敹
+			PaymentConfirm currentConfim = new PaymentConfirm();
+			currentConfim.setBusinessType(fitstSchedule.getStageName() + "搴旀敹");
+			currentConfim.setBusGuestId(contract.getPartyAId());
+			currentConfim.setBusGuestName(contract.getPartyA());
+			currentConfim.setContractId(contract.getId());
+			currentConfim.setContractName(contract.getContractName());
+			currentConfim.setContractNo(contract.getContractNo());
+			currentConfim.setScheduleId(fitstSchedule.getId());
+			currentConfim.setScheduleName(fitstSchedule.getStageName());
+			currentConfim.setConfirmTime(contract.getSignDate());
+			currentConfim.setTransationAmount(fitstSchedule.getPlannedAmount());
+			currentConfim.setReceivableAmount(fitstSchedule.getPlannedAmount());
+			PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+					.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+			if (ObjUtil.isNotNull(lastConfirm)) {
+				currentConfim.setTotalAmount(lastConfirm.getTotalAmount().subtract(currentConfim.getTransationAmount()));
+				if (contract.getContractNo().startsWith("ZB-")) {
+					paymentConfirmMapper.insert(currentConfim);
+				}
+				return;
+			}
+			currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
+			paymentConfirmMapper.insert(currentConfim);
+			processService.handleBeforeRemain(currentConfim,contract);
+		}
+
 	}
 
 	@Override
@@ -558,57 +1186,61 @@
 				.lt(ContractPaymentSchedule::getEffectiveEndDate, DateUtil.today())
 				.ne(ContractPaymentSchedule::getPaymentStatus, "2")
 				.ne(ContractPaymentSchedule::getPaymentStatus, 3));
-		if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
+		if (CollUtil.isNotEmpty(scheduleList)) {
 			scheduleList.stream().forEach(contractPaymentSchedule -> {
 				Contract contract = baseMapper.selectById(contractPaymentSchedule.getContractId());
-				//搴旀敹瓒呮湡
-				PaymentConfirm overdueConfirm = new PaymentConfirm();
-				overdueConfirm.setBusinessType("搴旀敹瓒呮湡");
-				overdueConfirm.setBusGuestId(contract.getPartyAId());
-				overdueConfirm.setBusGuestName(contract.getPartyA());
-				overdueConfirm.setContractId(contract.getId());
-				overdueConfirm.setContractName(contract.getContractName());
-				overdueConfirm.setContractNo(contract.getContractNo());
-				overdueConfirm.setConfirmTime(new Date());
-				overdueConfirm.setScheduleId(contractPaymentSchedule.getId());
-				overdueConfirm.setScheduleName(contractPaymentSchedule.getStageName());
-				PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
-						.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-				overdueConfirm.setTransationAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
-						contractPaymentSchedule.getPlannedAmount() :
-						contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
-				overdueConfirm.setReceivableAmount(newLastConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
-				overdueConfirm.setOverdueAmount(overdueConfirm.getTransationAmount());
-				overdueConfirm.setTotalAmount(newLastConfirm.getTotalAmount());
-				overdueConfirm.setCompId(contract.getCompId());
-				//鍒ゆ柇褰撳墠闃舵鏄惁宸茬敓鎴愪笂闃舵搴旀敹瓒呮湡
-				PaymentConfirm oiverdueConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getScheduleId, contractPaymentSchedule.getId())
-						.eq(PaymentConfirm::getBusinessType, "搴旀敹瓒呮湡"));
-				if (ObjUtil.isNull(oiverdueConfirm) && overdueConfirm.getTransationAmount().compareTo(new BigDecimal("0")) > 0) {
-					paymentConfirmMapper.insert(overdueConfirm);
-				}
-				//褰撳墠閫炬湡
-				CurrentOverdue currentOverdue = new CurrentOverdue();
-				currentOverdue.setBusGuestId(contract.getPartyAId());
-				currentOverdue.setBusGuestName(contract.getPartyA());
-				currentOverdue.setContractId(contractPaymentSchedule.getContractId());
-				currentOverdue.setContractName(contractPaymentSchedule.getContractName());
-				currentOverdue.setScheduleId(contractPaymentSchedule.getId());
-				currentOverdue.setScheduleName(contractPaymentSchedule.getStageName());
-				currentOverdue.setCompId(contract.getCompId());
-				currentOverdue.setContractExpirTime(contractPaymentSchedule.getEffectiveEndDate());
-				currentOverdue.setReceivableAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
-						contractPaymentSchedule.getPlannedAmount() : contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
-				currentOverdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
-				CurrentOverdue overdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getContractId, currentOverdue.getContractId())
-						.eq(CurrentOverdue::getScheduleId, currentOverdue.getScheduleId()).last("limit 1"));
-				if (ObjUtil.isNull(overdue)) {
-					if (currentOverdue.getReceivableAmount().compareTo(new BigDecimal("0")) > 0) {
-						currentOverdueMapper.insert(currentOverdue);
+				if (ObjUtil.isNotNull(contract)) {
+					//搴旀敹瓒呮湡
+					PaymentConfirm overdueConfirm = new PaymentConfirm();
+					overdueConfirm.setBusinessType("搴旀敹瓒呮湡");
+					overdueConfirm.setBusGuestId(contract.getPartyAId());
+					overdueConfirm.setBusGuestName(contract.getPartyA());
+					overdueConfirm.setContractId(contract.getId());
+					overdueConfirm.setContractName(contract.getContractName());
+					overdueConfirm.setContractNo(contract.getContractNo());
+					overdueConfirm.setConfirmTime(new Date());
+					overdueConfirm.setScheduleId(contractPaymentSchedule.getId());
+					overdueConfirm.setScheduleName(contractPaymentSchedule.getStageName());
+					PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+							.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+					if (ObjUtil.isNotNull(newLastConfirm)) {
+						overdueConfirm.setTransationAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
+								contractPaymentSchedule.getPlannedAmount() :
+								contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
+						overdueConfirm.setReceivableAmount(newLastConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+						overdueConfirm.setOverdueAmount(overdueConfirm.getTransationAmount());
+						overdueConfirm.setTotalAmount(newLastConfirm.getTotalAmount());
+						overdueConfirm.setCompId(contract.getCompId());
+						//鍒ゆ柇褰撳墠闃舵鏄惁宸茬敓鎴愪笂闃舵搴旀敹瓒呮湡
+						PaymentConfirm oiverdueConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getScheduleId, contractPaymentSchedule.getId())
+								.eq(PaymentConfirm::getBusinessType, "搴旀敹瓒呮湡"));
+						if (ObjUtil.isNull(oiverdueConfirm) && overdueConfirm.getTransationAmount().compareTo(new BigDecimal("0")) > 0) {
+							paymentConfirmMapper.insert(overdueConfirm);
+						}
+						//褰撳墠閫炬湡
+						CurrentOverdue currentOverdue = new CurrentOverdue();
+						currentOverdue.setBusGuestId(contract.getPartyAId());
+						currentOverdue.setBusGuestName(contract.getPartyA());
+						currentOverdue.setContractId(contractPaymentSchedule.getContractId());
+						currentOverdue.setContractName(contractPaymentSchedule.getContractName());
+						currentOverdue.setScheduleId(contractPaymentSchedule.getId());
+						currentOverdue.setScheduleName(contractPaymentSchedule.getStageName());
+						currentOverdue.setCompId(contract.getCompId());
+						currentOverdue.setContractExpirTime(contractPaymentSchedule.getEffectiveEndDate());
+						currentOverdue.setReceivableAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
+								contractPaymentSchedule.getPlannedAmount() : contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
+						currentOverdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
+						CurrentOverdue overdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getContractId, currentOverdue.getContractId())
+								.eq(CurrentOverdue::getScheduleId, currentOverdue.getScheduleId()).last("limit 1"));
+						if (ObjUtil.isNull(overdue)) {
+							if (currentOverdue.getReceivableAmount().compareTo(new BigDecimal("0")) > 0) {
+								currentOverdueMapper.insert(currentOverdue);
+							}
+						} else {
+							overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
+							currentOverdueMapper.updateById(overdue);
+						}
 					}
-				} else {
-					overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
-					currentOverdueMapper.updateById(overdue);
 				}
 			});
 		}
@@ -627,16 +1259,28 @@
 	public R copyNewContract(Long id) {
 		Contract oldContract = baseMapper.selectById(id);
 		Contract newContract = BeanUtil.copyProperties(oldContract, Contract.class, "id", "createTime");
-		newContract.setContractNo(ContractNumberGenerator.generateContractNumber());
+		newContract.setOutBoundAmout(new BigDecimal("0"));
 		newContract.setPaidAmount(new BigDecimal("0"));
-		newContract.setBillingStatus("0");
+		newContract.setBillingStatus("1");
 		newContract.setErpPushFlag("0");
 		newContract.setContractStatus(0);
-		List<Contract> contracts;
-		contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, newContract.getContractNo()));
-		while (ArrayUtil.isNotEmpty(contracts.toArray())) {
-			newContract.setContractNo(ContractNumberGenerator.generateContractNumber());
-			contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, newContract.getContractNo()));
+		newContract.setBillingAmout(new BigDecimal("0"));
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			newContract.setContractNo(generateSMJContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+			newContract.setContractNo(generateGYBContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+			newContract.setContractNo(generateYMJContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+			newContract.setContractNo(generateTFContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+			newContract.setContractNo(generateJXCContractNo());
 		}
 		baseMapper.insert(newContract);
 		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, id));
@@ -697,7 +1341,7 @@
 		map.put("items", items);
 		//瀹氬埗鏂�
 		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
-		map.put("companyName", customer.getRegisterName());
+		map.put("companyName", contract.getPartyA());
 		map.put("legalPerson", customer.getLegalPerson());
 		map.put("contactPhone", customer.getContactPhone());
 		map.put("bankName", customer.getBankName());
@@ -750,8 +1394,8 @@
 	@Override
 	public R genCycleReceiced() {
 		List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
-				.le(ContractExecDate::getExecDate, DateUtil.today()).eq(ContractExecDate::getGenFlag,"0"));
-		if (ArrayUtil.isNotEmpty(execDateList.toArray())) {
+				.le(ContractExecDate::getExecDate, DateUtil.today()).eq(ContractExecDate::getGenFlag, "0"));
+		if (CollUtil.isNotEmpty(execDateList)) {
 			execDateList.stream().forEach(contractExecDate -> {
 				Contract contract = baseMapper.selectById(contractExecDate.getContractId());
 				ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
@@ -760,16 +1404,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("鎴跨绉熻祦缂磋垂");
@@ -778,12 +1423,16 @@
 					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.setInvoiceFlag("0");
 					contractPaymentScheduleMapper.insert(schedule);
 					//鎴垮眿绉熻祦鐢熸垚搴旀敹
 					PaymentConfirm confirm = new PaymentConfirm();
@@ -822,6 +1471,8 @@
 				}
 				contractExecDate.setGenFlag("1");
 				contractExecDateMapper.updateById(contractExecDate);
+				contract.setBillingStatus("2");
+				baseMapper.updateById(contract);
 			});
 		}
 		return R.ok();
@@ -857,8 +1508,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);
@@ -931,7 +1582,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);
@@ -1017,30 +1668,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());
@@ -1051,11 +1702,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);
 		});
@@ -1064,24 +1715,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);
@@ -1140,18 +1791,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("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);
@@ -1166,13 +1818,1569 @@
 
 	@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"));
 	}
 
-	public static void main(String[] args) {
-		System.out.println(DateUtil.beginOfQuarter(DateUtil.parseDate("2026-06-05")));
-		System.out.println(DateUtil.endOfQuarter(DateUtil.parseDate("2026-09-30")));
-		System.out.println(DateUtil.betweenMonth(DateUtil.beginOfQuarter(DateUtil.parseDate("2026-06-05")),
-				DateUtil.endOfQuarter(DateUtil.parseDate("2026-09-30")),true));
+	@Override
+	public void exportContractTFGSGYPMMWord(Long id, HttpServletResponse response) {
+		Contract contract = baseMapper.selectById(id);
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId, id).orderByAsc(ContractSubjectMatter::getCreateTime));
+		Map<String, Object> map = new HashMap<>();
+		//鍚堝悓鍩烘湰淇℃伅
+		map.put("partyA", contract.getPartyA());
+		map.put("partyB", contract.getPartyB());
+		map.put("contractNo", contract.getContractNo());
+		map.put("signPlace", contract.getSignPlace());
+		map.put("signDate", DateUtil.formatDate(contract.getSignDate()));
+		map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
+		map.put("total", contract.getAmount());
+		map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
+		//鏍囩殑鐗�
+		List<Map<String, Object>> items = new ArrayList<>();
+		List<RowRenderData> dataList = new ArrayList<>();
+		AtomicReference<Integer> no = new AtomicReference<>(0);
+		subjectMatterList.stream().forEach(contractSubjectMatter -> {
+			Map<String, Object> item = new HashMap<>();
+			item.put("materialName", contractSubjectMatter.getMaterialName());
+			item.put("guige", contractSubjectMatter.getSpecification());
+			item.put("unit", contractSubjectMatter.getUnit());
+			item.put("quantity", contractSubjectMatter.getQuantity());
+			item.put("unitPrice", contractSubjectMatter.getUnitPrice());
+			item.put("price", contractSubjectMatter.getTotalAmount());
+
+			items.add(item);
+			no.updateAndGet(v -> v + 1);
+		});
+		map.put("items", items);
+		//瀹氬埗鏂�
+		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+		map.put("companyName", customer.getRegisterName());
+		map.put("legalPerson", customer.getLegalPerson());
+		map.put("contactPhone", customer.getContactPhone());
+		map.put("bankName", customer.getBankName());
+		map.put("bankAccount", customer.getBankAccount());
+
+		//鎵挎徑鏂�
+		R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+		SysDept dept = r.getData();
+		map.put("orgName", dept.getOrgName());
+		map.put("legalPerson1", StrUtil.isNotEmpty(dept.getLegalPerson()) ? dept.getLegalPerson() : "");
+		map.put("entrustedAgent", StrUtil.isNotEmpty(dept.getLegalPerson()) ? "" : dept.getEntrustedAgent());
+		map.put("orgContact", dept.getOrgContact());
+		map.put("orgBank", dept.getOrgBank());
+		map.put("orgBankAccount", dept.getOrgBankAccount());
+
+		//鐢熸垚鏂囦欢鍚�
+		Long time = new Date().getTime();
+		// 鐢熸垚鐨剋ord鏍煎紡
+		String formatSuffix = ".docx";
+		// 鎷兼帴鍚庣殑鏂囦欢鍚�
+		String fileName = time + formatSuffix;//鏂囦欢鍚�  甯﹀悗缂�
+		//瀵煎嚭word
+		try {
+			// 1. 鍔犺浇妯$増
+			// 鍋囪妯$増鍦� resources/templates/template.docx
+			ClassPathResource resource = new ClassPathResource("template/tfgs/tfgsgypmmht.docx");
+			// 閰嶇疆鍒楄〃绛栫暐
+			Configure config = Configure.builder()
+					.bind("items", new LoopRowTableRenderPolicy()) // 灏� items 缁戝畾鍒拌寰幆绛栫暐
+					.build();
+			// 2. 缂栬瘧骞舵覆鏌撴暟鎹�
+			XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(), config).render(map);
+
+			// 3. 璁剧疆鍝嶅簲澶�
+			response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+			response.setCharacterEncoding("utf-8");
+			response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".docx");
+
+			// 4. 鍐欏叆杈撳嚭娴�
+			OutputStream out = response.getOutputStream();
+			xwpfTemplate.write(out);
+			out.flush();
+			out.close();
+			xwpfTemplate.close(); // 閲嶈锛氬叧闂ā鐗堥噴鏀捐祫婧�
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public R addContractSgb(ContractAddDTO addDTO) {
+		Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, addDTO.getDataId()).last("limit 1"));
+		if (ObjUtil.isNotNull(contractOld)) {
+			return R.failed("鍚堝悓鏁版嵁ID锛歿}宸插瓨鍦紝涓嶈兘鏂板閲嶅鏁版嵁", addDTO.getDataId());
+		}
+		if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+			return R.failed("璇锋坊鍔犳爣鐨勭墿");
+		}
+		if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
+			return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
+		}
+		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) {
+			return R.failed("浠樻闃舵姣斾緥寮傚父");
+		}
+		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+		contract.setErpContractNo(contract.getContractNo());
+		contract.setPartyBId(SecurityUtils.getUser().getCompId());
+		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		contract.setContractStatus(2);
+		contract.setPaidAmount(new BigDecimal("0"));
+		contract.setBillingStatus("1");
+		contract.setErpPushFlag("1");
+		contract.setCenterPushFlag("0");
+		contract.setBillingAmout(new BigDecimal("0"));
+
+		BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getErpCompanyCode,
+				addDTO.getPartyACode()).last("limit 1"));
+		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(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")) {
+			// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+			Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
+					.filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+					.max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+			if (maxDateObj.isPresent()) {
+				contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+			}
+		}
+		baseMapper.insert(contract);
+
+		if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(contract.getId());
+				if (StrUtil.isNotBlank(subjectMatter.getMaterialCode())){
+					Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode())
+							.last("limit 1"));
+					if (ObjUtil.isNotNull(product)){
+						subjectMatter.setMaterialInternalName(product.getId()+"");
+					}
+					if (ObjUtil.isNull(product)){
+						product = new Product();
+						product.setParentId(2101559148831944705L);
+						product.setProductName(subjectMatter.getMaterialInternalName());
+						product.setErpCode(subjectMatter.getMaterialCode());
+						product.setProductType(subjectMatter.getSpecification());
+						product.setTaxCode("1090117040000000000");
+						product.setTaxClass("娉�");
+						productMapper.insert(product);
+						subjectMatter.setMaterialInternalName(product.getId()+"");
+					}
+				}
+				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+				subjectMatter.setDeliveryStatus(0);
+				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+				contractSubjectMatterMapper.insert(subjectMatter);
+				//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
+				if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
+						ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
+					MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
+					record.setContractId(contract.getId());
+					record.setMatterId(subjectMatter.getId());
+					record.setContractName(contract.getContractName());
+					record.setBusGuestId(contract.getPartyAId());
+					record.setBusGuestName(contract.getPartyA());
+					record.setMeterReadTime(new Date());
+					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);
+				}
+			});
+
+		}
+
+		if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+			AtomicInteger index = new AtomicInteger(1);
+			addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+				int currentIndex = index.getAndIncrement();
+				ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+					schedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
+				}
+				if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
+					if (schedule.getEffectiveDate().before(DateUtil.date())) {
+						schedule.setFulfillmentStatus(1);
+					} else {
+						schedule.setFulfillmentStatus(0);
+					}
+				}
+				if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+					schedule.setPaymentStatus(0);
+				} else {
+					schedule.setPaymentStatus(3);
+				}
+				schedule.setContractId(contract.getId());
+				schedule.setContractName(contract.getContractName());
+				schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+				schedule.setStageOrder(currentIndex);
+				contractPaymentScheduleMapper.insert(schedule);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+					contract.setArrivalScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+					contract.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+			});
+
+		}
+
+		//鎺ㄩ�佸悎鍚屼腑蹇�
+//		pushCenter(contract.getId());
+		return R.ok(contract.getContractNo());
+	}
+
+	@Override
+	public R updateContractSgb(ContractUpdateDTO updateDTO) {
+		if (CollUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
+			return R.failed("璇锋坊鍔犳爣鐨勭墿");
+		}
+		if (CollUtil.isEmpty(updateDTO.getContractPaymentSchedule())) {
+			return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
+		}
+		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) {
+			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 contract = BeanUtil.copyProperties(updateDTO, Contract.class);
+		contract.setId(contractOld.getId());
+		if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())) {
+			contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(), updateDTO.getDeliveryCycle()));
+		}
+		if (!StrUtil.equals(updateDTO.getContractCategory(), "water_house")) {
+			// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+			Optional<ContractSubjectMatterAddDTO> maxDateObj = updateDTO.getContractSubjectMatter().stream()
+					.filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+					.max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+			if (maxDateObj.isPresent()) {
+				contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+			}
+		}
+		baseMapper.updateById(contract);
+
+		if (CollUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+			contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
+
+			updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(contract.getId());
+
+				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+				subjectMatter.setDeliveryStatus(0);
+				contractSubjectMatterMapper.insert(subjectMatter);
+				//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
+				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");
+					record.setContractId(contract.getId());
+					record.setMatterId(subjectMatter.getId());
+					record.setContractName(contract.getContractName());
+					record.setBusGuestId(contract.getPartyAId());
+					record.setBusGuestName(contract.getPartyA());
+					record.setMeterReadTime(new Date());
+					meterReadRecordMapper.insert(record);
+				}
+			});
+		}
+
+		if (CollUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
+			contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
+
+			AtomicInteger index = new AtomicInteger(1);
+			updateDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+				int currentIndex = index.getAndIncrement();
+				ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+				schedule.setContractId(contract.getId());
+				schedule.setContractName(contract.getContractName());
+				schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+				schedule.setStageOrder(currentIndex);
+				if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+					schedule.setPaymentStatus(0);
+				} else {
+					schedule.setPaymentStatus(3);
+				}
+				contractPaymentScheduleMapper.insert(schedule);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+					contract.setArrivalScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+					contract.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+			});
+
+		}
+
+		return R.ok();
+	}
+
+	// 瀹氫箟鏍囧噯鐨勪簲涓樁娈�
+	private static final Set<String> VALID_STAGES = new HashSet<>(Arrays.asList(
+			"鍚堝悓绛捐",
+			"鍙戣揣鍓�",
+			"璐у埌绛炬敹",
+			"璋冭瘯瀹屾垚鎴栭獙鏀�",
+			"璐ㄤ繚閲�"
+	));
+
+	/**
+	 * 鍒ゆ柇浠樻闃舵鍒楄〃鏄惁绗﹀悎鏍囧噯
+	 *
+	 * @param scheduleList 浠樻闃舵鍒楄〃
+	 * @return true 濡傛灉鍖呭惈涓斾粎鍖呭惈鏍囧噯鐨勪簲涓樁娈碉紝false 鍚﹀垯
+	 */
+	public static boolean isValidPaymentStages(List<ContractPaymentScheduleAddDTO> scheduleList) {
+		if (scheduleList == null || scheduleList.isEmpty()) {
+			return false;
+		}
+
+		// 1. 鎻愬彇鎵�鏈夐潪绌虹殑 stageName
+		List<String> actualStages = scheduleList.stream()
+				.map(ContractPaymentScheduleAddDTO::getStageName)
+				.filter(stage -> stage != null && !stage.trim().isEmpty())
+				.map(String::trim)
+				.collect(Collectors.toList());
+
+		// 2. 鍩烘湰鏁伴噺妫�鏌ワ細蹇呴』姝eソ鏄�5涓�
+		if (actualStages.size() != VALID_STAGES.size()) {
+			return false;
+		}
+
+		// 3. 鍐呭妫�鏌ワ細鎵�鏈夊疄闄呴樁娈甸兘蹇呴』鍦ㄦ爣鍑嗛泦鍚堜腑
+		// 浣跨敤 Set 鍘婚噸鍚庢瘮杈冿紝闃叉鍒楄〃涓湁閲嶅闃舵浣嗘�绘暟鍑戝5涓殑鎯呭喌
+		Set<String> actualStageSet = new HashSet<>(actualStages);
+
+		// 妫�鏌ュ疄闄呴泦鍚堝ぇ灏忔槸鍚︿篃涓�5锛堢‘淇濇棤閲嶅锛変笖鍖呭惈浜庢爣鍑嗛泦鍚�
+		return VALID_STAGES.equals(actualStageSet);
+	}
+
+	/**
+	 * 鐢熸垚鏍煎紡涓�: yyyyMMdd + 4浣嶅簭鍒楀彿 (渚嬪: 20260629000001)
+	 */
+	public String generateSMJContractNo() {
+		// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
+		String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+
+		// 2. 鏋勫缓 Redis Key锛屾寜澶╅殧绂伙紝渚嬪: order:no:20260629
+		String key = "ZB-SMJ:" + dateStr;
+
+		// 3. Redis 鍘熷瓙閫掑锛岃缃繃鏈熸椂闂翠负2澶╋紙闃叉Key鍫嗙Н锛屽悓鏃惰鐩栬法澶╄竟鐣屾儏鍐碉級
+		Long sequence = redisTemplate.opsForValue().increment(key, 1);
+		redisTemplate.expire(key, 1, java.util.concurrent.TimeUnit.DAYS);
+
+		// 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+		String seqStr = String.format("%04d", sequence);
+
+		// 5. 鎷兼帴杩斿洖
+		return "ZB-SMJ-" + dateStr + seqStr;
+	}
+
+	public String generateYMJContractNo() {
+		// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
+		String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+
+		// 2. 鏋勫缓 Redis Key锛屾寜澶╅殧绂伙紝渚嬪: order:no:20260629
+		String key = "ZB-YMJ:" + dateStr;
+
+		// 3. Redis 鍘熷瓙閫掑锛岃缃繃鏈熸椂闂翠负2澶╋紙闃叉Key鍫嗙Н锛屽悓鏃惰鐩栬法澶╄竟鐣屾儏鍐碉級
+		Long sequence = redisTemplate.opsForValue().increment(key, 1);
+		redisTemplate.expire(key, 1, java.util.concurrent.TimeUnit.DAYS);
+
+		// 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+		String seqStr = String.format("%04d", sequence);
+
+		// 5. 鎷兼帴杩斿洖
+		return "ZB-YMJ-" + dateStr + seqStr;
+	}
+
+	public String generateJXCContractNo() {
+		// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
+		String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+
+		// 2. 鏋勫缓 Redis Key锛屾寜澶╅殧绂伙紝渚嬪: order:no:20260629
+		String key = "ZB-JXC:" + dateStr;
+
+		// 3. Redis 鍘熷瓙閫掑锛岃缃繃鏈熸椂闂翠负2澶╋紙闃叉Key鍫嗙Н锛屽悓鏃惰鐩栬法澶╄竟鐣屾儏鍐碉級
+		Long sequence = redisTemplate.opsForValue().increment(key, 1);
+		redisTemplate.expire(key, 1, java.util.concurrent.TimeUnit.DAYS);
+
+		// 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+		String seqStr = String.format("%04d", sequence);
+
+		// 5. 鎷兼帴杩斿洖
+		return "ZB-JXC-" + dateStr + seqStr;
+	}
+
+	public String generateTFContractNo() {
+		// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
+		String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+
+		// 2. 鏋勫缓 Redis Key锛屾寜澶╅殧绂伙紝渚嬪: order:no:20260629
+		String key = "ZB-TF:" + dateStr;
+
+		// 3. Redis 鍘熷瓙閫掑锛岃缃繃鏈熸椂闂翠负2澶╋紙闃叉Key鍫嗙Н锛屽悓鏃惰鐩栬法澶╄竟鐣屾儏鍐碉級
+		Long sequence = redisTemplate.opsForValue().increment(key, 1);
+		redisTemplate.expire(key, 1, java.util.concurrent.TimeUnit.DAYS);
+
+		// 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+		String seqStr = String.format("%04d", sequence);
+
+		// 5. 鎷兼帴杩斿洖
+		return "ZB-TF-" + dateStr + seqStr;
+	}
+
+	public String generateGYBContractNo() {
+		// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
+		String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+
+		// 2. 鏋勫缓 Redis Key锛屾寜澶╅殧绂伙紝渚嬪: order:no:20260629
+		String key = "ZB-GYB:" + dateStr;
+
+		// 3. Redis 鍘熷瓙閫掑锛岃缃繃鏈熸椂闂翠负2澶╋紙闃叉Key鍫嗙Н锛屽悓鏃惰鐩栬法澶╄竟鐣屾儏鍐碉級
+		Long sequence = redisTemplate.opsForValue().increment(key, 1);
+		redisTemplate.expire(key, 1, java.util.concurrent.TimeUnit.DAYS);
+
+		// 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+		String seqStr = String.format("%04d", sequence);
+
+		// 5. 鎷兼帴杩斿洖
+		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);
+		}
+		contractOld.setContractStatus(4);
+		baseMapper.updateById(contractOld);
+		return R.ok();
+	}
+
+	@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);
+		}
+
+		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 (CollUtil.isNotEmpty(page1.getRecords())) {
+			page1.getRecords().stream().forEach(fourAssociationPageVo -> {
+				List<PaymentSlip> slips = paymentSlipMapper.selectList(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getContractId, fourAssociationPageVo.getId())
+						.orderByAsc(PaymentSlip::getPaymentTime));
+				if (CollUtil.isNotEmpty(slips)) {
+					fourAssociationPageVo.setSlipVoList(BeanUtil.copyToList(slips, ContractSlipVo.class));
+				}
+				List<ContractInvoice> invoices = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId, fourAssociationPageVo.getId())
+						.orderByAsc(ContractInvoice::getInvoiceTime));
+				if (CollUtil.isNotEmpty(invoices)) {
+					fourAssociationPageVo.setInvoiceVoList(BeanUtil.copyToList(invoices, ContractInvoiceVo.class));
+				}
+				if (fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getPaidAmount()) == 0 &&
+						fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getBillingAmout()) == 0 &&
+						CollUtil.isNotEmpty(slips) && CollUtil.isNotEmpty(invoices)
+				) {
+					fourAssociationPageVo.setAssociation("宸插畬鎴�");
+				}
+			});
+		}
+		return page1;
+	}
+
+	@Override
+	public void exportContractSMJGYPMMWord(Long id, HttpServletResponse response) {
+		Contract contract = baseMapper.selectById(id);
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId, id).orderByAsc(ContractSubjectMatter::getCreateTime));
+		Map<String, Object> map = new HashMap<>();
+		//鍚堝悓鍩烘湰淇℃伅
+		map.put("partyA", contract.getPartyA());
+		map.put("partyB", contract.getPartyB());
+		map.put("contractNo", contract.getContractNo());
+		map.put("signPlace", contract.getSignPlace());
+		map.put("signDate", DateUtil.formatDate(contract.getSignDate()));
+		map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
+		map.put("total", contract.getAmount());
+		map.put("totalNoTax", contract.getAmount().divide(new BigDecimal("100").add(new BigDecimal("13")), 2, RoundingMode.HALF_UP)
+				.multiply(new BigDecimal("87")));
+		map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
+		//鏍囩殑鐗�
+		List<Map<String, Object>> items = new ArrayList<>();
+		subjectMatterList.stream().forEach(contractSubjectMatter -> {
+			Map<String, Object> item = new HashMap<>();
+			item.put("materialName", contractSubjectMatter.getMaterialName());
+			item.put("guige", contractSubjectMatter.getSpecification());
+			item.put("unit", contractSubjectMatter.getUnit());
+			item.put("quantity", contractSubjectMatter.getQuantity());
+			item.put("unitPrice", contractSubjectMatter.getUnitPrice());
+			item.put("price", contractSubjectMatter.getTotalAmount());
+			item.put("remarks", contractSubjectMatter.getRemarks());
+			items.add(item);
+		});
+		map.put("items", items);
+		//瀹氬埗鏂�
+		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+		map.put("companyName", customer.getRegisterName());
+		map.put("legalPerson", customer.getLegalPerson());
+		map.put("contactPhone", customer.getContactPhone());
+		map.put("bankName", customer.getBankName());
+		map.put("bankAccount", customer.getBankAccount());
+
+		//鎵挎徑鏂�
+		R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+		SysDept dept = r.getData();
+		map.put("orgName", dept.getOrgName());
+		map.put("legalPerson1", StrUtil.isNotEmpty(dept.getLegalPerson()) ? dept.getLegalPerson() : "");
+		map.put("entrustedAgent", StrUtil.isNotEmpty(dept.getLegalPerson()) ? "" : dept.getEntrustedAgent());
+		map.put("orgContact", dept.getOrgContact());
+		map.put("orgBank", dept.getOrgBank());
+		map.put("orgBankAccount", dept.getOrgBankAccount());
+
+		//鐢熸垚鏂囦欢鍚�
+		Long time = new Date().getTime();
+		// 鐢熸垚鐨剋ord鏍煎紡
+		String formatSuffix = ".docx";
+		// 鎷兼帴鍚庣殑鏂囦欢鍚�
+		String fileName = time + formatSuffix;//鏂囦欢鍚�  甯﹀悗缂�
+		//瀵煎嚭word
+		try {
+			// 1. 鍔犺浇妯$増
+			// 鍋囪妯$増鍦� resources/templates/template.docx
+			ClassPathResource resource = new ClassPathResource("template/smj/smjgypmmht.docx");
+			// 閰嶇疆鍒楄〃绛栫暐
+			Configure config = Configure.builder()
+					.bind("items", new LoopRowTableRenderPolicy()) // 灏� items 缁戝畾鍒拌寰幆绛栫暐
+					.build();
+			// 2. 缂栬瘧骞舵覆鏌撴暟鎹�
+			XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(), config).render(map);
+
+			// 3. 璁剧疆鍝嶅簲澶�
+			response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+			response.setCharacterEncoding("utf-8");
+			response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".docx");
+
+			// 4. 鍐欏叆杈撳嚭娴�
+			OutputStream out = response.getOutputStream();
+			xwpfTemplate.write(out);
+			out.flush();
+			out.close();
+			xwpfTemplate.close(); // 閲嶈锛氬叧闂ā鐗堥噴鏀捐祫婧�
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void exportContractJXCXSWord(Long id, HttpServletResponse response) {
+		Contract contract = baseMapper.selectById(id);
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId, id).orderByAsc(ContractSubjectMatter::getCreateTime));
+		List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+				.eq(ContractPaymentSchedule::getContractId, id).orderByAsc(ContractPaymentSchedule::getCreateTime));
+		Map<String, Object> map = new HashMap<>();
+		//鍚堝悓鍩烘湰淇℃伅
+		map.put("partyA", contract.getPartyA());
+		map.put("partyB", contract.getPartyB());
+		map.put("contractNo", contract.getContractNo());
+		map.put("signPlace", contract.getSignPlace());
+		map.put("signDate", DateUtil.formatDate(contract.getSignDate()));
+		map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
+		map.put("total", contract.getAmount());
+		map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
+		//姝f枃
+		map.put("standard", contract.getStandard());
+		map.put("useMonth", contract.getUseMonth());
+		map.put("afterShipMonth", contract.getAfterShipMonth());
+		map.put("deliveryCycle", contract.getDeliveryCycle());
+		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("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("dhhr", scheduleList.get(2).getAgreedDays());
+		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());
+		map.put("supplierAgent", contract.getSupplierAgent());
+		map.put("supplierAgentIDCard", contract.getSupplierAgentIdCard());
+		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("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("overdueDayXf", contract.getOverdueDayXf());
+		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());
+
+
+		//鏍囩殑鐗�
+		List<Map<String, Object>> items = new ArrayList<>();
+		subjectMatterList.stream().forEach(contractSubjectMatter -> {
+			Map<String, Object> item = new HashMap<>();
+			item.put("materialName", contractSubjectMatter.getMaterialName());
+			item.put("guige", contractSubjectMatter.getSpecification());
+			item.put("unit", contractSubjectMatter.getUnit());
+			item.put("quantity", contractSubjectMatter.getQuantity());
+			item.put("unitPrice", contractSubjectMatter.getUnitPrice());
+			item.put("price", contractSubjectMatter.getTotalAmount());
+			item.put("remarks", contractSubjectMatter.getRemarks());
+			items.add(item);
+		});
+		map.put("items", items);
+		//瀹氬埗鏂�
+		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+		map.put("companyName", customer.getRegisterName());
+		map.put("legalPerson", customer.getLegalPerson());
+		map.put("contactPhone", customer.getContactPhone());
+		map.put("bankName", customer.getBankName());
+		map.put("bankAccount", customer.getBankAccount());
+
+		//鎵挎徑鏂�
+		R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+		SysDept dept = r.getData();
+		map.put("orgName", dept.getOrgName());
+		map.put("legalPerson1", StrUtil.isNotEmpty(dept.getLegalPerson()) ? dept.getLegalPerson() : "");
+		map.put("entrustedAgent", StrUtil.isNotEmpty(dept.getLegalPerson()) ? "" : dept.getEntrustedAgent());
+		map.put("orgContact", dept.getOrgContact());
+		map.put("orgBank", dept.getOrgBank());
+		map.put("orgBankAccount", dept.getOrgBankAccount());
+
+		//鐢熸垚鏂囦欢鍚�
+		Long time = new Date().getTime();
+		// 鐢熸垚鐨剋ord鏍煎紡
+		String formatSuffix = ".docx";
+		// 鎷兼帴鍚庣殑鏂囦欢鍚�
+		String fileName = time + formatSuffix;//鏂囦欢鍚�  甯﹀悗缂�
+		//瀵煎嚭word
+		try {
+			// 1. 鍔犺浇妯$増
+			// 鍋囪妯$増鍦� resources/templates/template.docx
+			ClassPathResource resource = new ClassPathResource("template/jxc/jxcxsht.docx");
+			// 閰嶇疆鍒楄〃绛栫暐
+			Configure config = Configure.builder()
+					.bind("items", new LoopRowTableRenderPolicy()) // 灏� items 缁戝畾鍒拌寰幆绛栫暐
+					.build();
+			// 2. 缂栬瘧骞舵覆鏌撴暟鎹�
+			XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(), config).render(map);
+
+			// 3. 璁剧疆鍝嶅簲澶�
+			response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+			response.setCharacterEncoding("utf-8");
+			response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".docx");
+
+			// 4. 鍐欏叆杈撳嚭娴�
+			OutputStream out = response.getOutputStream();
+			xwpfTemplate.write(out);
+			out.flush();
+			out.close();
+			xwpfTemplate.close(); // 閲嶈锛氬叧闂ā鐗堥噴鏀捐祫婧�
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public R addSimple(ContractAddDTO addDTO) {
+		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+		contract.setPartyBId(SecurityUtils.getUser().getCompId());
+		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		if (StrUtil.isEmpty(addDTO.getPartyA())) {
+			BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
+			if (ObjUtil.isNotNull(bc)) {
+				contract.setPartyA(bc.getCompanyName());
+			}
+		}
+
+		contract.setPaidAmount(new BigDecimal("0"));
+		contract.setBillingStatus("1");
+		contract.setBillingAmout(new BigDecimal("0"));
+		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)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			contract.setContractNo(generateSMJContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+			contract.setContractNo(generateGYBContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+			contract.setContractNo(generateYMJContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+			contract.setContractNo(generateTFContractNo());
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+			contract.setContractNo(generateJXCContractNo());
+		}
+		baseMapper.insert(contract);
+		return R.ok();
+	}
+
+	@Override
+	public R pushCenter(PushCenterDTO dto) {
+		Contract contract = baseMapper.selectById(dto.getId());
+
+		contract.setSelectionMethod(dto.getSelectionMethod());
+		contract.setIsRelated(dto.getIsRelated());
+		contract.setContractCreater(dto.getContractCreater());
+		if(StrUtil.isNotBlank(dto.getAttachmentUrl())) {
+			contract.setAttachmentName(dto.getAttachmentName());
+			contract.setAttachmentUrl(dto.getAttachmentUrl());
+		}
+		baseMapper.updateById(contract);
+
+		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+		if (ObjUtil.isNull(customer)){
+			return R.failed("瀹㈡埛鏌ヨ寮傚父");
+		}
+
+		R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+		if (!r.isOk()){
+			return R.failed("淇℃伅鏌ヨ寮傚父");
+		}
+		SysDept comp = r.getData();
+
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId, dto.getId()));
+		JSONObject requestApply = new JSONObject();
+		requestApply.put("fd_selectionmethod", dto.getSelectionMethod());
+		requestApply.put("fd_isrelated", dto.getIsRelated());
+		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());
+
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			requestApply.put("fd_templateId", tempSMJ);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+			requestApply.put("fd_templateId", tempSGB);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+			requestApply.put("fd_templateId", tempYMJ);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+			requestApply.put("fd_templateId", tempTFGS);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+			requestApply.put("fd_templateId", tempJXC);
+		}
+		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", StrUtil.isNotEmpty(dto.getContractCreater())?dto.getContractCreater():SecurityUtils.getUser().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");
+		requestApply.put("fd_baozhangren", comp.getBaozhangren());
+		requestApply.put("fd_summary",contract.getSummary());
+		JSONArray signList = new JSONArray();
+		JSONObject j = new JSONObject();
+		j.put("fd_standing","鐢�");
+		j.put("fd_Iden",customer.getCreditCode());
+		j.put("fd_signMain","2");
+		signList.add(j);
+		JSONObject y = new JSONObject();
+		y.put("fd_standing","涔�");
+		y.put("fd_Iden",comp.getOrgCode());
+		y.put("fd_signMain","1");
+		signList.add(y);
+		requestApply.put("fd_signList", signList);
+		if(StrUtil.isNotBlank(contract.getAttachmentUrl())){
+			JSONArray attList = new JSONArray();
+			JSONObject att = new JSONObject();
+			att.put("fd_attNum","1");
+			att.put("fd_attName",contract.getAttachmentName());
+			att.put("fd_attQuality","00");
+			att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
+			attList.add(att);
+			requestApply.put("attList", att);
+		}
+		if (CollUtil.isNotEmpty(subjectMatterList)){
+			JSONArray materialList = new JSONArray();
+			subjectMatterList.stream().forEach(subjectMatter->{
+				JSONObject material = new JSONObject();
+				material.put("fd_materiaCode", subjectMatter.getMaterialCode());
+				material.put("fd_materiaName", subjectMatter.getMaterialInternalName());
+				material.put("fd_specification", StrUtil.isNotBlank(subjectMatter.getSpecification())?subjectMatter.getSpecification():"");
+				material.put("fd_figureNumber", "");
+				material.put("fd_measureUnit", subjectMatter.getUnit());
+				material.put("fd_number", subjectMatter.getQuantity());
+				material.put("fd_price", subjectMatter.getUnitPrice());
+				Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode()).last("limit 1"));
+				if (ObjUtil.isNotNull(product)){
+					material.put("fd_rate", product.getTaxRate().toString());
+				}
+				material.put("fd_amount", subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
+				material.put("fd_requirements", "");
+				material.put("fd_standard", "");
+				material.put("fd_factory", "");
+				material.put("fd_Deadlines", ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())?subjectMatter.getPlannedDeliveryDate():"");
+				material.put("fd_delivery", "");
+				material.put("fd_des", "");
+				materialList.add(material);
+			});
+			requestApply.put("materialList", materialList);
+		}
+		log.info("宸ヤ笟娉垫帹閫佲�斺�斿悎鍚屼腑蹇冨悎鍚岃捣鑽夋帴鍙e叆鍙傦細{}", requestApply.toJSONString());
+		String respApply = HttpUtil.post("https://oa.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
+		log.info("宸ヤ笟娉垫帹閫佲�斺�斿悎鍚屼腑蹇冨悎鍚岃捣鑽夋帴鍙e洖鍙傦細{}", respApply);
+		JSONObject applyResp = JSONObject.parseObject(respApply);
+		if (applyResp.getString("code").equals("00")) {
+			contract.setCenterPushFlag("1");
+			baseMapper.updateById(contract);
+			return R.ok();
+		}
+		log.error("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}",applyResp.getString("msg"));
+		return R.failed("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}",applyResp.getString("msg"));
+	}
+
+	@Override
+	public R importContractMultiSheet(MultipartFile file) {
+
+		// 鐢ㄤ簬鏀堕泦鎵�鏈� Sheet 瑙f瀽鍚庣殑鏈�缁堢粨鏋滐紙濡傛灉闇�瑕佺粺涓�杩斿洖鎴栧鐞嗭級
+		// 娉ㄦ剰锛氬鏋滄暟鎹噺鏋佸ぇ锛屽缓璁湪 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. 渚濇鎵ц璇诲彇
+			// 娉ㄦ剰锛歟xcelReader.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"));
+
+				if (contract.getPaidAmount().compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
+					contract.setContractStatus(3);
+				}
+				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);
+						subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+						contractSubjectMatterMapper.insert(subjectMatter);
+//						if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
+//							//鍑哄簱鍗�
+//							ContractOutBound outBound = new ContractOutBound();
+//							outBound.setBusGuestId(contract.getPartyAId());
+//							outBound.setBusGuestName(contract.getPartyA());
+//							outBound.setContractId(contract.getId());
+//							outBound.setContractName(contract.getContractName());
+//							outBound.setInvoiceNum(new BigDecimal("0"));
+//							outBound.setInvoiceStatus("0");
+//							outBound.setOutBoundTime(new Date());
+//							outBound.setOutBoundNum(subjectMatter.getDeliveredQuantity());
+//							outBound.setSubjectMatterName(subjectMatter.getMaterialInternalName());
+//							outBound.setSubjectMatterCode(subjectMatter.getMaterialCode());
+//							contractOutBoundMapper.insert(outBound);
+//							if (contract.getBillingAmout().compareTo(new BigDecimal("0")) == 0) {
+//								contract.setBillingStatus("2");
+//								baseMapper.updateById(contract);
+//							}
+//						}
+
+					}
+				}
+				List<ContractPaymentScheduleExceVO> resultSchedule = scheduleList.stream().filter(item ->
+						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).getAgreedDays()));
+						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("鏂囦欢瑙f瀽澶辫触: " + e.getMessage());
+		}
+		return R.ok();
+	}
+
+
+	@Override
+	public R subjectChange(ContractSubjectChangeDTO changeDTO) {
+		Contract contract = baseMapper.selectById(changeDTO.getId());
+		if (ObjUtil.isNull(contract)){
+			return R.failed("鍚堝悓鐘舵�佸紓甯�");
+		}
+		if (contract.getBillingAmout().compareTo(new BigDecimal("0"))>0){
+			return R.failed("鍚堝悓宸插紑绁紝涓嶈兘杩涜鍙樻洿");
+		}
+		if (ObjUtil.isNotNull(contract.getOutBoundAmout())&&contract.getOutBoundAmout().compareTo(new BigDecimal("0"))>0){
+			return R.failed("鍚堝悓鏍囩殑鐗╁凡鍑哄簱锛屼笉鑳借繘琛屽彉鏇�");
+		}
+		if (CollUtil.isEmpty(changeDTO.getContractSubjectMatter())){
+			return R.failed("鍚堝悓鍙樻洿鍚庢爣鐨勭墿涓嶈兘涓虹┖");
+		}
+		BigDecimal changeAmount = changeDTO.getContractSubjectMatter().stream().map(subject->subject.getUnitPrice().multiply(subject.getQuantity())).reduce(BigDecimal.ZERO,BigDecimal::add);
+		if (contract.getAmount().compareTo(changeAmount)!=0){
+			return R.failed("鍚堝悓鍙樻洿鍚庢爣鐨勭墿鎬讳环蹇呴』涓庡悎鍚屾�讳环涓�鑷�");
+		}
+		List<ContractSubjectMatter> beforeList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,changeDTO.getId()));
+		ContractSubjectMatterChange change = new ContractSubjectMatterChange();
+		change.setContractId(contract.getId());
+		change.setBeforeChange(JSONObject.toJSONString(beforeList));
+		change.setAfterChange(JSONObject.toJSONString(changeDTO.getContractSubjectMatter()));
+		changeMapper.insert(change);
+		contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,changeDTO.getId()));
+		changeDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+			ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+			subjectMatter.setContractId(contract.getId());
+			subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+			subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+			subjectMatter.setDeliveryStatus(0);
+			subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+			contractSubjectMatterMapper.insert(subjectMatter);
+		});
+		return R.ok();
+	}
+
+	@Override
+	public Page subjectChangePage(Page page, ContracQueryDTO queryDTO) {
+		return changeMapper.subjectChangePage(page,queryDTO,DataScope.of("comp_id"));
+	}
+
+	@Override
+	public R subjectChangeAtt(ContractSubjectChangeAttDTO attDTO) {
+		ContractSubjectMatterChange change = changeMapper.selectById(attDTO.getId());
+		change.setAttachmentName(attDTO.getAttachmentName());
+		change.setAttachmentUrl(attDTO.getAttachmentUrl());
+		changeMapper.updateById(change);
+		return R.ok();
+	}
+
+	@Override
+	public R syncContractStatus(SyncContractStatusDTO dto) {
+		log.info("鍚堝悓瀹℃壒缁撴灉鍚屾锛屽悎鍚岀紪鍙�:{}锛屽鎵圭粨鏋滐細{}",dto.getContractNumber(),dto.getStatus());
+		if (StrUtil.isBlank(dto.getFd_bizId())){
+			return R.failed("鏁版嵁ID涓嶈兘涓虹┖");
+		}
+		if (StrUtil.isBlank(dto.getStatus())){
+			return R.failed("瀹℃壒鐘舵�佷笉鑳戒负绌�");
+		}
+		if (StrUtil.isBlank(dto.getReturnPerson())){
+			return R.failed("瀹℃壒浜轰笉鑳戒负绌�");
+		}
+		if (StrUtil.isBlank(dto.getReturnDate())){
+			return R.failed("瀹℃壒鏃堕棿涓嶈兘涓虹┖");
+		}
+		Contract contract = baseMapper.selectById(dto.getFd_bizId());
+		if(ObjUtil.isNull(contract)){
+			return R.failed("鏁版嵁ID寮傚父");
+		}
+		if (StrUtil.equals(dto.getStatus(),"1")){
+			takeEffect(contract.getId());
+		}
+		if (StrUtil.equals(dto.getStatus(),"2")){
+			refuseApproval(contract.getId());
+		}
+		if (StrUtil.equals(dto.getStatus(),"3")||StrUtil.equals(dto.getStatus(),"4")){
+			contract.setContractStatus(3);
+			baseMapper.updateById(contract);
+		}
+		saveContractApproval(contract,dto);
+		return R.ok();
+	}
+
+	private void saveContractApproval(Contract contract, SyncContractStatusDTO dto) {
+		ContractApproval approval = BeanUtil.copyProperties(dto,ContractApproval.class);
+		approval.setContractId(contract.getId());
+		approval.setReturnDateTime(DateUtil.parseDateTime(dto.getReturnDate()));
+		approval.setCompId(contract.getCompId());
+		contractApprovalMapper.insert(approval);
+	}
+
+	@Override
+	public R finallyPdf(ContractFinallyDTO attDTO) {
+		Contract contract = baseMapper.selectById(attDTO.getId());
+		if (ObjUtil.isNull(contract)){
+			return R.failed("鍚堝悓寮傚父");
+		}
+		if (!StrUtil.equals(contract.getContractStatus()+"","2")){
+			return R.failed("鍚堝悓寮傚父鐘舵��");
+		}
+		contract.setSignDate(attDTO.getSignDate());
+		contract.setExpirationDate(attDTO.getExpirationDate());
+		contract.setSinger(attDTO.getSinger());
+		contract.setReviewerNo(attDTO.getReviewerNo());
+		contract.setLinkPerson(attDTO.getLinkPerson());
+		contract.setLinkPhone(attDTO.getLinkPhone());
+		Long betweenDay = DateUtil.betweenDay(attDTO.getExpirationDate(),attDTO.getSignDate(),true);
+		contract.setDeliveryCycle(betweenDay.intValue());
+		baseMapper.updateById(contract);
+		JSONObject request = new JSONObject();
+		request.put("fd_docNumber", contract.getContractNo());
+		request.put("fd_singer", StrUtil.isNotEmpty(attDTO.getSinger())?attDTO.getSinger():SecurityUtils.getUser().getNickname());
+		request.put("fd_signTime", DateUtil.formatDate(contract.getSignDate()));
+		request.put("fd_linkPerson", StrUtil.isNotEmpty(attDTO.getLinkPerson())?attDTO.getLinkPerson():"");
+		request.put("fd_linkPhone", StrUtil.isNotEmpty(attDTO.getLinkPhone())?attDTO.getLinkPhone():"");
+		request.put("fd_address", contract.getSignPlace());
+		request.put("fd_receivedTime", DateUtil.format(contract.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
+		request.put("fd_receivedNum", 1);
+		request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
+		request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
+		request.put("fd_reviewerNo", StrUtil.isNotEmpty(attDTO.getReviewerNo())?attDTO.getReviewerNo():SecurityUtils.getUser().getNickname());
+		request.put("fd_docStatus", "20");
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+				StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+			request.put("fd_templateId", tempSMJ);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+			request.put("fd_templateId", tempSGB);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+			request.put("fd_templateId", tempYMJ);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+			request.put("fd_templateId", tempTFGS);
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+			request.put("fd_templateId", tempJXC);
+		}
+		request.put("fd_attName", attDTO.getLastAttachmentName());
+		request.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + attDTO.getLastAttachmentUrl()));
+		log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍏ュ弬锛歿}", request.toJSONString());
+		String resp = HttpUtil.post("https://oa.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addContractReview", request.toJSONString());
+		log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍥炲弬锛歿}", resp);
+		JSONObject respJson = JSONObject.parseObject(resp);
+		if (respJson.getString("code").equals("00")) {
+			contract.setLastAttachmentName(attDTO.getLastAttachmentName());
+			contract.setLastAttachmentUrl(attDTO.getLastAttachmentUrl());
+			baseMapper.updateById(contract);
+			return R.ok();
+		}
+		return R.failed("鍚堝悓涓績鏈�缁堢洊绔犵櫥璁癙DF涓婁紶澶辫触,鍘熷洜涓�:{}",respJson.getString("msg"));
+	}
+
+
+	@Override
+	public R addContractSgbHis(ContractAddDTO addDTO) {
+
+		if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+			return R.failed("璇锋坊鍔犳爣鐨勭墿");
+		}
+		if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
+			return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
+		}
+		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) {
+			return R.failed("浠樻闃舵姣斾緥寮傚父");
+		}
+		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+		contract.setErpContractNo(contract.getContractNo());
+		contract.setPartyBId(SecurityUtils.getUser().getCompId());
+		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		contract.setContractStatus(2);
+		contract.setPaidAmount(new BigDecimal("0"));
+		contract.setBillingStatus("1");
+		contract.setErpPushFlag("1");
+		contract.setCenterPushFlag("1");
+		contract.setBillingAmout(new BigDecimal("0"));
+
+		BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getErpCompanyCode,
+				addDTO.getPartyACode()).last("limit 1"));
+		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(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")) {
+			// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+			Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
+					.filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+					.max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+			if (maxDateObj.isPresent()) {
+				contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+			}
+		}
+		baseMapper.insert(contract);
+
+		if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(contract.getId());
+
+				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+				subjectMatter.setDeliveryStatus(0);
+				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+				contractSubjectMatterMapper.insert(subjectMatter);
+				//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
+				if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
+						ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
+					MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
+					record.setContractId(contract.getId());
+					record.setMatterId(subjectMatter.getId());
+					record.setContractName(contract.getContractName());
+					record.setBusGuestId(contract.getPartyAId());
+					record.setBusGuestName(contract.getPartyA());
+					record.setMeterReadTime(new Date());
+					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);
+				}
+			});
+
+		}
+
+		if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+			AtomicInteger index = new AtomicInteger(1);
+			addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+				int currentIndex = index.getAndIncrement();
+				ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+					schedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
+				}
+				if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
+					if (schedule.getEffectiveDate().before(DateUtil.date())) {
+						schedule.setFulfillmentStatus(1);
+					} else {
+						schedule.setFulfillmentStatus(0);
+					}
+				}
+				if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+					schedule.setPaymentStatus(0);
+				} else {
+					schedule.setPaymentStatus(3);
+				}
+				schedule.setContractId(contract.getId());
+				schedule.setContractName(contract.getContractName());
+				schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+				schedule.setStageOrder(currentIndex);
+				contractPaymentScheduleMapper.insert(schedule);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+					contract.setArrivalScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+					contract.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+			});
+
+		}
+
+		return R.ok(contract.getContractNo());
+	}
+
+	@Override
+	public R addContractHis(ContractAddDTO addDTO) {
+		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+		contract.setPartyBId(SecurityUtils.getUser().getCompId());
+		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		if (StrUtil.isEmpty(addDTO.getPartyA())) {
+			BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
+			if (ObjUtil.isNotNull(bc)) {
+				contract.setPartyA(bc.getCompanyName());
+			}
+			if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())
+					&& StrUtil.isEmpty(bc.getCreditCode())) {
+				return R.failed("璇峰畬鍠勫鎴稥RP缂栫爜鎴栫粍缁囨満鏋勪唬鐮�");
+			}
+		}
+
+		contract.setBillingStatus("1");
+		contract.setErpPushFlag("1");
+		contract.setCenterPushFlag("1");
+		contract.setContractStatus(2);
+		contract.setNickName(SecurityUtils.getUser().getNickname());
+		contract.setNextScheduleName("鍙戣揣鍓�");
+		if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
+			contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
+		}
+
+		if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+			return R.failed("鏍囩殑鐗╀笉鑳戒负绌�");
+		}
+
+		baseMapper.insert(contract);
+
+		if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(contract.getId());
+				subjectMatter.setDeliveredQuantity(ObjUtil.isNull(contractSubjectMatterAddDTO.getDeliveredQuantity())
+						? new BigDecimal("0") : contractSubjectMatterAddDTO.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);
+				subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+				contractSubjectMatterMapper.insert(subjectMatter);
+			});
+			List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+					.eq(ContractSubjectMatter::getContractId,contract.getId()).ne(ContractSubjectMatter::getDeliveryStatus,2));
+			if (CollUtil.isEmpty(subjectMatterList)){
+				contract.setNextScheduleName("璐у埌绛炬敹");
+				baseMapper.updateById(contract);
+			}
+		}
+		BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
+		if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+
+			for (int j = 0; j < addDTO.getContractPaymentSchedule().size(); j++) {
+				ContractPaymentSchedule schedule = new ContractPaymentSchedule();
+				schedule.setStageName(addDTO.getContractPaymentSchedule().get(j).getStageName());
+				schedule.setContractId(contract.getId());
+				schedule.setPaymentRatio(addDTO.getContractPaymentSchedule().get(j).getPaymentRatio());
+				schedule.setAgreedDays(addDTO.getContractPaymentSchedule().get(j).getAgreedDays());
+				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 (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐у埌绛炬敹")) {
+					contract.setArrivalScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+					contract.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐ㄤ繚閲�")) {
+					contract.setWarrantyScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+			}
+		}
+
+		if (contract.getPaidAmount().compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
+			contract.setContractStatus(3);
+			baseMapper.updateById(contract);
+		}
+		return R.ok();
+	}
+
+	@Override
+	public R getFinallyInfo(Long id) {
+		Contract contract = baseMapper.selectById(id);
+		return R.ok(BeanUtil.copyProperties(contract,ContractFinallyVo.class));
+	}
+
+	@Override
+	public R erpPush(Long id) {
+		Contract contract = baseMapper.selectById(id);
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId, id));
+		pushSubCompany(contract,subjectMatterList);
+		return R.ok();
+	}
+
+	@Override
+	public R associationPartyC(ContractAssociationPartyCyDTO associationPartyCyDTO) {
+		Contract contract = baseMapper.selectById(associationPartyCyDTO.getId());
+		contract.setPartyCId(Long.valueOf(associationPartyCyDTO.getPartyCId()));
+		baseMapper.updateById(contract);
+		return R.ok();
+	}
+
+	@Override
+	public R getInvoiceObj(Long id) {
+		Contract contract = baseMapper.selectById(id);
+		ContractInvoiceObjVo objVo = BeanUtil.copyProperties(contract,ContractInvoiceObjVo.class);
+		List<BusinessCustomerSelectVo> selectVoList = new ArrayList<>();
+		BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
+		if (ObjUtil.isNotNull(a)){
+			objVo.setPartyA(a.getCompanyName());
+			objVo.setPartyAOrgCode(a.getCreditCode());
+			objVo.setInvoiceType(StrUtil.isNotBlank(a.getInvoiceType())?a.getInvoiceType():"01");
+			BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(a,BusinessCustomerSelectVo.class);
+			selectVoList.add(selectVo);
+		}
+		if (ObjUtil.isNotNull(contract.getPartyCId())){
+			BusinessCustomer c = businessCustomerMapper.selectById(contract.getPartyCId());
+			if (ObjUtil.isNotNull(c)){
+				BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(c,BusinessCustomerSelectVo.class);
+				selectVoList.add(selectVo);
+			}
+		}
+		objVo.setLinkPartyC(selectVoList);
+		return R.ok(objVo);
 	}
 }

--
Gitblit v1.9.1