From e02812df9217d3e50a368a8234c07c60c64c0ff4 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 05 八月 2026 08:34:26 +0800
Subject: [PATCH] feat:新增石煤机 机械厂模版合同/客户数据主数据同步接口/合同履约进度新增质保结束操作/合同开票状态 修改为待开 可开 已开/出库逻辑完善

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java |  667 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 527 insertions(+), 140 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 568ae38..437d9ca 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
@@ -25,6 +25,9 @@
 import com.by4cloud.platformx.business.service.ContractService;
 import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
 import com.by4cloud.platformx.business.vo.ContractDetailVo;
+import com.by4cloud.platformx.business.vo.ContractInvoiceVo;
+import com.by4cloud.platformx.business.vo.ContractSlipVo;
+import com.by4cloud.platformx.business.vo.FourAssociationPageVo;
 import com.by4cloud.platformx.common.core.util.R;
 import com.by4cloud.platformx.common.data.datascope.DataScope;
 import com.by4cloud.platformx.common.security.util.SecurityUtils;
@@ -73,13 +76,12 @@
 	private final RemoteDeptService remoteDeptService;
 	private final ContractDelayOutMapper contractDelayOutMapper;
 	private final ErpRequestRecordMapper erpRequestRecordMapper;
+	private final PaymentSlipMapper paymentSlipMapper;
+	private final ContractInvoiceMapper contractInvoiceMapper;
 	private final StringRedisTemplate redisTemplate;
 
 	@Value("${erp.ymj}")
 	private String ymjErp;
-
-	@Value("${erp.ymjToken}")
-	private String ymjToken;
 
 	@Value("${erp.smj}")
 	private String smjErp;
@@ -113,16 +115,34 @@
 		Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
 		contract.setPartyBId(SecurityUtils.getUser().getCompId());
 		contract.setPartyB(SecurityUtils.getUser().getCompName());
+		if (StrUtil.isEmpty(addDTO.getPartyA())){
+			BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
+			if (ObjUtil.isNotNull(bc)){
+				contract.setPartyA(bc.getCompanyName());
+			}
+			if (!StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)&&StrUtil.isEmpty(bc.getErpCompanyCode())){
+				return R.failed("璇峰畬鍠勫鎴稥RP缂栫爜");
+			}
+		}
 
 		contract.setPaidAmount(new BigDecimal("0"));
-		contract.setBillingStatus("0");
+		contract.setBillingStatus("1");
+		contract.setBillingAmout(new BigDecimal("0"));
 		contract.setErpPushFlag("0");
-
+		contract.setNickName(SecurityUtils.getUser().getNickname());
 		if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())){
 			contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(),addDTO.getDeliveryCycle()));
 		}
-
-		if (!StrUtil.equals(addDTO.getContractCategory(), "water_house")){
+		if (StrUtil.equals(addDTO.getContractCategory(), "water_house")){
+			if(!addDTO.getContractSubjectMatter().stream().allMatch(item->StrUtil.equals(item.getMaterialCode(), "water_bill")||
+					StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
+				return R.failed("璇锋柊澧炴按/鐢典唬缂存埧灞嬬璧佸悎鍚岋紒");
+			}
+		}else {
+			if(addDTO.getContractSubjectMatter().stream().anyMatch(item->StrUtil.equals(item.getMaterialCode(), "water_bill")||
+					StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
+				return R.failed("姘寸數浠g即銆佹埧灞嬬璧佷骇鍝佸彧鑳藉湪姘�/鐢典唬缂存埧灞嬬璧佸悎鍚岋紒");
+			}
 			// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
 			Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
 					.filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
@@ -133,6 +153,11 @@
 
 			}
 		}
+
+		if (ArrayUtil.isEmpty(addDTO.getContractSubjectMatter().toArray())){
+			return R.failed("鏍囩殑鐗╀笉鑳戒负绌�");
+		}
+
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
 			contract.setContractNo(generateSMJContractNo());
 		}
@@ -148,14 +173,20 @@
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
 			contract.setContractNo(generateJXCContractNo());
 		}
-
+		if (StrUtil.isNotEmpty(contract.getContractCategory())&&(StrUtil.equals(contract.getContractCategory(),"ymjjgcl")
+				||StrUtil.equals(contract.getContractCategory(),"ymjgypmm")||StrUtil.equals(contract.getContractCategory(),"ymjgkcpmm")
+				||StrUtil.equals(contract.getContractCategory(),"ymjcg")||StrUtil.equals(contract.getContractCategory(),"tfgsgypmm")
+				||StrUtil.equals(contract.getContractCategory(),"smjgypmm")||StrUtil.equals(contract.getContractCategory(),"jxcxsht"))
+		){
+			contract.setContractName(contract.getContractName()+contract.getContractNo());
+		}
 		baseMapper.insert(contract);
 
 		if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
 			addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 				subjectMatter.setContractId(contract.getId());
-				subjectMatter.setContractName(contract.getContractName());
+				subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
 				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
 				subjectMatter.setDeliveryStatus(0);
 				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
@@ -215,6 +246,10 @@
 					contract.setAcceptScheduleId(schedule.getId());
 					baseMapper.updateById(contract);
 				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐ㄤ繚閲�")) {
+					contract.setWarrantyScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
 			});
 
 		}
@@ -229,10 +264,23 @@
 		if (!StrUtil.equals(entity.getContractStatus() + "", "0")) {
 			return R.failed("褰撳墠鐘舵�佹棤娉曚慨鏀瑰悎鍚�");
 		}
+		if (StrUtil.isEmpty(updateDTO.getPartyA())){
+			BusinessCustomer bc = businessCustomerMapper.selectById(updateDTO.getPartyAId());
+			if (ObjUtil.isNotNull(bc)){
+				updateDTO.setPartyA(bc.getRegisterName());
+			}
+			if (StrUtil.isEmpty(bc.getErpCompanyCode())||StrUtil.isEmpty(bc.getRegisterName())||
+					StrUtil.isEmpty(bc.getBankName())||StrUtil.isEmpty(bc.getBankAccount())){
+				return R.failed("璇峰畬鍠勬敼瀹㈡埛鏁版嵁鍚庡啀娣诲姞鍚堝悓");
+			}
+		}
+
 		Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
-		contract.setBillingStatus("0");
+		contract.setBillingStatus("1");
 		contract.setErpPushFlag("0");
 		contract.setPaidAmount(new BigDecimal("0"));
+		contract.setBillingAmout(new BigDecimal("0"));
+		contract.setNickName(SecurityUtils.getUser().getNickname());
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
 			contract.setContractNo(generateSMJContractNo());
 		}
@@ -251,7 +299,17 @@
 		if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())){
 			contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(),updateDTO.getDeliveryCycle()));
 		}
-		if (!StrUtil.equals(updateDTO.getContractCategory(), "water_house")){
+		if (StrUtil.equals(updateDTO.getContractCategory(), "water_house")){
+			if(!updateDTO.getContractSubjectMatter().stream().allMatch(item->StrUtil.equals(item.getMaterialCode(), "water_bill")||
+					StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
+				return R.failed("璇锋柊澧炴按/鐢典唬缂存埧灞嬬璧佸悎鍚岋紒");
+			}
+		}else {
+			if(updateDTO.getContractSubjectMatter().stream().anyMatch(item->StrUtil.equals(item.getMaterialCode(), " ")||
+					StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
+				return R.failed("姘寸數浠g即銆佹埧灞嬬璧佷骇鍝佸彧鑳藉湪姘�/鐢典唬缂存埧灞嬬璧佸悎鍚岋紒");
+			}
+			// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
 			// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
 			Optional<ContractSubjectMatterAddDTO> maxDateObj = updateDTO.getContractSubjectMatter().stream()
 					.filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
@@ -262,7 +320,6 @@
 
 			}
 		}
-
 		baseMapper.updateById(contract);
 
 		if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
@@ -271,9 +328,10 @@
 			updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
 				ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
 				subjectMatter.setContractId(contract.getId());
-				subjectMatter.setContractName(contract.getContractName());
+				subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
 				subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
 				subjectMatter.setDeliveryStatus(0);
+				subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
 				contractSubjectMatterMapper.insert(subjectMatter);
 				//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
 				if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
@@ -314,6 +372,10 @@
 				}
 				if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
 					contract.setAcceptScheduleId(schedule.getId());
+					baseMapper.updateById(contract);
+				}
+				if (contractPaymentScheduleAddDTO.getStageName().equals("璐ㄤ繚閲�")) {
+					contract.setWarrantyScheduleId(schedule.getId());
 					baseMapper.updateById(contract);
 				}
 			});
@@ -562,80 +624,124 @@
 //		}
 		}
 		//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")));
+		new Thread(()->{
+			try {
+				Thread.sleep(500);
+				JSONObject request = new JSONObject();
+				BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+				request.put("contractNo",contract.getContractNo());
+				request.put("partyA",contract.getPartyA());
+				request.put("partyACode",customer.getErpCompanyCode());
+				if (StrUtil.equals(contract.getPartyBId()+"",ymj)&&StrUtil.isNotEmpty(ymjErp)){
+					request.put("customerCode",customer.getErpCompanyCode());
+					request.put("currencyId","RMB");
+					request.put("signDate",DateUtil.format(contract.getSignDate(),DatePattern.NORM_DATETIME_PATTERN));
+					request.put("dateDeliver",DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
+					request.put("moneySum",contract.getAmount());
+					request.put("signManner","闈㈢");
+					request.put("salesman","");
+					if (ArrayUtil.isNotEmpty(subjectMatterList.toArray())){
+						JSONArray subjectMatter = new JSONArray();
+						subjectMatterList.stream().forEach(contractSubjectMatter -> {
+							JSONObject subjectMatterItem = new JSONObject();
+							subjectMatterItem.put("itemNo",contractSubjectMatter.getMaterialCode());
+							subjectMatterItem.put("salePrice",contractSubjectMatter.getUnitPrice());
+							subjectMatterItem.put("qtyRequired",contractSubjectMatter.getQuantity());
+							subjectMatterItem.put("money",contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
+							Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId,contract.getCompId())
+									.eq(Product::getErpCode,contractSubjectMatter.getMaterialCode()));
+							if (ObjUtil.isNotNull(product)){
+								subjectMatterItem.put("taxRate",new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
+							}
+							subjectMatterItem.put("dateDeliver",ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate())?
+									DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(),DatePattern.NORM_DATETIME_PATTERN):
+									DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
+							subjectMatter.add(subjectMatterItem);
+						});
+						request.put("details",subjectMatter);
 					}
-					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 (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 (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)){
-			//鐭冲伐娉典富鍔ㄦ帹閫佺郴缁�
-		}
+					JSONObject loginJson = new JSONObject();
+					loginJson.put("username","admin");
+					loginJson.put("password","admin123");
+					log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍏ュ弬锛歿}",loginJson.toJSONString());
+					String loginResp = HttpUtil.post(ymjErp+"/api/account/v1/login",loginJson.toJSONString());
+					log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍥炲弬锛歿}",loginResp);
+					JSONObject respJson = JSONObject.parseObject(loginResp);
+					if (respJson.getInteger("code")==0){
+						JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
+						log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}",request.toJSONString());
+						HttpResponse response = HttpRequest.post(ymjErp+"/api/contract-staging/v1/receive")
+								.header("token", dataJson.getString("token"))       // 娣诲姞璁よ瘉澶�
+								.header("Content-Type", "application/json")         // 璁剧疆鍐呭绫诲瀷
+								.body(request.toJSONString())                        // 璁剧疆璇锋眰浣�
+								.execute();                                         // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+						log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}",response.body());
+						//淇濆瓨璇锋眰璁板綍
+						saveErpRequestRecord("ymj",request.toJSONString(),response.body());
+						//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+						contract.setErpPushFlag("1");
+						baseMapper.updateById(contract);
+					}
+
+				}
+				if (StrUtil.equals(contract.getPartyBId()+"",smj)&&StrUtil.isNotEmpty(smjErp)){
+					log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}",request.toJSONString());
+					String result = HttpUtil.post(smjErp,request.toJSONString());
+					log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}",result);
+					//淇濆瓨璇锋眰璁板綍
+					saveErpRequestRecord("smj",request.toJSONString(),result);
+					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+					contract.setErpPushFlag("1");
+					baseMapper.updateById(contract);
+				}
+
+				if (StrUtil.equals(contract.getPartyBId()+"",jxc)&&StrUtil.isNotEmpty(jxcErp)){
+					log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}",request.toJSONString());
+					String result = HttpUtil.post(jxcErp,request.toJSONString());
+					log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍥炲弬锛歿}",result);
+					//淇濆瓨璇锋眰璁板綍
+					saveErpRequestRecord("jxc",request.toJSONString(),result);
+					//鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+					contract.setErpPushFlag("1");
+					baseMapper.updateById(contract);
+				}
+				if (StrUtil.equals(contract.getPartyBId()+"",tfgs)&&StrUtil.isNotEmpty(tfgsErp)){
+					//閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
+				}
+				if (StrUtil.equals(contract.getPartyBId()+"",sgb)&&StrUtil.isNotEmpty(sgbErp)){
+					//鐭冲伐娉典富鍔ㄦ帹閫佺郴缁�
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}).start();
+		//鍚堝悓涓績鎺ㄩ��
+		new Thread(()->{
+			try {
+				JSONObject request = new JSONObject();
+				request.put("fd_docNumber",contract.getContractNo());
+				request.put("fd_singer",contract.getNickName());
+				request.put("fd_signTime",DateUtil.formatDate(contract.getSignDate()));
+				request.put("fd_linkPerson","");
+				request.put("fd_linkPhone","");
+				request.put("fd_address",contract.getSignPlace());
+				request.put("fd_receivedTime",DateUtil.format(contract.getCreateTime(),DatePattern.NORM_DATETIME_PATTERN));
+				request.put("fd_receivedNum",1);
+				request.put("fd_effedate",DateUtil.formatDate(contract.getEffectiveDate()));
+				request.put("fd_enddate",DateUtil.formatDate(contract.getExpirationDate()));
+				request.put("fd_reviewerNo",contract.getNickName());
+				request.put("fd_docStatus","20");
+				request.put("fd_templateId","");
+				request.put("fd_attName",contract.getAttachmentName());
+				request.put("fd_attcontent",contract.getAttachmentName());
+				log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍏ュ弬锛歿}",request.toJSONString());
+				String resp = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addContractReview",request.toJSONString());
+				log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍥炲弬锛歿}",resp);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}).start();
 	}
 
 	private void saveErpRequestRecord(String ymj, String toJSONString, String result) {
@@ -680,7 +786,7 @@
 				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 (ObjUtil.isNotNull(contractLastConfirm)&&contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
 					//鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
 					PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm, PaymentConfirm.class, "id", "transationAmount",
 							"advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
@@ -731,55 +837,57 @@
 		if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
 			scheduleList.stream().forEach(contractPaymentSchedule -> {
 				Contract contract = baseMapper.selectById(contractPaymentSchedule.getContractId());
-				//搴旀敹瓒呮湡
-				PaymentConfirm overdueConfirm = new PaymentConfirm();
-				overdueConfirm.setBusinessType("搴旀敹瓒呮湡");
-				overdueConfirm.setBusGuestId(contract.getPartyAId());
-				overdueConfirm.setBusGuestName(contract.getPartyA());
-				overdueConfirm.setContractId(contract.getId());
-				overdueConfirm.setContractName(contract.getContractName());
-				overdueConfirm.setContractNo(contract.getContractNo());
-				overdueConfirm.setConfirmTime(new Date());
-				overdueConfirm.setScheduleId(contractPaymentSchedule.getId());
-				overdueConfirm.setScheduleName(contractPaymentSchedule.getStageName());
-				PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
-						.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-				if(ObjUtil.isNotNull(newLastConfirm)){
-					overdueConfirm.setTransationAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
-							contractPaymentSchedule.getPlannedAmount() :
-							contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
-					overdueConfirm.setReceivableAmount(newLastConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
-					overdueConfirm.setOverdueAmount(overdueConfirm.getTransationAmount());
-					overdueConfirm.setTotalAmount(newLastConfirm.getTotalAmount());
-					overdueConfirm.setCompId(contract.getCompId());
-					//鍒ゆ柇褰撳墠闃舵鏄惁宸茬敓鎴愪笂闃舵搴旀敹瓒呮湡
-					PaymentConfirm oiverdueConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getScheduleId, contractPaymentSchedule.getId())
-							.eq(PaymentConfirm::getBusinessType, "搴旀敹瓒呮湡"));
-					if (ObjUtil.isNull(oiverdueConfirm) && overdueConfirm.getTransationAmount().compareTo(new BigDecimal("0")) > 0) {
-						paymentConfirmMapper.insert(overdueConfirm);
-					}
-					//褰撳墠閫炬湡
-					CurrentOverdue currentOverdue = new CurrentOverdue();
-					currentOverdue.setBusGuestId(contract.getPartyAId());
-					currentOverdue.setBusGuestName(contract.getPartyA());
-					currentOverdue.setContractId(contractPaymentSchedule.getContractId());
-					currentOverdue.setContractName(contractPaymentSchedule.getContractName());
-					currentOverdue.setScheduleId(contractPaymentSchedule.getId());
-					currentOverdue.setScheduleName(contractPaymentSchedule.getStageName());
-					currentOverdue.setCompId(contract.getCompId());
-					currentOverdue.setContractExpirTime(contractPaymentSchedule.getEffectiveEndDate());
-					currentOverdue.setReceivableAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
-							contractPaymentSchedule.getPlannedAmount() : contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
-					currentOverdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
-					CurrentOverdue overdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getContractId, currentOverdue.getContractId())
-							.eq(CurrentOverdue::getScheduleId, currentOverdue.getScheduleId()).last("limit 1"));
-					if (ObjUtil.isNull(overdue)) {
-						if (currentOverdue.getReceivableAmount().compareTo(new BigDecimal("0")) > 0) {
-							currentOverdueMapper.insert(currentOverdue);
+				if (ObjUtil.isNotNull(contract)) {
+					//搴旀敹瓒呮湡
+					PaymentConfirm overdueConfirm = new PaymentConfirm();
+					overdueConfirm.setBusinessType("搴旀敹瓒呮湡");
+					overdueConfirm.setBusGuestId(contract.getPartyAId());
+					overdueConfirm.setBusGuestName(contract.getPartyA());
+					overdueConfirm.setContractId(contract.getId());
+					overdueConfirm.setContractName(contract.getContractName());
+					overdueConfirm.setContractNo(contract.getContractNo());
+					overdueConfirm.setConfirmTime(new Date());
+					overdueConfirm.setScheduleId(contractPaymentSchedule.getId());
+					overdueConfirm.setScheduleName(contractPaymentSchedule.getStageName());
+					PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+							.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+					if (ObjUtil.isNotNull(newLastConfirm)) {
+						overdueConfirm.setTransationAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
+								contractPaymentSchedule.getPlannedAmount() :
+								contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
+						overdueConfirm.setReceivableAmount(newLastConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+						overdueConfirm.setOverdueAmount(overdueConfirm.getTransationAmount());
+						overdueConfirm.setTotalAmount(newLastConfirm.getTotalAmount());
+						overdueConfirm.setCompId(contract.getCompId());
+						//鍒ゆ柇褰撳墠闃舵鏄惁宸茬敓鎴愪笂闃舵搴旀敹瓒呮湡
+						PaymentConfirm oiverdueConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getScheduleId, contractPaymentSchedule.getId())
+								.eq(PaymentConfirm::getBusinessType, "搴旀敹瓒呮湡"));
+						if (ObjUtil.isNull(oiverdueConfirm) && overdueConfirm.getTransationAmount().compareTo(new BigDecimal("0")) > 0) {
+							paymentConfirmMapper.insert(overdueConfirm);
 						}
-					} 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);
+						}
 					}
 				}
 			});
@@ -800,9 +908,10 @@
 		Contract oldContract = baseMapper.selectById(id);
 		Contract newContract = BeanUtil.copyProperties(oldContract, Contract.class, "id", "createTime");
 		newContract.setPaidAmount(new BigDecimal("0"));
-		newContract.setBillingStatus("0");
+		newContract.setBillingStatus("1");
 		newContract.setErpPushFlag("0");
 		newContract.setContractStatus(0);
+		newContract.setBillingAmout(new BigDecimal("0"));
 		if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
 			newContract.setContractNo(generateSMJContractNo());
 		}
@@ -877,7 +986,7 @@
 		map.put("items", items);
 		//瀹氬埗鏂�
 		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
-		map.put("companyName", customer.getRegisterName());
+		map.put("companyName", contract.getPartyA());
 		map.put("legalPerson", customer.getLegalPerson());
 		map.put("contactPhone", customer.getContactPhone());
 		map.put("bankName", customer.getBankName());
@@ -941,6 +1050,7 @@
 				if (StrUtil.isNotEmpty(subjectMatter.getMeterReadCode()) &&
 						ObjUtil.isNotNull(subjectMatter.getMeterReadNum())) {
 					MeterReadRecord record = BeanUtil.copyProperties(subjectMatter, MeterReadRecord.class, "id","meterReadNum");
+					record.setContractName(contract.getContractName());
 					record.setMatterId(subjectMatter.getId());
 					record.setBusGuestId(contract.getPartyAId());
 					record.setBusGuestName(contract.getPartyA());
@@ -964,6 +1074,10 @@
 					schedule.setPaymentStatus(0);
 					schedule.setActualAmount(new BigDecimal("0"));
 					schedule.setCompId(contract.getCompId());
+					schedule.setSubjectMatterCode(subjectMatter.getMaterialCode());
+					schedule.setSubjectMatterName(subjectMatter.getMaterialInternalName());
+					schedule.setRemark(DateUtil.formatDate(contractExecDate.getExecDate())+schedule.getStageName());
+					schedule.setInvoiceFlag("0");
 					contractPaymentScheduleMapper.insert(schedule);
 					//鎴垮眿绉熻祦鐢熸垚搴旀敹
 					PaymentConfirm confirm = new PaymentConfirm();
@@ -1330,6 +1444,7 @@
 		map.put("partyA",contract.getPartyA());
 		map.put("partyB",contract.getPartyB());
 		map.put("delayDay",dto.getDelayDay());
+		map.put("contractNo",contract.getContractNo());
 		map.put("applyName",SecurityUtils.getUser().getUsername());
 		map.put("applyTime",DateUtil.format(delayOut.getApplyTime(),DatePattern.NORM_DATETIME_FORMAT));
 		//鍚姩娴佺▼
@@ -1454,8 +1569,16 @@
 		contract.setPartyB(SecurityUtils.getUser().getCompName());
 		contract.setContractStatus(2);
 		contract.setPaidAmount(new BigDecimal("0"));
-		contract.setBillingStatus("0");
+		contract.setBillingStatus("1");
 		contract.setErpPushFlag("1");
+		contract.setBillingAmout(new BigDecimal("0"));
+
+		BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getErpCompanyCode,
+				addDTO.getPartyACode()).last("limit 1"));
+		if (ObjUtil.isNull(bc)){
+			return R.failed("erp瀹㈡埛缂栫爜涓嶅瓨鍦�");
+		}
+		contract.setPartyAId(bc.getId());
 		if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())){
 			contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(),addDTO.getDeliveryCycle()));
 		}
@@ -1479,7 +1602,7 @@
 			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()));
@@ -1544,7 +1667,7 @@
 		}
 
 
-		return R.ok(contract.getId());
+		return R.ok(contract.getContractNo());
 	}
 
 	@Override
@@ -1563,7 +1686,12 @@
 			return R.failed("浠樻闃舵姣斾緥寮傚父");
 		}
 
+		Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId,updateDTO.getDataId()).last("limit 1"));
+		if (ObjUtil.isNull(contractOld)){
+			return R.failed("鍚堝悓鏁版嵁ID锛歿}涓嶅瓨鍦紝璇峰厛鏂板鍚庡啀淇敼",updateDTO.getDataId());
+		}
 		Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
+		contract.setId(contractOld.getId());
 		if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())){
 			contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(),updateDTO.getDeliveryCycle()));
 		}
@@ -1586,7 +1714,7 @@
 			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);
@@ -1770,4 +1898,263 @@
 		return "ZB-GYB-"+dateStr + seqStr;
 	}
 
+	@Override
+	public R abortContractSgb(String dataId) {
+		Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId,dataId).last("limit 1"));
+		if (ObjUtil.isNull(contractOld)){
+			return R.failed("鍚堝悓鏁版嵁ID锛歿}涓嶅瓨鍦紝璇峰厛鏂板鍚庡啀鎿嶄綔",dataId);
+		}
+		contractOld.setContractStatus(4);
+		baseMapper.updateById(contractOld);
+		return R.ok();
+	}
+
+	@Override
+	public R delContractSgb(String dataId) {
+		Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId,dataId).last("limit 1"));
+		if (ObjUtil.isNull(contractOld)){
+			return R.failed("鍚堝悓鏁版嵁ID锛歿}涓嶅瓨鍦紝璇峰厛鏂板鍚庡啀鎿嶄綔",dataId);
+		}
+
+		contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contractOld.getId()));
+		contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contractOld.getId()));
+		paymentConfirmMapper.delete(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contractOld.getId()));
+		baseMapper.deleteById(contractOld);
+		return R.ok();
+	}
+
+	@Override
+	public Page fourAssociation(Page page,ContractQueryDTO queryDTO) {
+		Page<FourAssociationPageVo> page1 = baseMapper.fourAssociation(page,queryDTO,DataScope.of("comp_id"));
+		if (ArrayUtil.isNotEmpty(page1.getRecords().toArray())){
+			page1.getRecords().stream().forEach(fourAssociationPageVo -> {
+				List<PaymentSlip> slips = paymentSlipMapper.selectList(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getContractId,fourAssociationPageVo.getId())
+						.orderByAsc(PaymentSlip::getPaymentTime));
+				if (ArrayUtil.isNotEmpty(slips.toArray())){
+					fourAssociationPageVo.setSlipVoList(BeanUtil.copyToList(slips,ContractSlipVo.class));
+				}
+				List<ContractInvoice> invoices = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId,fourAssociationPageVo.getId())
+						.orderByAsc(ContractInvoice::getInvoiceTime));
+				if (ArrayUtil.isNotEmpty(invoices.toArray())){
+					fourAssociationPageVo.setInvoiceVoList(BeanUtil.copyToList(invoices, ContractInvoiceVo.class));
+				}
+				if (fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getPaidAmount())==0&&
+						fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getBillingAmout())==0){
+					fourAssociationPageVo.setAssociation("宸插畬鎴�");
+				}
+			});
+		}
+		return page1;
+	}
+
+	@Override
+	public void exportContractSMJGYPMMWord(Long id, HttpServletResponse response) {
+		Contract contract = baseMapper.selectById(id);
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId, id).orderByAsc(ContractSubjectMatter::getCreateTime));
+		Map<String, Object> map = new HashMap<>();
+		//鍚堝悓鍩烘湰淇℃伅
+		map.put("partyA", contract.getPartyA());
+		map.put("partyB", contract.getPartyB());
+		map.put("contractNo", contract.getContractNo());
+		map.put("signPlace", contract.getSignPlace());
+		map.put("signDate", DateUtil.formatDate(contract.getSignDate()));
+		map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
+		map.put("total", contract.getAmount());
+		map.put("totalNoTax", contract.getAmount().divide(new BigDecimal("100").add(new BigDecimal("13")), 2, RoundingMode.HALF_UP)
+				.multiply(new BigDecimal("87")));
+		map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
+		//鏍囩殑鐗�
+		List<Map<String, Object>> items = new ArrayList<>();
+		subjectMatterList.stream().forEach(contractSubjectMatter -> {
+			Map<String, Object> item = new HashMap<>();
+			item.put("materialName", contractSubjectMatter.getMaterialName());
+			item.put("guige", contractSubjectMatter.getSpecification());
+			item.put("unit", contractSubjectMatter.getUnit());
+			item.put("quantity", contractSubjectMatter.getQuantity());
+			item.put("unitPrice", contractSubjectMatter.getUnitPrice());
+			item.put("price", contractSubjectMatter.getTotalAmount());
+			item.put("remarks", contractSubjectMatter.getRemarks());
+			items.add(item);
+		});
+		map.put("items", items);
+		//瀹氬埗鏂�
+		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+		map.put("companyName", customer.getRegisterName());
+		map.put("legalPerson", customer.getLegalPerson());
+		map.put("contactPhone", customer.getContactPhone());
+		map.put("bankName", customer.getBankName());
+		map.put("bankAccount", customer.getBankAccount());
+
+		//鎵挎徑鏂�
+		R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+		SysDept dept = r.getData();
+		map.put("orgName", dept.getOrgName());
+		map.put("legalPerson1", StrUtil.isNotEmpty(dept.getLegalPerson()) ? dept.getLegalPerson() : "");
+		map.put("entrustedAgent", StrUtil.isNotEmpty(dept.getLegalPerson()) ? "" : dept.getEntrustedAgent());
+		map.put("orgContact", dept.getOrgContact());
+		map.put("orgBank", dept.getOrgBank());
+		map.put("orgBankAccount", dept.getOrgBankAccount());
+
+		//鐢熸垚鏂囦欢鍚�
+		Long time = new Date().getTime();
+		// 鐢熸垚鐨剋ord鏍煎紡
+		String formatSuffix = ".docx";
+		// 鎷兼帴鍚庣殑鏂囦欢鍚�
+		String fileName = time + formatSuffix;//鏂囦欢鍚�  甯﹀悗缂�
+		//瀵煎嚭word
+		try {
+			// 1. 鍔犺浇妯$増
+			// 鍋囪妯$増鍦� resources/templates/template.docx
+			ClassPathResource resource = new ClassPathResource("template/smj/smjgypmmht.docx");
+			// 閰嶇疆鍒楄〃绛栫暐
+			Configure config = Configure.builder()
+					.bind("items", new LoopRowTableRenderPolicy()) // 灏� items 缁戝畾鍒拌寰幆绛栫暐
+					.build();
+			// 2. 缂栬瘧骞舵覆鏌撴暟鎹�
+			XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(), config).render(map);
+
+			// 3. 璁剧疆鍝嶅簲澶�
+			response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+			response.setCharacterEncoding("utf-8");
+			response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".docx");
+
+			// 4. 鍐欏叆杈撳嚭娴�
+			OutputStream out = response.getOutputStream();
+			xwpfTemplate.write(out);
+			out.flush();
+			out.close();
+			xwpfTemplate.close(); // 閲嶈锛氬叧闂ā鐗堥噴鏀捐祫婧�
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void exportContractJXCXSWord(Long id, HttpServletResponse response) {
+		Contract contract = baseMapper.selectById(id);
+		List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+				.eq(ContractSubjectMatter::getContractId, id).orderByAsc(ContractSubjectMatter::getCreateTime));
+		List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+				.eq(ContractPaymentSchedule::getContractId, id).orderByAsc(ContractPaymentSchedule::getCreateTime));
+		Map<String, Object> map = new HashMap<>();
+		//鍚堝悓鍩烘湰淇℃伅
+		map.put("partyA", contract.getPartyA());
+		map.put("partyB", contract.getPartyB());
+		map.put("contractNo", contract.getContractNo());
+		map.put("signPlace", contract.getSignPlace());
+		map.put("signDate", DateUtil.formatDate(contract.getSignDate()));
+		map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
+		map.put("total", contract.getAmount());
+		map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
+		//姝f枃
+		map.put("standard", contract.getStandard());
+		map.put("useMonth", contract.getUseMonth());
+		map.put("afterShipMonth", contract.getAfterShipMonth());
+		map.put("deliveryCycle", contract.getDeliveryCycle());
+		map.put("advancePayment", contract.getAdvancePayment()+"%");
+		map.put("inspectDay", contract.getInspectDay());
+		map.put("acceptDay", contract.getAcceptDay());
+		map.put("delayAcceptDay", contract.getDelayAcceptDay());
+		map.put("acceptPassDay", contract.getAcceptPassDay());
+		map.put("acceptPassAmount", contract.getAcceptPassAmount()+"%");
+		map.put("deliverDay", contract.getDeliverDay());
+		map.put("deliverCompleteDay", contract.getDeliverCompleteDay());
+		map.put("shipAddress", contract.getShipAddress());
+		map.put("htqdr", scheduleList.get(0).getAgreedDays());
+		map.put("htqdq", scheduleList.get(0).getPaymentRatio()+"%");
+		map.put("fhqq", scheduleList.get(1).getPaymentRatio()+"%");
+		map.put("dhhr", scheduleList.get(2).getAgreedDays());
+		map.put("dhhq", scheduleList.get(2).getPaymentRatio()+"%");
+		map.put("zbjq", scheduleList.get(4).getPaymentRatio()+"%");
+		map.put("zbqm", scheduleList.get(4).getAgreedDays());
+		map.put("paymentMethod", contract.getPaymentMethod());
+		map.put("invoiceNotice", contract.getInvoiceNotice());
+		map.put("supplierAgent", contract.getSupplierAgent());
+		map.put("supplierAgentIDCard", contract.getSupplierAgentIdCard());
+		map.put("buyerAgent", contract.getBuyerAgent());
+		map.put("buyerAgentIDCard", contract.getBuyerAgentIdCard());
+		map.put("agentAuthority", contract.getAgentAuthority());
+		map.put("delayPayAdvancePayment", contract.getDelayPayAdvancePayment()+"%");
+		map.put("delayPayAProcessPayment", contract.getDelayPayProcessPayment()+"%");
+		map.put("receiveAdvancePaymentMonth", contract.getReceiveAdvancePaymentMonth());
+		map.put("noticeSupplierAcceptDay", contract.getNoticeSupplierAcceptDay());
+		map.put("overdueDay", contract.getOverdueDay());
+		map.put("lossAmount", contract.getLossAmount()+"%");
+		map.put("liquidatedDamagesHighSupplier", contract.getLiquidatedDamagesHighSupplier()+"%");
+		map.put("overdueDayXf", contract.getOverdueDayXf());
+		map.put("lossAmountXf", contract.getLossAmountXf()+"%");
+		map.put("liquidatedDamagesHighBuyer", contract.getLiquidatedDamagesHighBuyer()+"%");
+		map.put("contractAttchment", contract.getContractAttchment());
+		map.put("totalParts", contract.getTotalParts());
+		map.put("supplierPart", contract.getSupplierPart());
+		map.put("buyerPart", contract.getBuyerPart());
+
+
+
+		//鏍囩殑鐗�
+		List<Map<String, Object>> items = new ArrayList<>();
+		subjectMatterList.stream().forEach(contractSubjectMatter -> {
+			Map<String, Object> item = new HashMap<>();
+			item.put("materialName", contractSubjectMatter.getMaterialName());
+			item.put("guige", contractSubjectMatter.getSpecification());
+			item.put("unit", contractSubjectMatter.getUnit());
+			item.put("quantity", contractSubjectMatter.getQuantity());
+			item.put("unitPrice", contractSubjectMatter.getUnitPrice());
+			item.put("price", contractSubjectMatter.getTotalAmount());
+			item.put("remarks", contractSubjectMatter.getRemarks());
+			items.add(item);
+		});
+		map.put("items", items);
+		//瀹氬埗鏂�
+		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+		map.put("companyName", customer.getRegisterName());
+		map.put("legalPerson", customer.getLegalPerson());
+		map.put("contactPhone", customer.getContactPhone());
+		map.put("bankName", customer.getBankName());
+		map.put("bankAccount", customer.getBankAccount());
+
+		//鎵挎徑鏂�
+		R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+		SysDept dept = r.getData();
+		map.put("orgName", dept.getOrgName());
+		map.put("legalPerson1", StrUtil.isNotEmpty(dept.getLegalPerson()) ? dept.getLegalPerson() : "");
+		map.put("entrustedAgent", StrUtil.isNotEmpty(dept.getLegalPerson()) ? "" : dept.getEntrustedAgent());
+		map.put("orgContact", dept.getOrgContact());
+		map.put("orgBank", dept.getOrgBank());
+		map.put("orgBankAccount", dept.getOrgBankAccount());
+
+		//鐢熸垚鏂囦欢鍚�
+		Long time = new Date().getTime();
+		// 鐢熸垚鐨剋ord鏍煎紡
+		String formatSuffix = ".docx";
+		// 鎷兼帴鍚庣殑鏂囦欢鍚�
+		String fileName = time + formatSuffix;//鏂囦欢鍚�  甯﹀悗缂�
+		//瀵煎嚭word
+		try {
+			// 1. 鍔犺浇妯$増
+			// 鍋囪妯$増鍦� resources/templates/template.docx
+			ClassPathResource resource = new ClassPathResource("template/jxc/jxcxsht.docx");
+			// 閰嶇疆鍒楄〃绛栫暐
+			Configure config = Configure.builder()
+					.bind("items", new LoopRowTableRenderPolicy()) // 灏� items 缁戝畾鍒拌寰幆绛栫暐
+					.build();
+			// 2. 缂栬瘧骞舵覆鏌撴暟鎹�
+			XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(), config).render(map);
+
+			// 3. 璁剧疆鍝嶅簲澶�
+			response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+			response.setCharacterEncoding("utf-8");
+			response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".docx");
+
+			// 4. 鍐欏叆杈撳嚭娴�
+			OutputStream out = response.getOutputStream();
+			xwpfTemplate.write(out);
+			out.flush();
+			out.close();
+			xwpfTemplate.close(); // 閲嶈锛氬叧闂ā鐗堥噴鏀捐祫婧�
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
 }

--
Gitblit v1.9.1