From 96119ca3973d5ea643db6a87b6a23fe404ddb8cc Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 29 六月 2026 15:35:40 +0800
Subject: [PATCH] feat:合同编号规则调整 出库编号规则调整

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 1654 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 1,420 insertions(+), 234 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 921a9dc..568ae38 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
@@ -7,20 +7,26 @@
 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.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.feign.RemoteDeptService;
 import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
 import com.by4cloud.platformx.business.constant.FlowNameEnum;
-import com.by4cloud.platformx.business.dto.ContractAddDTO;
-import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
+import com.by4cloud.platformx.business.dto.*;
 import com.by4cloud.platformx.business.entity.*;
 import com.by4cloud.platformx.business.mapper.*;
 import com.by4cloud.platformx.business.service.ContractService;
-import com.by4cloud.platformx.business.utils.ContractNumberGenerator;
+import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
 import com.by4cloud.platformx.business.vo.ContractDetailVo;
 import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.datascope.DataScope;
 import com.by4cloud.platformx.common.security.util.SecurityUtils;
 import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
 import com.deepoove.poi.XWPFTemplate;
@@ -29,22 +35,27 @@
 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.stereotype.Service;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 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 {
@@ -55,31 +66,92 @@
 	private final PaymentConfirmMapper paymentConfirmMapper;
 	private final CurrentOverdueMapper currentOverdueMapper;
 	private final BusinessCustomerMapper businessCustomerMapper;
+	private final MeterReadRecordMapper meterReadRecordMapper;
+	private final ContractExecDateMapper contractExecDateMapper;
 	private final RemoteFlowProcessService remoteFlowProcessService;
-	private final ContractTemplateMapper contractTemplateMapper;
+	private final ProductMapper productMapper;
 	private final RemoteDeptService remoteDeptService;
+	private final ContractDelayOutMapper contractDelayOutMapper;
+	private final ErpRequestRecordMapper erpRequestRecordMapper;
+	private final StringRedisTemplate redisTemplate;
 
-	@Value("${file.local.base-path}")
-	private String basePath;
+	@Value("${erp.ymj}")
+	private String ymjErp;
+
+	@Value("${erp.ymjToken}")
+	private String ymjToken;
+
+	@Value("${erp.smj}")
+	private String smjErp;
+
+	@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.sgb}")
+	private String sgb;
+
+	@Value("${dept.jxc}")
+	private String jxc;
+
+	@Value("${dept.tfgs}")
+	private String tfgs;
+
+	@Value("${dept.ymj}")
+	private String ymj;
 
 	@Override
 	public R add(ContractAddDTO addDTO) {
-		Contract contract = BeanUtil.copyProperties(addDTO,Contract.class);
+		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
 		contract.setPartyBId(SecurityUtils.getUser().getCompId());
 		contract.setPartyB(SecurityUtils.getUser().getCompName());
-		contract.setContractNo(ContractNumberGenerator.generateContractNumber());
+
 		contract.setPaidAmount(new BigDecimal("0"));
 		contract.setBillingStatus("0");
 		contract.setErpPushFlag("0");
-		List<Contract> contracts;
-		contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
-		while (ArrayUtil.isNotEmpty(contracts.toArray())){
-			contract.setContractNo(ContractNumberGenerator.generateContractNumber());
-			contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
+
+		if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())){
+			contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(),addDTO.getDeliveryCycle()));
 		}
+
+		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());
+
+			}
+		}
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
+			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);
 
-		if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())){
+		if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
 			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 				subjectMatter.setContractId(contract.getId());
@@ -88,16 +160,35 @@
 				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 (ArrayUtil.isNotEmpty(addDTO.getContractPaymentSchedule())){
+		if (ArrayUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
 			AtomicInteger index = new AtomicInteger(1);
 			addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
 				int currentIndex = index.getAndIncrement();
 				ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
-				if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")){
-					schedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),contractPaymentScheduleAddDTO.getAgreedDays()));
+				if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+					schedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
 				}
 				if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
 					if (schedule.getEffectiveDate().before(DateUtil.date())) {
@@ -106,17 +197,21 @@
 						schedule.setFulfillmentStatus(0);
 					}
 				}
-				schedule.setPaymentStatus(0);
+				if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+					schedule.setPaymentStatus(0);
+				} else {
+					schedule.setPaymentStatus(3);
+				}
 				schedule.setContractId(contract.getId());
 				schedule.setContractName(contract.getContractName());
 				schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
 				schedule.setStageOrder(currentIndex);
 				contractPaymentScheduleMapper.insert(schedule);
-				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")){
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
 					contract.setArrivalScheduleId(schedule.getId());
 					baseMapper.updateById(contract);
 				}
-				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")){
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
 					contract.setAcceptScheduleId(schedule.getId());
 					baseMapper.updateById(contract);
 				}
@@ -125,31 +220,53 @@
 		}
 
 
-
 		return R.ok();
 	}
 
 	@Override
 	public R edit(ContractUpdateDTO updateDTO) {
 		Contract entity = baseMapper.selectById(updateDTO.getId());
-		if (!StrUtil.equals(entity.getContractStatus()+"","0")){
+		if (!StrUtil.equals(entity.getContractStatus() + "", "0")) {
 			return R.failed("褰撳墠鐘舵�佹棤娉曚慨鏀瑰悎鍚�");
 		}
-		Contract contract = BeanUtil.copyProperties(updateDTO,Contract.class);
-		contract.setContractNo(ContractNumberGenerator.generateContractNumber());
+		Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
 		contract.setBillingStatus("0");
 		contract.setErpPushFlag("0");
 		contract.setPaidAmount(new BigDecimal("0"));
-		List<Contract> contracts;
-		contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
-		while (ArrayUtil.isNotEmpty(contracts.toArray())){
-			contract.setContractNo(ContractNumberGenerator.generateContractNumber());
-			contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
+			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")){
+			// 鍋囪 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())){
-			contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contract.getId()));
+		if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+			contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
 
 			updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
@@ -158,11 +275,24 @@
 				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 (ArrayUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())){
-			contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contract.getId()));
+		if (ArrayUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
+			contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
 
 			AtomicInteger index = new AtomicInteger(1);
 			updateDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
@@ -172,12 +302,17 @@
 				schedule.setContractName(contract.getContractName());
 				schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
 				schedule.setStageOrder(currentIndex);
+				if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+					schedule.setPaymentStatus(0);
+				} else {
+					schedule.setPaymentStatus(3);
+				}
 				contractPaymentScheduleMapper.insert(schedule);
-				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")){
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
 					contract.setArrivalScheduleId(schedule.getId());
 					baseMapper.updateById(contract);
 				}
-				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")){
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
 					contract.setAcceptScheduleId(schedule.getId());
 					baseMapper.updateById(contract);
 				}
@@ -191,11 +326,15 @@
 	@Override
 	public ContractDetailVo detail(Long id) {
 		Contract contract = baseMapper.selectById(id);
-		ContractDetailVo detailVo = BeanUtil.copyProperties(contract,ContractDetailVo.class);
-		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,id));
+		ContractDetailVo detailVo = BeanUtil.copyProperties(contract, ContractDetailVo.class);
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, id));
 		detailVo.setContractSubjectMatter(subjectMatterList);
-		List<ContractPaymentSchedule> paymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contract.getId()));
+		List<ContractPaymentSchedule> paymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
 		detailVo.setContractPaymentSchedule(paymentScheduleList);
+		BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
+		if (ObjUtil.isNotNull(a)){
+			detailVo.setPartyAOrgCode(a.getCreditCode());
+		}
 		return detailVo;
 	}
 
@@ -220,20 +359,131 @@
 		Contract contract = baseMapper.selectById(id);
 		contract.setContractStatus(2);
 		baseMapper.updateById(contract);
-		ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contract.getId())
-				.orderByAsc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
-		if (fitstSchedule.getStageName().equals("鍚堝悓绛捐")){
-			//鏂板搴旀敹
-			savePaymentConfirm(contract,fitstSchedule);
 
-			//鏂板鍚堝悓灞ョ害璁板綍
-			ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
-			process.setContractId(contract.getId());
-			process.setContractName(contract.getContractName());
-			process.setScheduleId(fitstSchedule.getId());
-			process.setScheduleName(fitstSchedule.getStageName());
-			process.setProcessDate(contract.getSignDate());
-			contractPaymentScheduleProcessMapper.insert(process);
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId,id));
+		if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
+			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;
+
+						//寰幆鏃ユ湡
+						Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfQuarter(contract.getEffectiveDate()), contract.getExecDay());
+						for (int i = 0; i < weeksTrue.intValue(); i++) {
+							Date execDatei = DateUtil.offsetMonth(execDate0, i*3);
+							ContractExecDate execDate = new ContractExecDate();
+							execDate.setContractId(contract.getId());
+							execDate.setMatterId(contractSubjectMatter.getId());
+							execDate.setExecDate(execDatei);
+							execDate.setGenFlag("0");
+							if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
+								contractExecDateMapper.insert(execDate);
+							}
+						}
+					}
+					if (StrUtil.equals(contract.getExecFrequency(), "4")) {
+						Date startDate = contract.getEffectiveDate();
+						Date endDate = contract.getExpirationDate();
+						Integer startMonth = DateUtil.month(contract.getEffectiveDate());
+						Integer endMonth = DateUtil.month(contract.getExpirationDate());
+						if (1<=startMonth&&startMonth<=6){
+							startDate = DateUtil.beginOfYear(startDate);
+						}
+						if (7<=startMonth&&startMonth<=12){
+							startDate = DateUtil.offsetMonth(DateUtil.beginOfYear(startDate),6);
+						}
+						if (1<=endMonth&&endMonth<=6){
+							endDate = DateUtil.offsetMonth(DateUtil.endOfYear(endDate),-6);
+						}
+						if (7<=endMonth&&endMonth<=12){
+							endDate = DateUtil.endOfYear(endDate);
+						}
+						Long weeksTrue = (DateUtil.betweenMonth(startDate,endDate, true)+1)/6;
+						//寰幆鏃ユ湡
+						Date execDate0 = DateUtil.offsetDay(startDate, contract.getExecDay());
+						for (int i = 0; i < weeksTrue.intValue(); i++) {
+							Date execDatei = DateUtil.offsetMonth(execDate0, i*6);
+							ContractExecDate execDate = new ContractExecDate();
+							execDate.setContractId(contract.getId());
+							execDate.setMatterId(contractSubjectMatter.getId());
+							execDate.setExecDate(execDatei);
+							execDate.setGenFlag("0");
+							if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
+								contractExecDateMapper.insert(execDate);
+							}
+						}
+					}
+					if (StrUtil.equals(contract.getExecFrequency(), "5")) {
+						Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfYear(contract.getEffectiveDate()),
+								DateUtil.endOfYear(contract.getExpirationDate()), true)+1;
+						//寰幆鏃ユ湡
+						Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfYear(contract.getEffectiveDate()), contract.getExecDay());
+						for (int i = 0; i < weeksTrue.intValue(); i++) {
+							Date execDatei = DateUtil.offsetWeek(execDate0, i);
+							ContractExecDate execDate = new ContractExecDate();
+							execDate.setContractId(contract.getId());
+							execDate.setMatterId(contractSubjectMatter.getId());
+							execDate.setExecDate(execDatei);
+							execDate.setGenFlag("0");
+							if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
+								contractExecDateMapper.insert(execDate);
+							}
+						}
+					}
+
+				}
+			}
+		} else {
+			ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId())
+					.orderByAsc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
+			if (fitstSchedule.getStageName().equals("鍚堝悓绛捐")) {
+				//鏂板搴旀敹
+				savePaymentConfirm(contract, fitstSchedule);
+
+				//鏂板鍚堝悓灞ョ害璁板綍
+				ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
+				process.setContractId(contract.getId());
+				process.setContractName(contract.getContractName());
+				process.setScheduleId(fitstSchedule.getId());
+				process.setScheduleName(fitstSchedule.getStageName());
+				process.setProcessDate(contract.getSignDate());
+				contractPaymentScheduleProcessMapper.insert(process);
 //			//褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
 //			PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
 //					.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
@@ -242,86 +492,163 @@
 //				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.setEffectiveDate(DateUtil.offsetDay(new Date(),endSchedule.getAgreedDays()));
-				endSchedule.setEffectiveEndDate(contract.getExpirationDate());
-				contractPaymentScheduleMapper.updateById(endSchedule);
-				//绗竴闃舵鐢熸晥鏃堕棿
-				fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
-				fitstSchedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
-				contractPaymentScheduleMapper.updateById(fitstSchedule);
-
-				//鏈�鍚庨樁娈靛簲鏀�
-				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);
-				}
+			} 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);
 			}
-			//鏇存柊鍚堝悓涓嬩釜闃舵
-			contract.setNextScheduleName(endSchedule.getStageName());
+			//鏌ヨ鏄惁鏈夊悗缁樁娈�
+			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);
+					}
+				}
+				//鏇存柊鍚堝悓涓嬩釜闃舵
+				contract.setNextScheduleName(endSchedule.getStageName());
+				baseMapper.updateById(contract);
+			}
+			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);
+			}
+			//鍙湁褰撳墠鍚堝悓绛惧瓧闃舵
+//		if(ArrayUtil.isEmpty(afterSchedule.toArray())){
+//			fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
+//			contractPaymentScheduleMapper.updateById(fitstSchedule);
+//		}
+		}
+		//erp鎺ㄩ��
+		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",contract.getCreateBy());
+			if (ArrayUtil.isNotEmpty(subjectMatterList.toArray())){
+				JSONArray subjectMatter = new JSONArray();
+				subjectMatterList.stream().forEach(contractSubjectMatter -> {
+					JSONObject subjectMatterItem = new JSONObject();
+					subjectMatterItem.put("itemNo",ItemGeneratorUtil.nextId());
+					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);
+			}
+			log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}",request.toJSONString());
+			HttpResponse response = HttpRequest.post(ymjErp)
+					.header("token", ymjToken)       // 娣诲姞璁よ瘉澶�
+					.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(ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()>1){
-			//绗竴闃舵鐢熸晥鏃堕棿
-			fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
-			contractPaymentScheduleMapper.updateById(fitstSchedule);
-			//鏇存柊鍚堝悓涓嬩釜闃舵
-			contract.setNextScheduleName(afterSchedule.get(0).getStageName());
+		if (StrUtil.equals(contract.getPartyBId()+"",smj)&&StrUtil.isNotEmpty(smjErp)){
+			log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}",request.toJSONString());
+			String result = HttpUtil.post(ymjErp,request.toJSONString());
+			log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}",result);
+			//淇濆瓨璇锋眰璁板綍
+			saveErpRequestRecord("smj",request.toJSONString(),result);
+			//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+			contract.setErpPushFlag("1");
 			baseMapper.updateById(contract);
 		}
-		//鍙湁褰撳墠鍚堝悓绛惧瓧闃舵
-		if(ArrayUtil.isEmpty(afterSchedule.toArray())){
-			fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
-			fitstSchedule.setEffectiveEndDate(contract.getExpirationDate());
-			contractPaymentScheduleMapper.updateById(fitstSchedule);
+
+		if (StrUtil.equals(contract.getPartyBId()+"",jxc)&&StrUtil.isNotEmpty(jxcErp)){
+			log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}",request.toJSONString());
+			String result = HttpUtil.post(ymjErp,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)){
+			//閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
+		}
+		if (StrUtil.equals(contract.getPartyBId()+"",sgb)&&StrUtil.isNotEmpty(sgbErp)){
+			//鐭冲伐娉典富鍔ㄦ帹閫佺郴缁�
+		}
+	}
+
+	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 schedule) {
 		PaymentConfirm paymentConfirm = new PaymentConfirm();
-		paymentConfirm.setBusinessType(schedule.getStageName()+"搴旀敹");
+		paymentConfirm.setBusinessType(schedule.getStageName() + "搴旀敹");
 		paymentConfirm.setBusGuestId(contract.getPartyAId());
 		paymentConfirm.setBusGuestName(contract.getPartyA());
 		paymentConfirm.setContractId(contract.getId());
@@ -333,30 +660,30 @@
 		paymentConfirm.setTransationAmount(schedule.getPlannedAmount());
 		paymentConfirm.setReceivableAmount(schedule.getPlannedAmount());
 		paymentConfirm.setTotalAmount(schedule.getPlannedAmount().multiply(new BigDecimal("-1")));
-		PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+		PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
 				.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
 		BigDecimal lastNewTotal = new BigDecimal("0");
-		if(ObjUtil.isNotNull(lastNewConfirm)){
+		if (ObjUtil.isNotNull(lastNewConfirm)) {
 			lastNewTotal = lastNewConfirm.getTotalAmount();
 		}
 		paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
-		if (schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0){
+		if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
 			paymentConfirmMapper.insert(paymentConfirm);
 		}
 		//瀹㈡埛浠樻瀹屾垚鍚堝悓
 		List<Contract> customerCompleteContractList = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
-				.eq(Contract::getPartyBId,SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
-		if (ArrayUtil.isNotEmpty(customerCompleteContractList)){
+				.eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
+		if (ArrayUtil.isNotEmpty(customerCompleteContractList)) {
 			List<BigDecimal> outAmountList = new ArrayList<>();
-			for (Contract completeContract:customerCompleteContractList
-				 ) {
-				PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,completeContract.getId())
+			for (Contract completeContract : customerCompleteContractList
+			) {
+				PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, completeContract.getId())
 						.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
 				//鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
-				if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+				if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
 					//鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
-					PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm,PaymentConfirm.class,"id","transationAmount",
-							"advanceAmount","receivableAmount","overdueAmount","totalAmount");
+					PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm, PaymentConfirm.class, "id", "transationAmount",
+							"advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
 					outConfirm.setBusinessType("璧勯噾杞嚭");
 					outConfirm.setConfirmTime(new Date());
 					outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
@@ -365,27 +692,33 @@
 					outAmountList.add(outConfirm.getTransationAmount());
 				}
 			}
-			if (ArrayUtil.isNotEmpty(outAmountList.toArray())){
-				BigDecimal currentSum = new BigDecimal("0");
-				for (BigDecimal currentAmount:outAmountList
-					 ) {
-					currentSum=currentSum.add(currentAmount);
-					//鏂板褰撳墠鍚堝悓 璧勯噾杞叆
-					PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm,PaymentConfirm.class,"id","transationAmount",
-							"advanceAmount","receivableAmount","overdueAmount","totalAmount");
-					inConfirm.setBusinessType("璧勯噾杞叆");
-					inConfirm.setConfirmTime(new Date());
-					inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
-					inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentSum));
-					if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
-						inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
-					}else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
-						inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
-					}
-					paymentConfirmMapper.insert(inConfirm);
+			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);
 				}
+				paymentConfirmMapper.insert(inConfirm);
+				//鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
+				contractPaymentScheduleMapper.updateById(schedule);
 			}
 
+
+		} else {
+			paymentConfirmMapper.insert(paymentConfirm);
 		}
 	}
 
@@ -393,8 +726,9 @@
 	public R genCurrentOverdue() {
 		List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
 				.lt(ContractPaymentSchedule::getEffectiveEndDate, DateUtil.today())
-				.ne(ContractPaymentSchedule::getPaymentStatus,"2"));
-		if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
+				.ne(ContractPaymentSchedule::getPaymentStatus, "2")
+				.ne(ContractPaymentSchedule::getPaymentStatus, 3));
+		if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
 			scheduleList.stream().forEach(contractPaymentSchedule -> {
 				Contract contract = baseMapper.selectById(contractPaymentSchedule.getContractId());
 				//搴旀敹瓒呮湡
@@ -408,45 +742,45 @@
 				overdueConfirm.setConfirmTime(new Date());
 				overdueConfirm.setScheduleId(contractPaymentSchedule.getId());
 				overdueConfirm.setScheduleName(contractPaymentSchedule.getStageName());
-				PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+				PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
 						.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-				overdueConfirm.setTransationAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus()+"","0")?
-						contractPaymentSchedule.getPlannedAmount():
-						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) {
-					overdueConfirm.setCompId(contractPaymentSchedule.getCompId());
-					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)){
-					currentOverdue.setCompId(contractPaymentSchedule.getCompId());
-					if (currentOverdue.getReceivableAmount().compareTo(new BigDecimal("0"))>0){
-						currentOverdueMapper.insert(currentOverdue);
+				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);
 					}
-				}else {
-					overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(),new Date(),true)));
-					currentOverdueMapper.updateById(overdue);
+					//褰撳墠閫炬湡
+					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);
+					}
 				}
 			});
 		}
@@ -464,31 +798,39 @@
 	@Override
 	public R copyNewContract(Long id) {
 		Contract oldContract = baseMapper.selectById(id);
-		Contract newContract = BeanUtil.copyProperties(oldContract,Contract.class,"id","createTime");
-		newContract.setContractNo(ContractNumberGenerator.generateContractNumber());
+		Contract newContract = BeanUtil.copyProperties(oldContract, Contract.class, "id", "createTime");
 		newContract.setPaidAmount(new BigDecimal("0"));
 		newContract.setBillingStatus("0");
 		newContract.setErpPushFlag("0");
 		newContract.setContractStatus(0);
-		List<Contract> contracts;
-		contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,newContract.getContractNo()));
-		while (ArrayUtil.isNotEmpty(contracts.toArray())){
-			newContract.setContractNo(ContractNumberGenerator.generateContractNumber());
-			contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,newContract.getContractNo()));
+		if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
+			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));
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, id));
 		subjectMatterList.stream().forEach(contractSubjectMatter -> {
-			ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatter,ContractSubjectMatter.class,"id","createTime");
+			ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatter, ContractSubjectMatter.class, "id", "createTime");
 			subjectMatter.setContractId(newContract.getId());
 			subjectMatter.setDeliveryStatus(0);
 			subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
 			subjectMatter.setRemainingQuantity(new BigDecimal("0"));
 			contractSubjectMatterMapper.insert(subjectMatter);
 		});
-		List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,id));
+		List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, id));
 		scheduleList.stream().forEach(contractPaymentSchedule -> {
-			ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentSchedule,ContractPaymentSchedule.class,"id","createTime");
+			ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentSchedule, ContractPaymentSchedule.class, "id", "createTime");
 			schedule.setContractId(newContract.getId());
 			schedule.setPaymentStatus(0);
 			schedule.setActualAmount(new BigDecimal("0"));
@@ -503,53 +845,53 @@
 	public void exportContractYMJJGCLWord(Long id, HttpServletResponse response) {
 		Contract contract = baseMapper.selectById(id);
 		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
-				.eq(ContractSubjectMatter::getContractId,id).orderByAsc(ContractSubjectMatter::getCreateTime));
-		Map<String,Object> map = new HashMap<>();
+				.eq(ContractSubjectMatter::getContractId, id).orderByAsc(ContractSubjectMatter::getCreateTime));
+		Map<String, Object> map = new HashMap<>();
 		//鍚堝悓鍩烘湰淇℃伅
-		map.put("partyA",contract.getPartyA());
-		map.put("partyB",contract.getPartyB());
-		map.put("contractNo",contract.getContractNo());
-		map.put("signPlace",contract.getSignPlace());
-		map.put("signDate",DateUtil.formatDate(contract.getSignDate()));
-		map.put("signDateYMD",DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
+		map.put("partyA", contract.getPartyA());
+		map.put("partyB", contract.getPartyB());
+		map.put("contractNo", contract.getContractNo());
+		map.put("signPlace", contract.getSignPlace());
+		map.put("signDate", DateUtil.formatDate(contract.getSignDate()));
+		map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
 		map.put("total", contract.getAmount());
 		map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
 		//鏍囩殑鐗�
-		List<Map<String,Object>> items = new ArrayList<>();
+		List<Map<String, Object>> items = new ArrayList<>();
 		List<RowRenderData> dataList = new ArrayList<>();
 		AtomicReference<Integer> no = new AtomicReference<>(0);
 		subjectMatterList.stream().forEach(contractSubjectMatter -> {
-			Map<String,Object> item = new HashMap<>();
-			item.put("no",no);
-			item.put("materialName",contractSubjectMatter.getMaterialName());
-			item.put("guige","");
-			item.put("unit","");
-			item.put("quantity",contractSubjectMatter.getQuantity());
-			item.put("danzhong","");
-			item.put("zongzhong","");
-			item.put("unitPrice",contractSubjectMatter.getUnitPrice());
-			item.put("price",contractSubjectMatter.getTotalAmount());
+			Map<String, Object> item = new HashMap<>();
+			item.put("no", no);
+			item.put("materialName", contractSubjectMatter.getMaterialName());
+			item.put("guige", contractSubjectMatter.getSpecification());
+			item.put("unit", contractSubjectMatter.getUnit());
+			item.put("quantity", contractSubjectMatter.getQuantity());
+			item.put("danzhong", contractSubjectMatter.getSingleWight());
+			item.put("zongzhong", contractSubjectMatter.getTotalWight());
+			item.put("unitPrice", contractSubjectMatter.getUnitPrice());
+			item.put("price", contractSubjectMatter.getTotalAmount());
 			items.add(item);
 			no.updateAndGet(v -> v + 1);
 		});
-		map.put("items",items);
+		map.put("items", items);
 		//瀹氬埗鏂�
 		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
-		map.put("companyName",customer.getCompanyName());
-		map.put("legalPerson",customer.getLegalPerson());
-		map.put("contactPhone",customer.getContactPhone());
-		map.put("bankName",customer.getBankName());
-		map.put("bankAccount",customer.getBankAccount());
+		map.put("companyName", customer.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("companyName",dept.getOrgName());
-		map.put("legalPerson1",StrUtil.isNotEmpty(dept.getLegalPerson())?dept.getLegalPerson():"");
-		map.put("entrustedAgent",StrUtil.isNotEmpty(dept.getLegalPerson())?"":dept.getEntrustedAgent());
-		map.put("orgContact",dept.getOrgContact());
-		map.put("orgBank",dept.getOrgBank());
-		map.put("orgBankAccount",dept.getOrgBankAccount());
+		map.put("companyName", dept.getOrgName());
+		map.put("legalPerson1", StrUtil.isNotEmpty(dept.getLegalPerson()) ? dept.getLegalPerson() : "");
+		map.put("entrustedAgent", StrUtil.isNotEmpty(dept.getLegalPerson()) ? "" : dept.getEntrustedAgent());
+		map.put("orgContact", dept.getOrgContact());
+		map.put("orgBank", dept.getOrgBank());
+		map.put("orgBankAccount", dept.getOrgBankAccount());
 
 		//鐢熸垚鏂囦欢鍚�
 		Long time = new Date().getTime();
@@ -561,13 +903,13 @@
 		try {
 			// 1. 鍔犺浇妯＄増
 			// 鍋囪妯＄増鍦� resources/templates/template.docx
-			ClassPathResource resource = new ClassPathResource("template/ymjjgclht.docx");
+			ClassPathResource resource = new ClassPathResource("template/ymj/ymjjgclht.docx");
 			// 閰嶇疆鍒楄〃绛栫暐
 			Configure config = Configure.builder()
 					.bind("items", new LoopRowTableRenderPolicy()) // 灏� items 缁戝畾鍒拌寰幆绛栫暐
 					.build();
 			// 2. 缂栬瘧骞舵覆鏌撴暟鎹�
-			XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(),config).render(map);
+			XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(), config).render(map);
 
 			// 3. 璁剧疆鍝嶅簲澶�
 			response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
@@ -580,8 +922,852 @@
 			out.flush();
 			out.close();
 			xwpfTemplate.close(); // 閲嶈锛氬叧闂ā鐗堥噴鏀捐祫婧�
-		}catch (IOException e) {
+		} catch (IOException e) {
 			e.printStackTrace();
 		}
 	}
+
+	@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())) {
+			execDateList.stream().forEach(contractExecDate -> {
+				Contract contract = baseMapper.selectById(contractExecDate.getContractId());
+				ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
+						.eq(ContractSubjectMatter::getContractId, contractExecDate.getContractId())
+						.eq(ContractSubjectMatter::getId, contractExecDate.getMatterId()));
+				//鐢熸垚鎶勮〃鍗�
+				if (StrUtil.isNotEmpty(subjectMatter.getMeterReadCode()) &&
+						ObjUtil.isNotNull(subjectMatter.getMeterReadNum())) {
+					MeterReadRecord record = BeanUtil.copyProperties(subjectMatter, MeterReadRecord.class, "id","meterReadNum");
+					record.setMatterId(subjectMatter.getId());
+					record.setBusGuestId(contract.getPartyAId());
+					record.setBusGuestName(contract.getPartyA());
+					meterReadRecordMapper.insert(record);
+				}else {
+					//鍒涘缓鏀舵鑺傜偣
+					//鏌ヨ涓婃鏀舵鑺傜偣
+					ContractPaymentSchedule lastSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+							.eq(ContractPaymentSchedule::getContractId,contract.getId())
+							.orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
+					ContractPaymentSchedule schedule = new ContractPaymentSchedule();
+					schedule.setStageName("鎴跨绉熻祦缂磋垂");
+					schedule.setContractId(contract.getId());
+					schedule.setContractName(contract.getContractName());
+					schedule.setPlannedAmount(subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
+					schedule.setEffectiveEndDate(contractExecDate.getExecDate());
+					schedule.setStageOrder(1);
+					if (ObjUtil.isNotNull(lastSchedule)){
+						schedule.setStageOrder(lastSchedule.getStageOrder()+1);
+					}
+					schedule.setPaymentStatus(0);
+					schedule.setActualAmount(new BigDecimal("0"));
+					schedule.setCompId(contract.getCompId());
+					contractPaymentScheduleMapper.insert(schedule);
+					//鎴垮眿绉熻祦鐢熸垚搴旀敹
+					PaymentConfirm confirm = new PaymentConfirm();
+					confirm.setBusinessType("鎴垮眿绉熻祦搴旀敹");
+					confirm.setBusGuestId(contract.getPartyAId());
+					confirm.setBusGuestName(contract.getPartyA());
+					confirm.setContractId(contract.getId());
+					confirm.setContractName(contract.getContractName());
+					confirm.setContractNo(contract.getContractNo());
+					confirm.setScheduleId(schedule.getId());
+					confirm.setScheduleName(schedule.getStageName());
+					confirm.setConfirmTime(contractExecDate.getExecDate());
+					confirm.setTransationAmount(subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
+					confirm.setTotalAmount(confirm.getTransationAmount().multiply(new BigDecimal("-1")));
+					PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+							.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+					if (ObjUtil.isNotNull(lastConfirm)) {
+						BigDecimal total = lastConfirm.getTotalAmount().add(confirm.getTotalAmount());
+						if (total.compareTo(new BigDecimal("0")) > 0) {
+							confirm.setAdvanceAmount(total);
+							confirm.setTotalAmount(total);
+						} else if (total.compareTo(new BigDecimal("0")) == 0) {
+							confirm.setTotalAmount(total);
+						} else {
+							confirm.setReceivableAmount(total.multiply(new BigDecimal("-1")));
+							confirm.setTotalAmount(total);
+						}
+						confirm.setCompId(contract.getCompId());
+						paymentConfirmMapper.insert(confirm);
+					} else {
+						confirm.setReceivableAmount(confirm.getTransationAmount());
+						confirm.setTotalAmount(confirm.getReceivableAmount().multiply(new BigDecimal("-1")));
+						confirm.setCompId(contract.getCompId());
+						paymentConfirmMapper.insert(confirm);
+					}
+				}
+				contractExecDate.setGenFlag("1");
+				contractExecDateMapper.updateById(contractExecDate);
+			});
+		}
+		return R.ok();
+	}
+
+	@Override
+	public void exportContractYMJGYPMMWord(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("no", no);
+			item.put("materialName", contractSubjectMatter.getMaterialName());
+			item.put("guige", contractSubjectMatter.getSpecification());
+			item.put("unit", contractSubjectMatter.getUnit());
+			item.put("quantity", contractSubjectMatter.getQuantity());
+			item.put("danzhong", contractSubjectMatter.getSingleWight());
+			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());
+			}
+			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/ymj/ymjgypmmht.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 exportContractYMJGKCPMMWord(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()));
+		map.put("deliveryCycle",contract.getDeliveryCycle());
+		//鏍囩殑鐗�
+		List<Map<String, Object>> items = new ArrayList<>();
+		AtomicReference<Integer> no = new AtomicReference<>(0);
+		subjectMatterList.stream().forEach(contractSubjectMatter -> {
+			Map<String, Object> item = new HashMap<>();
+			item.put("no", no);
+			item.put("materialName", contractSubjectMatter.getMaterialName());
+			item.put("guige", contractSubjectMatter.getSpecification());
+			item.put("unit", contractSubjectMatter.getUnit());
+			item.put("quantity", contractSubjectMatter.getQuantity());
+			item.put("danzhong", contractSubjectMatter.getSingleWight());
+			item.put("zongzhong", contractSubjectMatter.getTotalWight());
+			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/ymj/ymjgkcpmmht.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 exportContractYMJCGWord(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()));
+		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"));
+			Map<String, Object> item = new HashMap<>();
+			item.put("no", no);
+			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("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())))
+					.setScale(2, RoundingMode.HALF_UP));
+			item.put("deliveryDate", DateUtil.formatDate(contractSubjectMatter.getPlannedDeliveryDate()));
+			item.put("remarks", contractSubjectMatter.getRemarks());
+			map.put("taxRate",product.getTaxRate());
+			items.add(item);
+			no.updateAndGet(v -> v + 1);
+		});
+
+		//浠樻
+		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("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("zbjbl",contractPaymentSchedule.getPaymentRatio());
+				map.put("zbjje",contractPaymentSchedule.getPlannedAmount());
+				map.put("zbjjr",contractPaymentSchedule.getAgreedDays());
+			}
+		});
+		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/ymj/ymjcght.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 delayOutApproval(DelayOutApprovalDTO dto) {
+		Contract contract = baseMapper.selectById(dto.getContractId());
+		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));
+		//鍚姩娴佺▼
+		ProcessInstanceParamDto paramDto = new ProcessInstanceParamDto();
+		paramDto.setParamMap(map);
+		paramDto.setFlowName(FlowNameEnum.寤舵湡鍑鸿揣瀹℃壒.name());
+		R r1 = remoteFlowProcessService.startProcessInstance(paramDto);
+		if (r1.getCode() == 1) {
+			return R.failed("娴佺▼鍚姩澶辫触");
+		}
+		contractDelayOutMapper.insert(delayOut);
+		return R.ok();
+	}
+
+	@Override
+	public Page pageScope(Page page, ContracQueryDTO queryDTO) {
+		return baseMapper.pageScope(page,queryDTO, DataScope.of("comp_id"));
+	}
+
+	@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) {
+		if (ArrayUtil.isEmpty(addDTO.getContractSubjectMatter().toArray())){
+			return R.failed("璇锋坊鍔犳爣鐨勭墿");
+		}
+		if (ArrayUtil.isEmpty(addDTO.getContractPaymentSchedule().toArray())){
+			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("0");
+		contract.setErpPushFlag("1");
+		if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())){
+			contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(),addDTO.getDeliveryCycle()));
+		}
+
+		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 (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(contract.getId());
+				subjectMatter.setContractName(contract.getContractName());
+				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 (ArrayUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+			AtomicInteger index = new AtomicInteger(1);
+			addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+				int currentIndex = index.getAndIncrement();
+				ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+				if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+					schedule.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.getId());
+	}
+
+	@Override
+	public R updateContractSgb(ContractUpdateDTO updateDTO) {
+		if (ArrayUtil.isEmpty(updateDTO.getContractSubjectMatter().toArray())){
+			return R.failed("璇锋坊鍔犳爣鐨勭墿");
+		}
+		if (ArrayUtil.isEmpty(updateDTO.getContractPaymentSchedule().toArray())){
+			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 contract = BeanUtil.copyProperties(updateDTO, Contract.class);
+		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 (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+			contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
+
+			updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+				subjectMatter.setContractId(contract.getId());
+				subjectMatter.setContractName(contract.getContractName());
+				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 (ArrayUtil.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. 鍩烘湰鏁伴噺妫�鏌ワ細蹇呴』姝ｅソ鏄�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;
+	}
+
 }

--
Gitblit v1.9.1