From c427840445fefb679a287dbeaba81bd417388aeb Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 04 九月 2026 17:10:44 +0800
Subject: [PATCH] feat:开票和bip推送分离 新增bip报账单 新增合同标的物变更
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 1509 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 867 insertions(+), 642 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 2f5997a..e348f89 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
@@ -11,25 +11,30 @@
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelReader;
+import com.alibaba.excel.read.metadata.ReadSheet;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.admin.api.entity.SysDept;
+import com.by4cloud.platformx.admin.api.entity.SysDictItem;
import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
+import com.by4cloud.platformx.admin.api.feign.RemoteDictService;
import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
import com.by4cloud.platformx.business.constant.FlowNameEnum;
import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
+import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
+import com.by4cloud.platformx.business.service.ContractPaymentScheduleService;
import com.by4cloud.platformx.business.service.ContractService;
+import com.by4cloud.platformx.business.utils.BatchInsertListener;
import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
import com.by4cloud.platformx.business.utils.NetworkFileToBase64;
-import com.by4cloud.platformx.business.vo.ContractDetailVo;
-import com.by4cloud.platformx.business.vo.ContractInvoiceVo;
-import com.by4cloud.platformx.business.vo.ContractSlipVo;
-import com.by4cloud.platformx.business.vo.FourAssociationPageVo;
+import com.by4cloud.platformx.business.vo.*;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.datascope.DataScope;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
@@ -45,6 +50,7 @@
import org.springframework.core.io.ClassPathResource;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.OutputStream;
@@ -84,6 +90,9 @@
private final ContractInvoiceMapper contractInvoiceMapper;
private final StringRedisTemplate redisTemplate;
private final ContractOutBoundMapper contractOutBoundMapper;
+ private final RemoteDictService remoteDictService;
+ private final ContractPaymentScheduleProcessService processService;
+ private final ContractSubjectMatterChangeMapper changeMapper;
@Value("${erp.ymj}")
private String ymjErp;
@@ -126,13 +135,14 @@
Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
contract.setPartyBId(SecurityUtils.getUser().getCompId());
contract.setPartyB(SecurityUtils.getUser().getCompName());
- if (StrUtil.isEmpty(addDTO.getPartyA())){
+ if (StrUtil.isEmpty(addDTO.getPartyA())) {
BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
- if (ObjUtil.isNotNull(bc)){
+ if (ObjUtil.isNotNull(bc)) {
contract.setPartyA(bc.getCompanyName());
}
- if (!StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)&&StrUtil.isEmpty(bc.getErpCompanyCode())){
- return R.failed("璇峰畬鍠勫鎴稥RP缂栫爜");
+ if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())
+ && StrUtil.isEmpty(bc.getCreditCode())) {
+ return R.failed("璇峰畬鍠勫鎴稥RP缂栫爜鎴栫粍缁囨満鏋勪唬鐮�");
}
}
@@ -141,17 +151,17 @@
contract.setBillingAmout(new BigDecimal("0"));
contract.setErpPushFlag("0");
contract.setNickName(SecurityUtils.getUser().getNickname());
- if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())){
- contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(),addDTO.getDeliveryCycle()));
+ if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
+ contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
}
- if (StrUtil.equals(addDTO.getContractCategory(), "water_house")){
- if(!addDTO.getContractSubjectMatter().stream().allMatch(item->StrUtil.equals(item.getMaterialCode(), "water_bill")||
- StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
+ if (StrUtil.equals(addDTO.getContractCategory(), "water_house")) {
+ if (!addDTO.getContractSubjectMatter().stream().allMatch(item -> StrUtil.equals(item.getMaterialCode(), "water_bill") ||
+ StrUtil.equals(item.getMaterialCode(), "house_rental") || StrUtil.equals(item.getMaterialCode(), "electricity_bill"))) {
return R.failed("璇锋柊澧炴按/鐢典唬缂存埧灞嬬璧佸悎鍚岋紒");
}
- }else {
- if(addDTO.getContractSubjectMatter().stream().anyMatch(item->StrUtil.equals(item.getMaterialCode(), "water_bill")||
- StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
+ } else {
+ if (addDTO.getContractSubjectMatter().stream().anyMatch(item -> StrUtil.equals(item.getMaterialCode(), "water_bill") ||
+ StrUtil.equals(item.getMaterialCode(), "house_rental") || StrUtil.equals(item.getMaterialCode(), "electricity_bill"))) {
return R.failed("姘寸數浠ｇ即銆佹埧灞嬬璧佷骇鍝佸彧鑳藉湪姘�/鐢典唬缂存埧灞嬬璧佸悎鍚岋紒");
}
// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
@@ -165,32 +175,32 @@
}
}
- if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())){
+ if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
return R.failed("鏍囩殑鐗╀笉鑳戒负绌�");
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
- StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
contract.setContractNo(generateSMJContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
contract.setContractNo(generateGYBContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
contract.setContractNo(generateYMJContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
contract.setContractNo(generateTFContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
contract.setContractNo(generateJXCContractNo());
}
- if (StrUtil.isNotEmpty(contract.getContractCategory())&&(StrUtil.equals(contract.getContractCategory(),"ymjjgcl")
- ||StrUtil.equals(contract.getContractCategory(),"ymjgypmm")||StrUtil.equals(contract.getContractCategory(),"ymjgkcpmm")
- ||StrUtil.equals(contract.getContractCategory(),"ymjcg")||StrUtil.equals(contract.getContractCategory(),"tfgsgypmm")
- ||StrUtil.equals(contract.getContractCategory(),"smjgypmm")||StrUtil.equals(contract.getContractCategory(),"jxcxsht"))
- ){
- contract.setContractName(contract.getContractName()+contract.getContractNo());
+ if (StrUtil.isNotEmpty(contract.getContractCategory()) && (StrUtil.equals(contract.getContractCategory(), "ymjjgcl")
+ || StrUtil.equals(contract.getContractCategory(), "ymjgypmm") || StrUtil.equals(contract.getContractCategory(), "ymjgkcpmm")
+ || StrUtil.equals(contract.getContractCategory(), "ymjcg") || StrUtil.equals(contract.getContractCategory(), "tfgsgypmm")
+ || StrUtil.equals(contract.getContractCategory(), "smjgypmm") || StrUtil.equals(contract.getContractCategory(), "jxcxsht"))
+ ) {
+ contract.setContractName(contract.getContractName() + contract.getContractNo());
}
baseMapper.insert(contract);
@@ -206,7 +216,7 @@
//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
- MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class,"id");
+ MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
record.setContractId(contract.getId());
record.setMatterId(subjectMatter.getId());
record.setContractName(contract.getContractName());
@@ -216,10 +226,10 @@
meterReadRecordMapper.insert(record);
}
if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "ymjcg")
- &&ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())&&ObjUtil.isNotNull(contract.getExpirationDate())
- &&DateUtil.compare(contract.getExpirationDate(),subjectMatter.getPlannedDeliveryDate())>0) {
- contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
- baseMapper.updateById(contract);
+ && ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate()) && ObjUtil.isNotNull(contract.getExpirationDate())
+ && DateUtil.compare(contract.getExpirationDate(), subjectMatter.getPlannedDeliveryDate()) > 0) {
+ contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
+ baseMapper.updateById(contract);
}
});
@@ -276,13 +286,13 @@
if (!StrUtil.equals(entity.getContractStatus() + "", "0")) {
return R.failed("褰撳墠鐘舵�佹棤娉曚慨鏀瑰悎鍚�");
}
- if (StrUtil.isEmpty(updateDTO.getPartyA())){
+ if (StrUtil.isEmpty(updateDTO.getPartyA())) {
BusinessCustomer bc = businessCustomerMapper.selectById(updateDTO.getPartyAId());
- if (ObjUtil.isNotNull(bc)){
+ if (ObjUtil.isNotNull(bc)) {
updateDTO.setPartyA(bc.getCompanyName());
}
- if (StrUtil.isEmpty(bc.getErpCompanyCode())||StrUtil.isEmpty(bc.getRegisterName())||
- StrUtil.isEmpty(bc.getBankName())||StrUtil.isEmpty(bc.getBankAccount())){
+ if (StrUtil.isEmpty(bc.getErpCompanyCode()) || StrUtil.isEmpty(bc.getRegisterName()) ||
+ StrUtil.isEmpty(bc.getBankName()) || StrUtil.isEmpty(bc.getBankAccount())) {
return R.failed("璇峰畬鍠勬敼瀹㈡埛鏁版嵁鍚庡啀娣诲姞鍚堝悓");
}
}
@@ -293,33 +303,33 @@
contract.setPaidAmount(new BigDecimal("0"));
contract.setBillingAmout(new BigDecimal("0"));
contract.setNickName(SecurityUtils.getUser().getNickname());
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
- StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
contract.setContractNo(generateSMJContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
contract.setContractNo(generateGYBContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
contract.setContractNo(generateYMJContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
contract.setContractNo(generateTFContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
contract.setContractNo(generateJXCContractNo());
}
- if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())){
- contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(),updateDTO.getDeliveryCycle()));
+ if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())) {
+ contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(), updateDTO.getDeliveryCycle()));
}
- if (StrUtil.equals(updateDTO.getContractCategory(), "water_house")){
- if(!updateDTO.getContractSubjectMatter().stream().allMatch(item->StrUtil.equals(item.getMaterialCode(), "water_bill")||
- StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
+ if (StrUtil.equals(updateDTO.getContractCategory(), "water_house")) {
+ if (!updateDTO.getContractSubjectMatter().stream().allMatch(item -> StrUtil.equals(item.getMaterialCode(), "water_bill") ||
+ StrUtil.equals(item.getMaterialCode(), "house_rental") || StrUtil.equals(item.getMaterialCode(), "electricity_bill"))) {
return R.failed("璇锋柊澧炴按/鐢典唬缂存埧灞嬬璧佸悎鍚岋紒");
}
- }else {
- if(updateDTO.getContractSubjectMatter().stream().anyMatch(item->StrUtil.equals(item.getMaterialCode(), " ")||
- StrUtil.equals(item.getMaterialCode(), "house_rental")||StrUtil.equals(item.getMaterialCode(), "electricity_bill"))){
+ } else {
+ if (updateDTO.getContractSubjectMatter().stream().anyMatch(item -> StrUtil.equals(item.getMaterialCode(), " ") ||
+ StrUtil.equals(item.getMaterialCode(), "house_rental") || StrUtil.equals(item.getMaterialCode(), "electricity_bill"))) {
return R.failed("姘寸數浠ｇ即銆佹埧灞嬬璧佷骇鍝佸彧鑳藉湪姘�/鐢典唬缂存埧灞嬬璧佸悎鍚岋紒");
}
// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
@@ -350,7 +360,7 @@
if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
meterReadRecordMapper.delete(Wrappers.<MeterReadRecord>lambdaQuery().eq(MeterReadRecord::getContractId, contract.getId()));
- MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class,"id");
+ MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
record.setContractId(contract.getId());
record.setMatterId(subjectMatter.getId());
record.setContractName(contract.getContractName());
@@ -407,28 +417,54 @@
List<ContractPaymentSchedule> paymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
detailVo.setContractPaymentSchedule(paymentScheduleList);
BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
- if (ObjUtil.isNotNull(a)){
+ if (ObjUtil.isNotNull(a)) {
detailVo.setPartyAOrgCode(a.getCreditCode());
}
List<ContractOutBound> outBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
- .eq(ContractOutBound::getContractId,id).orderByAsc(ContractOutBound::getOutBoundTime));
- if (CollUtil.isNotEmpty(outBoundList)){
+ .eq(ContractOutBound::getContractId, id).orderByAsc(ContractOutBound::getOutBoundTime));
+ if (CollUtil.isNotEmpty(outBoundList)) {
detailVo.setContractOutBound(outBoundList);
}
List<ContractInvoice> invoiceList = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
- .eq(ContractInvoice::getContractId,id).orderByAsc(ContractInvoice::getCreateTime));
- if (CollUtil.isNotEmpty(invoiceList)){
+ .eq(ContractInvoice::getContractId, id).orderByAsc(ContractInvoice::getCreateTime));
+ if (CollUtil.isNotEmpty(invoiceList)) {
detailVo.setContractInvoice(invoiceList);
}
List<PaymentSlip> slipList = paymentSlipMapper.selectList(Wrappers.<PaymentSlip>lambdaQuery()
- .eq(PaymentSlip::getContractId,id).orderByAsc(PaymentSlip::getPaymentTime));
- if (CollUtil.isNotEmpty(slipList)){
+ .eq(PaymentSlip::getContractId, id).orderByAsc(PaymentSlip::getPaymentTime));
+ if (CollUtil.isNotEmpty(slipList)) {
detailVo.setPaymentSlip(slipList);
}
BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
- if (ObjUtil.isNotNull(customer)){
- detailVo.setInvoiceType(customer.getInvoiceType());
+
+ ContractInvoiceBipVo bipVo = new ContractInvoiceBipVo();
+ bipVo.setDjrq(DateUtil.today());
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ if (r.isOk()) {
+ bipVo.setKpzz(r.getData().getBipCode());
}
+
+ if (ObjUtil.isNotNull(customer)) {
+ detailVo.setInvoiceType(customer.getInvoiceType());
+ bipVo.setYwzz(r.getData().getBipCode());
+ }
+ R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
+ if (rDept.isOk()) {
+ bipVo.setBm(rDept.getData().getOrgCode());
+ bipVo.setHsdy(rDept.getData().getOrgCode());
+ }
+ bipVo.setYwy(SecurityUtils.getUser().getNickname());
+ bipVo.setPzzdr(SecurityUtils.getUser().getNickname());
+ bipVo.setJylx("ZBYXGLXT");
+ bipVo.setWldxlx("1");
+ bipVo.setKh(customer.getCreditCode());
+ bipVo.setBz("浜烘皯甯�");
+ bipVo.setFjzs("1");
+ bipVo.setSfzy("鏄�");
+ bipVo.setSfnbwl("鏄�");
+ bipVo.setSfjyjs("鍚�");
+ bipVo.setDjfx("1");
+ detailVo.setBipVo(bipVo);
return detailVo;
}
@@ -437,7 +473,7 @@
Contract contract = baseMapper.selectById(id);
//绠�鏄撳悎鍚屾棤娉曠户缁悗缁搷浣�
- if (StrUtil.equals(contract.getContractCategory(), "simple")){
+ if (StrUtil.equals(contract.getContractCategory(), "simple")) {
return R.failed("璇疯ˉ鍏呮爣鐨勭墿鍜屾敹娆鹃樁娈靛悗鍐嶈繘琛屾搷浣滐紒");
}
@@ -459,375 +495,56 @@
Contract contract = baseMapper.selectById(id);
contract.setContractStatus(2);
baseMapper.updateById(contract);
-
-
+ //姘寸數鎴跨 鎵ц鏃�
List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
- .eq(ContractSubjectMatter::getContractId,id));
+ .eq(ContractSubjectMatter::getContractId, id));
if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
- if (CollUtil.isNotEmpty(subjectMatterList)) {
- for (ContractSubjectMatter contractSubjectMatter: subjectMatterList) {
- if (StrUtil.equals(contract.getExecFrequency(), "1")) {
- Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfWeek(contract.getEffectiveDate()),
- DateUtil.endOfWeek(contract.getExpirationDate()), true)+1;
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
- for (int i = 0; i < weeksTrue.intValue(); i++) {
- Date execDatei = DateUtil.offsetWeek(execDate0, i);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
- contractExecDateMapper.insert(execDate);
- }
- }
- }
- if (StrUtil.equals(contract.getExecFrequency(), "2")) {
- Long weeksTrue = DateUtil.betweenMonth(DateUtil.beginOfMonth(contract.getEffectiveDate()),
- DateUtil.endOfMonth(contract.getExpirationDate()), true)+1;
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfMonth(contract.getEffectiveDate()), contract.getExecDay());
- for (int i = 0; i < weeksTrue.intValue(); i++) {
- Date execDatei = DateUtil.offsetMonth(execDate0, i);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
- contractExecDateMapper.insert(execDate);
- }
- }
- }
- if (StrUtil.equals(contract.getExecFrequency(), "3")) {
- Long weeksTrue = (DateUtil.betweenMonth(DateUtil.beginOfQuarter(contract.getEffectiveDate()),
- DateUtil.endOfQuarter(contract.getExpirationDate()), true)+1)/3;
-
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfQuarter(contract.getEffectiveDate()), contract.getExecDay());
- for (int i = 0; i < weeksTrue.intValue(); i++) {
- Date execDatei = DateUtil.offsetMonth(execDate0, i*3);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
- contractExecDateMapper.insert(execDate);
- }
- }
- }
- if (StrUtil.equals(contract.getExecFrequency(), "4")) {
- Date startDate = contract.getEffectiveDate();
- Date endDate = contract.getExpirationDate();
- Integer startMonth = DateUtil.month(contract.getEffectiveDate());
- Integer endMonth = DateUtil.month(contract.getExpirationDate());
- if (1<=startMonth&&startMonth<=6){
- startDate = DateUtil.beginOfYear(startDate);
- }
- if (7<=startMonth&&startMonth<=12){
- startDate = DateUtil.offsetMonth(DateUtil.beginOfYear(startDate),6);
- }
- if (1<=endMonth&&endMonth<=6){
- endDate = DateUtil.offsetMonth(DateUtil.endOfYear(endDate),-6);
- }
- if (7<=endMonth&&endMonth<=12){
- endDate = DateUtil.endOfYear(endDate);
- }
- Long weeksTrue = (DateUtil.betweenMonth(startDate,endDate, true)+1)/6;
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(startDate, contract.getExecDay());
- for (int i = 0; i < weeksTrue.intValue(); i++) {
- Date execDatei = DateUtil.offsetMonth(execDate0, i*6);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
- contractExecDateMapper.insert(execDate);
- }
- }
- }
- if (StrUtil.equals(contract.getExecFrequency(), "5")) {
- Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfYear(contract.getEffectiveDate()),
- DateUtil.endOfYear(contract.getExpirationDate()), true)+1;
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfYear(contract.getEffectiveDate()), contract.getExecDay());
- for (int i = 0; i < weeksTrue.intValue(); i++) {
- Date execDatei = DateUtil.offsetWeek(execDate0, i);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- if (DateUtil.isIn(execDatei,contract.getEffectiveDate(),contract.getExpirationDate())) {
- contractExecDateMapper.insert(execDate);
- }
- }
- }
-
- }
- }
- } else {
- ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId())
- .orderByAsc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
- if (fitstSchedule.getStageName().equals("鍚堝悓绛捐")) {
- //鏂板搴旀敹
- savePaymentConfirm(contract, fitstSchedule);
-
- //鏂板鍚堝悓灞ョ害璁板綍
- ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
- process.setContractId(contract.getId());
- process.setContractName(contract.getContractName());
- process.setScheduleId(fitstSchedule.getId());
- process.setScheduleName(fitstSchedule.getStageName());
- process.setProcessDate(contract.getSignDate());
- contractPaymentScheduleProcessMapper.insert(process);
-// //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
-// PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
-// .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-// if (ObjUtil.isNotNull(newConfirm)&&newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
-// //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
-// contract.setContractStatus(3);
-// baseMapper.updateById(contract);
-// }
- } else if (fitstSchedule.getStageName().equals("鍙戣揣鍓�")) {
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName("鏃�");
- baseMapper.updateById(contract);
- } else if (fitstSchedule.getStageName().equals("璐у埌绛炬敹")) {
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName("璐у埌绛炬敹");
- baseMapper.updateById(contract);
- } else if (fitstSchedule.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName("璋冭瘯瀹屾垚鎴栭獙鏀�");
- baseMapper.updateById(contract);
- } else {
- //鏂板搴旀敹
- savePaymentConfirm(contract, fitstSchedule);
- }
- //鏌ヨ鏄惁鏈夊悗缁樁娈�
- List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId, fitstSchedule.getContractId())
- .gt(ContractPaymentSchedule::getStageOrder, fitstSchedule.getStageOrder())
- .orderByAsc(ContractPaymentSchedule::getCreateTime));
- if (ArrayUtil.isNotEmpty(afterSchedule) && afterSchedule.size() == 1) {
- //鏈�鍚庨樁娈电敓鏁堟椂闂�
- ContractPaymentSchedule endSchedule = afterSchedule.get(0);
- if (StrUtil.equals(endSchedule.getStageName(), "璐ㄤ繚閲�")) {
-// endSchedule.setEffectiveEndDate(DateUtil.offsetDay(new Date(),endSchedule.getAgreedDays()));
-// contractPaymentScheduleMapper.updateById(endSchedule);
- //鏈�鍚庨樁娈靛簲鏀�
- PaymentConfirm newConfim = new PaymentConfirm();
- newConfim.setBusinessType(endSchedule.getStageName() + "搴旀敹");
- newConfim.setBusGuestId(contract.getPartyAId());
- newConfim.setBusGuestName(contract.getPartyA());
- newConfim.setContractId(contract.getId());
- newConfim.setContractName(contract.getContractName());
- newConfim.setContractNo(contract.getContractNo());
- newConfim.setScheduleId(endSchedule.getId());
- newConfim.setScheduleName(endSchedule.getStageName());
- newConfim.setConfirmTime(new Date());
- newConfim.setTransationAmount(endSchedule.getPlannedAmount());
- newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- BigDecimal lastNewTotal = new BigDecimal("0");
- if (ObjUtil.isNotNull(lastNewConfirm)) {
- lastNewTotal = lastNewConfirm.getTotalAmount();
- }
- newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
- if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
- paymentConfirmMapper.insert(newConfim);
- }
- }
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName(endSchedule.getStageName());
- baseMapper.updateById(contract);
- }
- if (ArrayUtil.isNotEmpty(afterSchedule) && afterSchedule.size() > 1) {
- //绗竴闃舵鐢熸晥鏃堕棿
-// fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
-// contractPaymentScheduleMapper.updateById(fitstSchedule);
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName(afterSchedule.get(0).getStageName());
- baseMapper.updateById(contract);
- }
- //鍙湁褰撳墠鍚堝悓绛惧瓧闃舵
-// if(ArrayUtil.isEmpty(afterSchedule)){
-// fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
-// contractPaymentScheduleMapper.updateById(fitstSchedule);
-// }
+ handleWaterHouseCycle(contract,subjectMatterList);
+ return;
}
- //erp鎺ㄩ��
- new Thread(()->{
- try {
- Thread.sleep(500);
- JSONObject request = new JSONObject();
- BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
- request.put("contractNo",contract.getContractNo());
- request.put("partyA",contract.getPartyA());
- request.put("partyACode",customer.getErpCompanyCode());
- if (StrUtil.equals(contract.getPartyBId()+"",ymj)&&StrUtil.isNotEmpty(ymjErp)){
- request.put("customerCode",customer.getErpCompanyCode());
- request.put("currencyId","RMB");
- request.put("signDate",DateUtil.format(contract.getSignDate(),DatePattern.NORM_DATETIME_PATTERN));
- request.put("dateDeliver",DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
- request.put("moneySum",contract.getAmount());
- request.put("signManner","闈㈢");
- request.put("salesman","");
- if (ArrayUtil.isNotEmpty(subjectMatterList)){
- JSONArray subjectMatter = new JSONArray();
- subjectMatterList.stream().forEach(contractSubjectMatter -> {
- JSONObject subjectMatterItem = new JSONObject();
- subjectMatterItem.put("itemNo",contractSubjectMatter.getMaterialCode());
- subjectMatterItem.put("salePrice",contractSubjectMatter.getUnitPrice());
- subjectMatterItem.put("qtyRequired",contractSubjectMatter.getQuantity());
- subjectMatterItem.put("money",contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
- Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId,contract.getCompId())
- .eq(Product::getErpCode,contractSubjectMatter.getMaterialCode()));
- if (ObjUtil.isNotNull(product)){
- subjectMatterItem.put("taxRate",new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
- }
- subjectMatterItem.put("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);
- }
+ //璧勯噾鏄庣粏
+ savePaymentConfirm(contract);
- 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);
- }
+ //鍚堝悓鎺ㄩ�佸瓙鍏徃
+ pushSubCompany(contract,subjectMatterList);
- }
- if ((StrUtil.equals(contract.getPartyBId()+"",smj)||StrUtil.equals(contract.getPartyBId()+"",smjsc)||
- StrUtil.equals(contract.getPartyBId()+"",smjzt))&&StrUtil.isNotEmpty(smjErp)){
- request.put("customerCode",customer.getErpCompanyCode());
- request.put("currencyId","RMB");
- request.put("signDate",DateUtil.format(contract.getSignDate(),DatePattern.NORM_DATETIME_PATTERN));
- request.put("dateDeliver",DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
- request.put("moneySum",contract.getAmount());
- request.put("signManner","闈㈢");
- request.put("salesman","");
- if (ArrayUtil.isNotEmpty(subjectMatterList)){
- JSONArray subjectMatter = new JSONArray();
- subjectMatterList.stream().forEach(contractSubjectMatter -> {
- JSONObject subjectMatterItem = new JSONObject();
- subjectMatterItem.put("itemNo",contractSubjectMatter.getMaterialCode());
- subjectMatterItem.put("salePrice",contractSubjectMatter.getUnitPrice());
- subjectMatterItem.put("qtyRequired",contractSubjectMatter.getQuantity());
- subjectMatterItem.put("money",contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
- Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId,contract.getCompId())
- .eq(Product::getErpCode,contractSubjectMatter.getMaterialCode()));
- if (ObjUtil.isNotNull(product)){
- subjectMatterItem.put("taxRate",new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
- }
- subjectMatterItem.put("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);
- }
-
- JSONObject loginJson = new JSONObject();
- loginJson.put("username","admin");
- loginJson.put("password","Zimafold@2026");
- log.info("鐭崇叅鏈哄悎鍚屾帹閫佽幏鍙杢oken鍏ュ弬锛歿}",loginJson.toJSONString());
- String loginResp = HttpUtil.post(smjErp+"/api/account/v1/login",loginJson.toJSONString());
- log.info("鐭崇叅鏈哄悎鍚屾帹閫佽幏鍙杢oken鍥炲弬锛歿}",loginResp);
- JSONObject respJson = JSONObject.parseObject(loginResp);
- if (respJson.getInteger("code")==0){
- JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
- log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}",request.toJSONString());
- HttpResponse response = HttpRequest.post(smjErp+"/api/contract/v1/createWithDetails")
- .header("token", dataJson.getString("token")) // 娣诲姞璁よ瘉澶�
- .header("Content-Type", "application/json") // 璁剧疆鍐呭绫诲瀷
- .body(request.toJSONString()) // 璁剧疆璇锋眰浣�
- .execute(); // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
- log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}",response.body());
- //淇濆瓨璇锋眰璁板綍
- saveErpRequestRecord("smj",request.toJSONString(),response.body());
- //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
- contract.setErpPushFlag("1");
- baseMapper.updateById(contract);
- }
- }
-
- if (StrUtil.equals(contract.getPartyBId()+"",jxc)&&StrUtil.isNotEmpty(jxcErp)){
- log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}",request.toJSONString());
- String result = HttpUtil.post(jxcErp,request.toJSONString());
- log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍥炲弬锛歿}",result);
- //淇濆瓨璇锋眰璁板綍
- saveErpRequestRecord("jxc",request.toJSONString(),result);
- //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
- contract.setErpPushFlag("1");
- baseMapper.updateById(contract);
- }
- if (StrUtil.equals(contract.getPartyBId()+"",tfgs)&&StrUtil.isNotEmpty(tfgsErp)){
- //閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
- }
- if (StrUtil.equals(contract.getPartyBId()+"",sgb)&&StrUtil.isNotEmpty(sgbErp)){
- //鐭冲伐娉典富鍔ㄦ帹閫佺郴缁�
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }).start();
//鍚堝悓涓績鎺ㄩ��
- new Thread(()->{
+ pusnContractCenter(contract,subjectMatterList);
+
+ contract.setNextScheduleName("鍙戣揣鍓�");
+ baseMapper.updateById(contract);
+ }
+
+ private void pusnContractCenter(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
+ new Thread(() -> {
try {
JSONObject requestApply = new JSONObject();
- requestApply.put("fd_selectionmethod","鍏紑鎷涙爣");
- requestApply.put("fd_isrelated","鏄�");
- requestApply.put("fd_bizId",contract.getId());
- requestApply.put("fd_remark",contract.getRemark());
- requestApply.put("fd_MainContent","");
- requestApply.put("fd_settlementType","00");
- requestApply.put("fd_applyType","澶栭攢");
- requestApply.put("fd_contractsubject ",subjectMatterList.stream().map(item->item.getMaterialName()).collect(Collectors.joining(",")));
- requestApply.put("fd_docNumber",contract.getContractNo());
- requestApply.put("fd_templateId","19e39bb6c1edadbdb162c434274a8a18");
- requestApply.put("fd_name",contract.getContractName());
- requestApply.put("fd_signDate",DateUtil.formatDate(contract.getSignDate()));
- requestApply.put("fd_endDate",DateUtil.formatDate(contract.getExpirationDate()));
- requestApply.put("fd_contractCreater",contract.getNickName());
- requestApply.put("fd_currency","浜烘皯甯�");
- requestApply.put("fd_ContractAmount",contract.getAmount());
- requestApply.put("fd_finAmount",contract.getAmount().divide(new BigDecimal("113"),2,RoundingMode.HALF_UP)
+ requestApply.put("fd_selectionmethod", "鍏紑鎷涙爣");
+ requestApply.put("fd_isrelated", "鏄�");
+ requestApply.put("fd_bizId", contract.getId());
+ requestApply.put("fd_remark", contract.getRemark());
+ requestApply.put("fd_MainContent", "");
+ requestApply.put("fd_settlementType", "00");
+ requestApply.put("fd_applyType", "澶栭攢");
+ requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
+ requestApply.put("fd_docNumber", contract.getContractNo());
+ requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
+ requestApply.put("fd_name", contract.getContractName());
+ requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
+ requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
+ requestApply.put("fd_contractCreater", contract.getNickName());
+ requestApply.put("fd_currency", "浜烘皯甯�");
+ requestApply.put("fd_ContractAmount", contract.getAmount());
+ requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
.multiply(new BigDecimal("87")));
- requestApply.put("fd_docStatus","20");
- requestApply.put("fd_taxRates",13);
- requestApply.put("fd_customerName",contract.getPartyA());
- requestApply.put("fd_systemSource","闈炵叅閿�鍞郴缁�");
- requestApply.put("fd_type","00");
- log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}",requestApply.toJSONString());
- String respApply = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply",requestApply.toJSONString());
- log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍥炲弬锛歿}",respApply);
+ requestApply.put("fd_docStatus", "20");
+ requestApply.put("fd_taxRates", 13);
+ requestApply.put("fd_customerName", contract.getPartyA());
+ requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
+ requestApply.put("fd_type", "00");
+ log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
+ String respApply = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
+ log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍥炲弬锛歿}", respApply);
JSONObject applyResp = JSONObject.parseObject(respApply);
if (applyResp.getString("code").equals("00")) {
JSONObject request = new JSONObject();
@@ -861,6 +578,266 @@
}).start();
}
+ private void pushSubCompany(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
+ //erp鎺ㄩ��
+ new Thread(() -> {
+ try {
+ Thread.sleep(500);
+ JSONObject request = new JSONObject();
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ request.put("contractNo", contract.getContractNo());
+ request.put("partyA", contract.getPartyA());
+ request.put("partyACode", customer.getErpCompanyCode());
+ if (StrUtil.equals(contract.getPartyBId() + "", ymj) && StrUtil.isNotEmpty(ymjErp)) {
+ request.put("customerCode", customer.getErpCompanyCode());
+ request.put("currencyId", "RMB");
+ request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("moneySum", contract.getAmount());
+ request.put("signManner", "闈㈢");
+ request.put("salesman", "");
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
+ JSONArray subjectMatter = new JSONArray();
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ JSONObject subjectMatterItem = new JSONObject();
+ subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
+ subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
+ subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
+ subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
+ .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
+ if (ObjUtil.isNotNull(product)) {
+ subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
+ }
+ subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
+ DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
+ DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ subjectMatter.add(subjectMatterItem);
+ });
+ request.put("details", subjectMatter);
+ }
+
+ 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.equals(contract.getPartyBId() + "", smjsc) ||
+ StrUtil.equals(contract.getPartyBId() + "", smjzt)) && StrUtil.isNotEmpty(smjErp)) {
+ request.put("customerCode", customer.getErpCompanyCode());
+ request.put("currencyId", "RMB");
+ request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("moneySum", contract.getAmount());
+ request.put("signManner", "闈㈢");
+ request.put("salesman", "");
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
+ JSONArray subjectMatter = new JSONArray();
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ JSONObject subjectMatterItem = new JSONObject();
+ subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
+ subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
+ subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
+ subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
+ .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
+ if (ObjUtil.isNotNull(product)) {
+ subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
+ }
+ subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
+ DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
+ DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ subjectMatter.add(subjectMatterItem);
+ });
+ request.put("details", subjectMatter);
+ }
+
+ JSONObject loginJson = new JSONObject();
+ loginJson.put("username", "admin");
+ loginJson.put("password", "Zimafold@2026");
+ log.info("鐭崇叅鏈哄悎鍚屾帹閫佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
+ String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
+ log.info("鐭崇叅鏈哄悎鍚屾帹閫佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
+ JSONObject respJson = JSONObject.parseObject(loginResp);
+ if (respJson.getInteger("code") == 0) {
+ JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
+ log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
+ HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails")
+ .header("token", dataJson.getString("token")) // 娣诲姞璁よ瘉澶�
+ .header("Content-Type", "application/json") // 璁剧疆鍐呭绫诲瀷
+ .body(request.toJSONString()) // 璁剧疆璇锋眰浣�
+ .execute(); // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+ log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}", response.body());
+ //淇濆瓨璇锋眰璁板綍
+ saveErpRequestRecord("smj", request.toJSONString(), response.body());
+ //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+ contract.setErpPushFlag("1");
+ baseMapper.updateById(contract);
+ }
+ }
+
+ if (StrUtil.equals(contract.getPartyBId() + "", jxc) && StrUtil.isNotEmpty(jxcErp)) {
+ log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
+ String result = HttpUtil.post(jxcErp, request.toJSONString());
+ log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍥炲弬锛歿}", result);
+ //淇濆瓨璇锋眰璁板綍
+ saveErpRequestRecord("jxc", request.toJSONString(), result);
+ //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+ contract.setErpPushFlag("1");
+ baseMapper.updateById(contract);
+ }
+ if (StrUtil.equals(contract.getPartyBId() + "", tfgs) && StrUtil.isNotEmpty(tfgsErp)) {
+ //閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
+ }
+ if (StrUtil.equals(contract.getPartyBId() + "", sgb) && StrUtil.isNotEmpty(sgbErp)) {
+ //鐭冲伐娉典富鍔ㄦ帹閫佺郴缁�
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }).start();
+
+ }
+
+ private void saveScheduleProcess(Contract contract,ContractPaymentSchedule schedule) {
+ //鏂板鍚堝悓灞ョ害璁板綍
+ ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
+ process.setContractId(contract.getId());
+ process.setContractName(contract.getContractName());
+ process.setScheduleId(schedule.getId());
+ process.setScheduleName(schedule.getStageName());
+ process.setProcessDate(contract.getSignDate());
+ contractPaymentScheduleProcessMapper.insert(process);
+ }
+
+ private void handleWaterHouseCycle(Contract contract, List<ContractSubjectMatter> subjectMatterList) {
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
+ for (ContractSubjectMatter contractSubjectMatter : subjectMatterList) {
+ if (StrUtil.equals(contract.getExecFrequency(), "1")) {
+ Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfWeek(contract.getEffectiveDate()),
+ DateUtil.endOfWeek(contract.getExpirationDate()), true) + 1;
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
+ Date execDatei = DateUtil.offsetWeek(execDate0, i);
+ ContractExecDate execDate = new ContractExecDate();
+ execDate.setContractId(contract.getId());
+ execDate.setMatterId(contractSubjectMatter.getId());
+ execDate.setExecDate(execDatei);
+ execDate.setGenFlag("0");
+ if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
+ }
+ }
+ 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);
+ }
+ }
+ }
+
+ }
+ }
+ }
+
private void saveErpRequestRecord(String ymj, String toJSONString, String result) {
ErpRequestRecord record = new ErpRequestRecord();
record.setErpName(ymj);
@@ -869,80 +846,44 @@
erpRequestRecordMapper.insert(record);
}
- private void savePaymentConfirm(Contract contract, ContractPaymentSchedule schedule) {
- PaymentConfirm paymentConfirm = new PaymentConfirm();
- paymentConfirm.setBusinessType(schedule.getStageName() + "搴旀敹");
- paymentConfirm.setBusGuestId(contract.getPartyAId());
- paymentConfirm.setBusGuestName(contract.getPartyA());
- paymentConfirm.setContractId(contract.getId());
- paymentConfirm.setContractName(contract.getContractName());
- paymentConfirm.setContractNo(contract.getContractNo());
- paymentConfirm.setScheduleId(schedule.getId());
- paymentConfirm.setScheduleName(schedule.getStageName());
- paymentConfirm.setConfirmTime(new Date());
- paymentConfirm.setTransationAmount(schedule.getPlannedAmount());
- paymentConfirm.setReceivableAmount(schedule.getPlannedAmount());
- paymentConfirm.setTotalAmount(schedule.getPlannedAmount().multiply(new BigDecimal("-1")));
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- BigDecimal lastNewTotal = new BigDecimal("0");
- if (ObjUtil.isNotNull(lastNewConfirm)) {
- lastNewTotal = lastNewConfirm.getTotalAmount();
- }
- paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
- if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
- paymentConfirmMapper.insert(paymentConfirm);
- }
- //瀹㈡埛浠樻瀹屾垚鍚堝悓
- List<Contract> customerCompleteContractList = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
- .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
- if (ArrayUtil.isNotEmpty(customerCompleteContractList)) {
- List<BigDecimal> outAmountList = new ArrayList<>();
- for (Contract completeContract : customerCompleteContractList
- ) {
- PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, completeContract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- //鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
- if (ObjUtil.isNotNull(contractLastConfirm)&&contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
- //鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
- PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm, PaymentConfirm.class, "id", "transationAmount",
- "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
- outConfirm.setBusinessType("璧勯噾杞嚭");
- outConfirm.setConfirmTime(new Date());
- outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
- outConfirm.setTotalAmount(new BigDecimal("0"));
- paymentConfirmMapper.insert(outConfirm);
- outAmountList.add(outConfirm.getTransationAmount());
+ private void savePaymentConfirm(Contract contract) {
+ ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, contract.getId())
+ .eq(ContractPaymentSchedule::getStageName,"鍚堝悓绛捐")
+ .last("limit 1"));
+ fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
+ contractPaymentScheduleMapper.updateById(fitstSchedule);
+ //鎶ラ敊灞ョ害璁板綍
+ saveScheduleProcess(contract,fitstSchedule);
+ //淇濆瓨璧勯噾鏄庣粏
+ if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ //鏂板搴旀敹
+ PaymentConfirm currentConfim = new PaymentConfirm();
+ currentConfim.setBusinessType(fitstSchedule.getStageName() + "搴旀敹");
+ currentConfim.setBusGuestId(contract.getPartyAId());
+ currentConfim.setBusGuestName(contract.getPartyA());
+ currentConfim.setContractId(contract.getId());
+ currentConfim.setContractName(contract.getContractName());
+ currentConfim.setContractNo(contract.getContractNo());
+ currentConfim.setScheduleId(fitstSchedule.getId());
+ currentConfim.setScheduleName(fitstSchedule.getStageName());
+ currentConfim.setConfirmTime(contract.getSignDate());
+ currentConfim.setTransationAmount(fitstSchedule.getPlannedAmount());
+ currentConfim.setReceivableAmount(fitstSchedule.getPlannedAmount());
+ PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ if (ObjUtil.isNotNull(lastConfirm)) {
+ currentConfim.setTotalAmount(lastConfirm.getTotalAmount().subtract(currentConfim.getTransationAmount()));
+ if (contract.getContractNo().startsWith("ZB-")) {
+ paymentConfirmMapper.insert(currentConfim);
}
+ return;
}
- if (ArrayUtil.isNotEmpty(outAmountList)) {
- BigDecimal currentInSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
- //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
- PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, PaymentConfirm.class, "id", "transationAmount",
- "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
- inConfirm.setBusinessType("璧勯噾杞叆");
- inConfirm.setConfirmTime(new Date());
- inConfirm.setTransationAmount(currentInSum);
- inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentInSum));
- //鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
- schedule.setActualAmount(inConfirm.getTransationAmount());
- schedule.setPaymentStatus(2);
- if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
- inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
- } else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
- inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
- schedule.setActualAmount(currentInSum);
- schedule.setPaymentStatus(1);
- }
- paymentConfirmMapper.insert(inConfirm);
- //鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
- contractPaymentScheduleMapper.updateById(schedule);
- }
-
-
- } else {
- paymentConfirmMapper.insert(paymentConfirm);
+ currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
+ paymentConfirmMapper.insert(currentConfim);
+ processService.handleBeforeRemain(currentConfim,contract);
}
+
}
@Override
@@ -951,7 +892,7 @@
.lt(ContractPaymentSchedule::getEffectiveEndDate, DateUtil.today())
.ne(ContractPaymentSchedule::getPaymentStatus, "2")
.ne(ContractPaymentSchedule::getPaymentStatus, 3));
- if (ArrayUtil.isNotEmpty(scheduleList)) {
+ if (CollUtil.isNotEmpty(scheduleList)) {
scheduleList.stream().forEach(contractPaymentSchedule -> {
Contract contract = baseMapper.selectById(contractPaymentSchedule.getContractId());
if (ObjUtil.isNotNull(contract)) {
@@ -1030,20 +971,20 @@
newContract.setErpPushFlag("0");
newContract.setContractStatus(0);
newContract.setBillingAmout(new BigDecimal("0"));
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
- StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
newContract.setContractNo(generateSMJContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
newContract.setContractNo(generateGYBContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
newContract.setContractNo(generateYMJContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
newContract.setContractNo(generateTFContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
newContract.setContractNo(generateJXCContractNo());
}
baseMapper.insert(newContract);
@@ -1158,8 +1099,8 @@
@Override
public R genCycleReceiced() {
List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
- .le(ContractExecDate::getExecDate, DateUtil.today()).eq(ContractExecDate::getGenFlag,"0"));
- if (ArrayUtil.isNotEmpty(execDateList)) {
+ .le(ContractExecDate::getExecDate, DateUtil.today()).eq(ContractExecDate::getGenFlag, "0"));
+ if (CollUtil.isNotEmpty(execDateList)) {
execDateList.stream().forEach(contractExecDate -> {
Contract contract = baseMapper.selectById(contractExecDate.getContractId());
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
@@ -1168,17 +1109,17 @@
//鐢熸垚鎶勮〃鍗�
if (StrUtil.isNotEmpty(subjectMatter.getMeterReadCode()) &&
ObjUtil.isNotNull(subjectMatter.getMeterReadNum())) {
- MeterReadRecord record = BeanUtil.copyProperties(subjectMatter, MeterReadRecord.class, "id","meterReadNum");
+ MeterReadRecord record = BeanUtil.copyProperties(subjectMatter, MeterReadRecord.class, "id", "meterReadNum");
record.setContractName(contract.getContractName());
record.setMatterId(subjectMatter.getId());
record.setBusGuestId(contract.getPartyAId());
record.setBusGuestName(contract.getPartyA());
meterReadRecordMapper.insert(record);
- }else {
+ } else {
//鍒涘缓鏀舵鑺傜偣
//鏌ヨ涓婃鏀舵鑺傜偣
ContractPaymentSchedule lastSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId,contract.getId())
+ .eq(ContractPaymentSchedule::getContractId, contract.getId())
.orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
ContractPaymentSchedule schedule = new ContractPaymentSchedule();
schedule.setStageName("鎴跨绉熻祦缂磋垂");
@@ -1187,15 +1128,15 @@
schedule.setPlannedAmount(subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
schedule.setEffectiveEndDate(contractExecDate.getExecDate());
schedule.setStageOrder(1);
- if (ObjUtil.isNotNull(lastSchedule)){
- schedule.setStageOrder(lastSchedule.getStageOrder()+1);
+ if (ObjUtil.isNotNull(lastSchedule)) {
+ schedule.setStageOrder(lastSchedule.getStageOrder() + 1);
}
schedule.setPaymentStatus(0);
schedule.setActualAmount(new BigDecimal("0"));
schedule.setCompId(contract.getCompId());
schedule.setSubjectMatterCode(subjectMatter.getMaterialCode());
schedule.setSubjectMatterName(subjectMatter.getMaterialInternalName());
- schedule.setRemark(DateUtil.formatDate(contractExecDate.getExecDate())+schedule.getStageName());
+ schedule.setRemark(DateUtil.formatDate(contractExecDate.getExecDate()) + schedule.getStageName());
schedule.setInvoiceFlag("0");
contractPaymentScheduleMapper.insert(schedule);
//鎴垮眿绉熻祦鐢熸垚搴旀敹
@@ -1272,8 +1213,8 @@
item.put("zongzhong", contractSubjectMatter.getTotalWight());
item.put("unitPrice", contractSubjectMatter.getUnitPrice());
item.put("price", contractSubjectMatter.getTotalAmount());
- if (no.get().equals(Integer.valueOf(0))){
- item.put("deliveryCycle",contract.getDeliveryCycle());
+ if (no.get().equals(Integer.valueOf(0))) {
+ item.put("deliveryCycle", contract.getDeliveryCycle());
}
items.add(item);
no.updateAndGet(v -> v + 1);
@@ -1346,7 +1287,7 @@
map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
map.put("total", contract.getAmount());
map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
- map.put("deliveryCycle",contract.getDeliveryCycle());
+ map.put("deliveryCycle", contract.getDeliveryCycle());
//鏍囩殑鐗�
List<Map<String, Object>> items = new ArrayList<>();
AtomicReference<Integer> no = new AtomicReference<>(0);
@@ -1432,30 +1373,30 @@
map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
map.put("total", contract.getAmount());
map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
- map.put("environment",contract.getEnvironment());
- map.put("standard",contract.getStandard());
- map.put("useMonth",contract.getUseMonth());
- map.put("afterShipMonth",contract.getAfterShipMonth());
- map.put("shipMethod",contract.getShipMethod());
- map.put("shipAddress",contract.getShipAddress());
- map.put("packaging",contract.getPackaging());
- map.put("repairPeriod",contract.getRepairPeriod());
- map.put("repairBreachAmount",contract.getRepairBreachAmount());
- map.put("goodsShort",contract.getGoodsShort());
- map.put("goodsShortBreachAmount",contract.getGoodsShortBreachAmount());
- map.put("overdueBreachAmount",contract.getOverdueBreachAmount());
- map.put("terminateContract",contract.getTerminateContract());
- map.put("court",contract.getCourt());
- map.put("contractAttchment",contract.getContractAttchment());
- map.put("invoiceNotice",contract.getInvoiceNotice());
- map.put("city",contract.getCity());
- map.put("region",contract.getRegion());
+ map.put("environment", contract.getEnvironment());
+ map.put("standard", contract.getStandard());
+ map.put("useMonth", contract.getUseMonth());
+ map.put("afterShipMonth", contract.getAfterShipMonth());
+ map.put("shipMethod", contract.getShipMethod());
+ map.put("shipAddress", contract.getShipAddress());
+ map.put("packaging", contract.getPackaging());
+ map.put("repairPeriod", contract.getRepairPeriod());
+ map.put("repairBreachAmount", contract.getRepairBreachAmount());
+ map.put("goodsShort", contract.getGoodsShort());
+ map.put("goodsShortBreachAmount", contract.getGoodsShortBreachAmount());
+ map.put("overdueBreachAmount", contract.getOverdueBreachAmount());
+ map.put("terminateContract", contract.getTerminateContract());
+ map.put("court", contract.getCourt());
+ map.put("contractAttchment", contract.getContractAttchment());
+ map.put("invoiceNotice", contract.getInvoiceNotice());
+ map.put("city", contract.getCity());
+ map.put("region", contract.getRegion());
//鏍囩殑鐗�
List<Map<String, Object>> items = new ArrayList<>();
AtomicReference<Integer> no = new AtomicReference<>(0);
subjectMatterList.stream().forEach(contractSubjectMatter -> {
- Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,contractSubjectMatter.getMaterialCode()).last("limit 1"));
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()).last("limit 1"));
Map<String, Object> item = new HashMap<>();
item.put("no", no);
item.put("materialName", contractSubjectMatter.getMaterialName());
@@ -1466,11 +1407,11 @@
item.put("priceTax", contractSubjectMatter.getUnitPrice().multiply(contractSubjectMatter.getQuantity()).setScale(2, RoundingMode.HALF_UP));
item.put("priceNoTax", contractSubjectMatter.getUnitPrice().multiply(contractSubjectMatter.getQuantity())
.subtract(contractSubjectMatter.getUnitPrice().multiply(contractSubjectMatter.getQuantity())
- .divide(new BigDecimal("100").add(new BigDecimal(product.getTaxRate())),2, RoundingMode.HALF_UP).multiply(new BigDecimal(product.getTaxRate())))
+ .divide(new BigDecimal("100").add(new BigDecimal(product.getTaxRate())), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(product.getTaxRate())))
.setScale(2, RoundingMode.HALF_UP));
item.put("deliveryDate", DateUtil.formatDate(contractSubjectMatter.getPlannedDeliveryDate()));
item.put("remarks", contractSubjectMatter.getRemarks());
- map.put("taxRate",product.getTaxRate());
+ map.put("taxRate", product.getTaxRate());
items.add(item);
no.updateAndGet(v -> v + 1);
});
@@ -1479,24 +1420,24 @@
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.eq(ContractPaymentSchedule::getContractId, id).orderByAsc(ContractPaymentSchedule::getCreateTime));
scheduleList.stream().forEach(contractPaymentSchedule -> {
- if (contractPaymentSchedule.getStageName().equals("鍚堝悓绛捐")){
- map.put("htqdbl",contractPaymentSchedule.getPaymentRatio());
- map.put("htqdje",contractPaymentSchedule.getPlannedAmount());
- map.put("htqdjr",contractPaymentSchedule.getAgreedDays());
+ if (contractPaymentSchedule.getStageName().equals("鍚堝悓绛捐")) {
+ map.put("htqdbl", contractPaymentSchedule.getPaymentRatio());
+ map.put("htqdje", contractPaymentSchedule.getPlannedAmount());
+ map.put("htqdjr", contractPaymentSchedule.getAgreedDays());
}
- if (contractPaymentSchedule.getStageName().equals("鍙戣揣鍓�")){
- map.put("fhqbl",contractPaymentSchedule.getPaymentRatio());
- map.put("fhqje",contractPaymentSchedule.getPlannedAmount());
+ if (contractPaymentSchedule.getStageName().equals("鍙戣揣鍓�")) {
+ map.put("fhqbl", contractPaymentSchedule.getPaymentRatio());
+ map.put("fhqje", contractPaymentSchedule.getPlannedAmount());
}
- if (contractPaymentSchedule.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")){
- map.put("ysbl",contractPaymentSchedule.getPaymentRatio());
- map.put("ysje",contractPaymentSchedule.getPlannedAmount());
- map.put("ysjr",contractPaymentSchedule.getAgreedDays());
+ if (contractPaymentSchedule.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+ map.put("ysbl", contractPaymentSchedule.getPaymentRatio());
+ map.put("ysje", contractPaymentSchedule.getPlannedAmount());
+ map.put("ysjr", contractPaymentSchedule.getAgreedDays());
}
- if (contractPaymentSchedule.getStageName().equals("璐ㄤ繚閲�")){
- map.put("zbjbl",contractPaymentSchedule.getPaymentRatio());
- map.put("zbjje",contractPaymentSchedule.getPlannedAmount());
- map.put("zbjjr",contractPaymentSchedule.getAgreedDays());
+ if (contractPaymentSchedule.getStageName().equals("璐ㄤ繚閲�")) {
+ map.put("zbjbl", contractPaymentSchedule.getPaymentRatio());
+ map.put("zbjje", contractPaymentSchedule.getPlannedAmount());
+ map.put("zbjjr", contractPaymentSchedule.getAgreedDays());
}
});
map.put("items", items);
@@ -1555,19 +1496,19 @@
@Override
public R delayOutApproval(DelayOutApprovalDTO dto) {
Contract contract = baseMapper.selectById(dto.getContractId());
- ContractDelayOut delayOut = BeanUtil.copyProperties(dto,ContractDelayOut.class);
+ ContractDelayOut delayOut = BeanUtil.copyProperties(dto, ContractDelayOut.class);
delayOut.setApplyTime(new Date());
delayOut.setApplyName(SecurityUtils.getUser().getUsername());
delayOut.setDelayStatus("0");
- Map<String,Object> map = new HashMap<>();
- map.put("contractId",contract.getId());
- map.put("contractName",contract.getContractName());
- map.put("partyA",contract.getPartyA());
- map.put("partyB",contract.getPartyB());
- map.put("delayDay",dto.getDelayDay());
- map.put("contractNo",contract.getContractNo());
- map.put("applyName",SecurityUtils.getUser().getUsername());
- map.put("applyTime",DateUtil.format(delayOut.getApplyTime(),DatePattern.NORM_DATETIME_FORMAT));
+ Map<String, Object> map = new HashMap<>();
+ map.put("contractId", contract.getId());
+ map.put("contractName", contract.getContractName());
+ map.put("partyA", contract.getPartyA());
+ map.put("partyB", contract.getPartyB());
+ map.put("delayDay", dto.getDelayDay());
+ map.put("contractNo", contract.getContractNo());
+ map.put("applyName", SecurityUtils.getUser().getUsername());
+ map.put("applyTime", DateUtil.format(delayOut.getApplyTime(), DatePattern.NORM_DATETIME_FORMAT));
//鍚姩娴佺▼
ProcessInstanceParamDto paramDto = new ProcessInstanceParamDto();
paramDto.setParamMap(map);
@@ -1582,7 +1523,7 @@
@Override
public Page pageScope(Page page, ContracQueryDTO queryDTO) {
- return baseMapper.pageScope(page,queryDTO, DataScope.of("comp_id"));
+ return baseMapper.pageScope(page, queryDTO, DataScope.of("comp_id"));
}
@Override
@@ -1671,17 +1612,17 @@
@Override
public R addContractSgb(ContractAddDTO addDTO) {
- if (ArrayUtil.isEmpty(addDTO.getContractSubjectMatter())){
+ if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
return R.failed("璇锋坊鍔犳爣鐨勭墿");
}
- if (ArrayUtil.isEmpty(addDTO.getContractPaymentSchedule())){
+ if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
}
- if (!isValidPaymentStages(addDTO.getContractPaymentSchedule())){
+ if (!isValidPaymentStages(addDTO.getContractPaymentSchedule())) {
return R.failed("浠樻闃舵淇℃伅寮傚父");
}
- if (addDTO.getContractPaymentSchedule().stream().map(item->item.getPaymentRatio()).reduce(BigDecimal.ZERO,BigDecimal::add)
- .compareTo(new BigDecimal("100.00"))!=0){
+ if (addDTO.getContractPaymentSchedule().stream().map(item -> item.getPaymentRatio()).reduce(BigDecimal.ZERO, BigDecimal::add)
+ .compareTo(new BigDecimal("100.00")) != 0) {
return R.failed("浠樻闃舵姣斾緥寮傚父");
}
Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
@@ -1696,18 +1637,21 @@
BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getErpCompanyCode,
addDTO.getPartyACode()).last("limit 1"));
- if (ObjUtil.isNull(bc)){
+ if (ObjUtil.isNull(bc)) {
return R.failed("erp瀹㈡埛缂栫爜涓嶅瓨鍦�");
}
contract.setPartyAId(bc.getId());
contract.setPartyA(bc.getCompanyName());
- if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())){
- contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(),addDTO.getDeliveryCycle()));
+ if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
+ contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
}
-
+ if (ObjUtil.isNotNull(contract.getSignDate()) && ObjUtil.isNotNull(contract.getExpirationDate())) {
+ Long bd = DateUtil.betweenDay(contract.getExpirationDate(), contract.getSignDate(), true);
+ contract.setDeliveryCycle(bd.intValue());
+ }
contract.setContractNo(generateGYBContractNo());
- if (!StrUtil.equals(addDTO.getContractCategory(), "water_house")){
+ if (!StrUtil.equals(addDTO.getContractCategory(), "water_house")) {
// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
.filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
@@ -1720,7 +1664,7 @@
}
baseMapper.insert(contract);
- if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+ if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
subjectMatter.setContractId(contract.getId());
@@ -1732,7 +1676,7 @@
//姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
- MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class,"id");
+ MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
record.setContractId(contract.getId());
record.setMatterId(subjectMatter.getId());
record.setContractName(contract.getContractName());
@@ -1742,8 +1686,8 @@
meterReadRecordMapper.insert(record);
}
if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "ymjcg")
- &&ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())&&ObjUtil.isNotNull(contract.getExpirationDate())
- &&DateUtil.compare(contract.getExpirationDate(),subjectMatter.getPlannedDeliveryDate())>0) {
+ && ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate()) && ObjUtil.isNotNull(contract.getExpirationDate())
+ && DateUtil.compare(contract.getExpirationDate(), subjectMatter.getPlannedDeliveryDate()) > 0) {
contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
baseMapper.updateById(contract);
}
@@ -1751,7 +1695,7 @@
}
- if (ArrayUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+ if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
AtomicInteger index = new AtomicInteger(1);
addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
int currentIndex = index.getAndIncrement();
@@ -1794,30 +1738,30 @@
@Override
public R updateContractSgb(ContractUpdateDTO updateDTO) {
- if (ArrayUtil.isEmpty(updateDTO.getContractSubjectMatter())){
+ if (CollUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
return R.failed("璇锋坊鍔犳爣鐨勭墿");
}
- if (ArrayUtil.isEmpty(updateDTO.getContractPaymentSchedule())){
+ if (CollUtil.isEmpty(updateDTO.getContractPaymentSchedule())) {
return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
}
- if (!isValidPaymentStages(updateDTO.getContractPaymentSchedule())){
+ if (!isValidPaymentStages(updateDTO.getContractPaymentSchedule())) {
return R.failed("浠樻闃舵淇℃伅寮傚父");
}
- if (updateDTO.getContractPaymentSchedule().stream().map(item->item.getPaymentRatio()).reduce(BigDecimal.ZERO,BigDecimal::add)
- .compareTo(new BigDecimal("100.00"))!=0){
+ if (updateDTO.getContractPaymentSchedule().stream().map(item -> item.getPaymentRatio()).reduce(BigDecimal.ZERO, BigDecimal::add)
+ .compareTo(new BigDecimal("100.00")) != 0) {
return R.failed("浠樻闃舵姣斾緥寮傚父");
}
- Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId,updateDTO.getDataId()).last("limit 1"));
- if (ObjUtil.isNull(contractOld)){
- return R.failed("鍚堝悓鏁版嵁ID锛歿}涓嶅瓨鍦紝璇峰厛鏂板鍚庡啀淇敼",updateDTO.getDataId());
+ Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, updateDTO.getDataId()).last("limit 1"));
+ if (ObjUtil.isNull(contractOld)) {
+ return R.failed("鍚堝悓鏁版嵁ID锛歿}涓嶅瓨鍦紝璇峰厛鏂板鍚庡啀淇敼", updateDTO.getDataId());
}
Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
contract.setId(contractOld.getId());
- if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())){
- contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(),updateDTO.getDeliveryCycle()));
+ if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())) {
+ contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(), updateDTO.getDeliveryCycle()));
}
- if (!StrUtil.equals(updateDTO.getContractCategory(), "water_house")){
+ if (!StrUtil.equals(updateDTO.getContractCategory(), "water_house")) {
// 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
Optional<ContractSubjectMatterAddDTO> maxDateObj = updateDTO.getContractSubjectMatter().stream()
.filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
@@ -1830,7 +1774,7 @@
}
baseMapper.updateById(contract);
- if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+ if (CollUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
@@ -1844,7 +1788,7 @@
if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
meterReadRecordMapper.delete(Wrappers.<MeterReadRecord>lambdaQuery().eq(MeterReadRecord::getContractId, contract.getId()));
- MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class,"id");
+ MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
record.setContractId(contract.getId());
record.setMatterId(subjectMatter.getId());
record.setContractName(contract.getContractName());
@@ -1856,7 +1800,7 @@
});
}
- if (ArrayUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
+ if (CollUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
AtomicInteger index = new AtomicInteger(1);
@@ -1899,6 +1843,7 @@
/**
* 鍒ゆ柇浠樻闃舵鍒楄〃鏄惁绗﹀悎鏍囧噯
+ *
* @param scheduleList 浠樻闃舵鍒楄〃
* @return true 濡傛灉鍖呭惈涓斾粎鍖呭惈鏍囧噯鐨勪簲涓樁娈碉紝false 鍚﹀垯
*/
@@ -1930,7 +1875,7 @@
/**
* 鐢熸垚鏍煎紡涓�: yyyyMMdd + 4浣嶅簭鍒楀彿 (渚嬪: 20260629000001)
*/
- public String generateSMJContractNo() {
+ public String generateSMJContractNo() {
// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1945,10 +1890,10 @@
String seqStr = String.format("%04d", sequence);
// 5. 鎷兼帴杩斿洖
- return "ZB-SMJ-"+dateStr + seqStr;
+ return "ZB-SMJ-" + dateStr + seqStr;
}
- public String generateYMJContractNo() {
+ public String generateYMJContractNo() {
// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1963,10 +1908,10 @@
String seqStr = String.format("%04d", sequence);
// 5. 鎷兼帴杩斿洖
- return "ZB-YMJ-"+dateStr + seqStr;
+ return "ZB-YMJ-" + dateStr + seqStr;
}
- public String generateJXCContractNo() {
+ public String generateJXCContractNo() {
// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1981,10 +1926,10 @@
String seqStr = String.format("%04d", sequence);
// 5. 鎷兼帴杩斿洖
- return "ZB-JXC-"+dateStr + seqStr;
+ return "ZB-JXC-" + dateStr + seqStr;
}
- public String generateTFContractNo() {
+ public String generateTFContractNo() {
// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -1999,10 +1944,10 @@
String seqStr = String.format("%04d", sequence);
// 5. 鎷兼帴杩斿洖
- return "ZB-TF-"+dateStr + seqStr;
+ return "ZB-TF-" + dateStr + seqStr;
}
- public String generateGYBContractNo() {
+ public String generateGYBContractNo() {
// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -2017,14 +1962,14 @@
String seqStr = String.format("%04d", sequence);
// 5. 鎷兼帴杩斿洖
- return "ZB-GYB-"+dateStr + seqStr;
+ return "ZB-GYB-" + dateStr + seqStr;
}
@Override
public R abortContractSgb(String dataId) {
- Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId,dataId).last("limit 1"));
- if (ObjUtil.isNull(contractOld)){
- return R.failed("鍚堝悓鏁版嵁ID锛歿}涓嶅瓨鍦紝璇峰厛鏂板鍚庡啀鎿嶄綔",dataId);
+ Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, dataId).last("limit 1"));
+ if (ObjUtil.isNull(contractOld)) {
+ return R.failed("鍚堝悓鏁版嵁ID锛歿}涓嶅瓨鍦紝璇峰厛鏂板鍚庡啀鎿嶄綔", dataId);
}
contractOld.setContractStatus(4);
baseMapper.updateById(contractOld);
@@ -2033,37 +1978,37 @@
@Override
public R delContractSgb(String dataId) {
- Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId,dataId).last("limit 1"));
- if (ObjUtil.isNull(contractOld)){
- return R.failed("鍚堝悓鏁版嵁ID锛歿}涓嶅瓨鍦紝璇峰厛鏂板鍚庡啀鎿嶄綔",dataId);
+ Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, dataId).last("limit 1"));
+ if (ObjUtil.isNull(contractOld)) {
+ return R.failed("鍚堝悓鏁版嵁ID锛歿}涓嶅瓨鍦紝璇峰厛鏂板鍚庡啀鎿嶄綔", dataId);
}
- contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contractOld.getId()));
- contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contractOld.getId()));
- paymentConfirmMapper.delete(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contractOld.getId()));
+ contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contractOld.getId()));
+ contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contractOld.getId()));
+ paymentConfirmMapper.delete(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contractOld.getId()));
baseMapper.deleteById(contractOld);
return R.ok();
}
@Override
- public Page fourAssociation(Page page,ContractQueryDTO queryDTO) {
- Page<FourAssociationPageVo> page1 = baseMapper.fourAssociation(page,queryDTO,DataScope.of("comp_id"));
- if (ArrayUtil.isNotEmpty(page1.getRecords())){
+ public Page fourAssociation(Page page, ContractQueryDTO queryDTO) {
+ Page<FourAssociationPageVo> page1 = baseMapper.fourAssociation(page, queryDTO, DataScope.of("comp_id"));
+ if (CollUtil.isNotEmpty(page1.getRecords())) {
page1.getRecords().stream().forEach(fourAssociationPageVo -> {
- List<PaymentSlip> slips = paymentSlipMapper.selectList(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getContractId,fourAssociationPageVo.getId())
+ List<PaymentSlip> slips = paymentSlipMapper.selectList(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getContractId, fourAssociationPageVo.getId())
.orderByAsc(PaymentSlip::getPaymentTime));
- if (ArrayUtil.isNotEmpty(slips)){
- fourAssociationPageVo.setSlipVoList(BeanUtil.copyToList(slips,ContractSlipVo.class));
+ if (CollUtil.isNotEmpty(slips)) {
+ fourAssociationPageVo.setSlipVoList(BeanUtil.copyToList(slips, ContractSlipVo.class));
}
- List<ContractInvoice> invoices = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId,fourAssociationPageVo.getId())
+ List<ContractInvoice> invoices = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId, fourAssociationPageVo.getId())
.orderByAsc(ContractInvoice::getInvoiceTime));
- if (ArrayUtil.isNotEmpty(invoices)){
+ if (CollUtil.isNotEmpty(invoices)) {
fourAssociationPageVo.setInvoiceVoList(BeanUtil.copyToList(invoices, ContractInvoiceVo.class));
}
- if (fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getPaidAmount())==0&&
- fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getBillingAmout())==0&&
- ArrayUtil.isNotEmpty(slips)&&ArrayUtil.isNotEmpty(invoices)
- ){
+ if (fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getPaidAmount()) == 0 &&
+ fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getBillingAmout()) == 0 &&
+ CollUtil.isNotEmpty(slips) && CollUtil.isNotEmpty(invoices)
+ ) {
fourAssociationPageVo.setAssociation("宸插畬鎴�");
}
});
@@ -2176,21 +2121,21 @@
map.put("useMonth", contract.getUseMonth());
map.put("afterShipMonth", contract.getAfterShipMonth());
map.put("deliveryCycle", contract.getDeliveryCycle());
- map.put("advancePayment", contract.getAdvancePayment()+"%");
+ map.put("advancePayment", contract.getAdvancePayment() + "%");
map.put("inspectDay", contract.getInspectDay());
map.put("acceptDay", contract.getAcceptDay());
map.put("delayAcceptDay", contract.getDelayAcceptDay());
map.put("acceptPassDay", contract.getAcceptPassDay());
- map.put("acceptPassAmount", contract.getAcceptPassAmount()+"%");
+ map.put("acceptPassAmount", contract.getAcceptPassAmount() + "%");
map.put("deliverDay", contract.getDeliverDay());
map.put("deliverCompleteDay", contract.getDeliverCompleteDay());
map.put("shipAddress", contract.getShipAddress());
map.put("htqdr", scheduleList.get(0).getAgreedDays());
- map.put("htqdq", scheduleList.get(0).getPaymentRatio()+"%");
- map.put("fhqq", scheduleList.get(1).getPaymentRatio()+"%");
+ map.put("htqdq", scheduleList.get(0).getPaymentRatio() + "%");
+ map.put("fhqq", scheduleList.get(1).getPaymentRatio() + "%");
map.put("dhhr", scheduleList.get(2).getAgreedDays());
- map.put("dhhq", scheduleList.get(2).getPaymentRatio()+"%");
- map.put("zbjq", scheduleList.get(4).getPaymentRatio()+"%");
+ map.put("dhhq", scheduleList.get(2).getPaymentRatio() + "%");
+ map.put("zbjq", scheduleList.get(4).getPaymentRatio() + "%");
map.put("zbqm", scheduleList.get(4).getAgreedDays());
map.put("paymentMethod", contract.getPaymentMethod());
map.put("invoiceNotice", contract.getInvoiceNotice());
@@ -2199,21 +2144,20 @@
map.put("buyerAgent", contract.getBuyerAgent());
map.put("buyerAgentIDCard", contract.getBuyerAgentIdCard());
map.put("agentAuthority", contract.getAgentAuthority());
- map.put("delayPayAdvancePayment", contract.getDelayPayAdvancePayment()+"%");
- map.put("delayPayAProcessPayment", contract.getDelayPayProcessPayment()+"%");
+ map.put("delayPayAdvancePayment", contract.getDelayPayAdvancePayment() + "%");
+ map.put("delayPayAProcessPayment", contract.getDelayPayProcessPayment() + "%");
map.put("receiveAdvancePaymentMonth", contract.getReceiveAdvancePaymentMonth());
map.put("noticeSupplierAcceptDay", contract.getNoticeSupplierAcceptDay());
map.put("overdueDay", contract.getOverdueDay());
- map.put("lossAmount", contract.getLossAmount()+"%");
- map.put("liquidatedDamagesHighSupplier", contract.getLiquidatedDamagesHighSupplier()+"%");
+ map.put("lossAmount", contract.getLossAmount() + "%");
+ map.put("liquidatedDamagesHighSupplier", contract.getLiquidatedDamagesHighSupplier() + "%");
map.put("overdueDayXf", contract.getOverdueDayXf());
- map.put("lossAmountXf", contract.getLossAmountXf()+"%");
- map.put("liquidatedDamagesHighBuyer", contract.getLiquidatedDamagesHighBuyer()+"%");
+ map.put("lossAmountXf", contract.getLossAmountXf() + "%");
+ map.put("liquidatedDamagesHighBuyer", contract.getLiquidatedDamagesHighBuyer() + "%");
map.put("contractAttchment", contract.getContractAttchment());
map.put("totalParts", contract.getTotalParts());
map.put("supplierPart", contract.getSupplierPart());
map.put("buyerPart", contract.getBuyerPart());
-
//鏍囩殑鐗�
@@ -2287,9 +2231,9 @@
Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
contract.setPartyBId(SecurityUtils.getUser().getCompId());
contract.setPartyB(SecurityUtils.getUser().getCompName());
- if (StrUtil.isEmpty(addDTO.getPartyA())){
+ if (StrUtil.isEmpty(addDTO.getPartyA())) {
BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
- if (ObjUtil.isNotNull(bc)){
+ if (ObjUtil.isNotNull(bc)) {
contract.setPartyA(bc.getCompanyName());
}
}
@@ -2300,20 +2244,20 @@
contract.setErpPushFlag("0");
contract.setNickName(SecurityUtils.getUser().getNickname());
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
- StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
contract.setContractNo(generateSMJContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
contract.setContractNo(generateGYBContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
contract.setContractNo(generateYMJContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
contract.setContractNo(generateTFContractNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
contract.setContractNo(generateJXCContractNo());
}
baseMapper.insert(contract);
@@ -2323,8 +2267,8 @@
@Override
public R pushCenter(Long id) {
Contract contract = baseMapper.selectById(id);
- List<ContractSubjectMatter> subjectMatterList=contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
- .eq(ContractSubjectMatter::getContractId,id));
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId, id));
JSONObject requestApply = new JSONObject();
requestApply.put("fd_selectionmethod", "鍏紑鎷涙爣");
requestApply.put("fd_isrelated", "鏄�");
@@ -2381,4 +2325,285 @@
}
return R.ok();
}
+
+ @Override
+ public R importContractMultiSheet(MultipartFile file) {
+
+ // 鐢ㄤ簬鏀堕泦鎵�鏈� Sheet 瑙ｆ瀽鍚庣殑鏈�缁堢粨鏋滐紙濡傛灉闇�瑕佺粺涓�杩斿洖鎴栧鐞嗭級
+ // 娉ㄦ剰锛氬鏋滄暟鎹噺鏋佸ぇ锛屽缓璁湪 Listener 涓洿鎺ュ叆搴擄紝涓嶈鍏ㄩ儴鍔犺浇鍒板唴瀛� List 涓�
+ List<ContractExceVO> baseList = new ArrayList<>();
+ List<ContractPaymentScheduleExceVO> scheduleList = new ArrayList<>();
+ List<ContractSubjectMatterExceVO> matterList = new ArrayList<>();
+
+ try (ExcelReader excelReader = EasyExcel.read(file.getInputStream()).build()) {
+
+ // 1. 鏋勫缓绗竴涓� Sheet 鐨勮鍙栭厤缃�
+ ReadSheet sheet0 = EasyExcel.readSheet(0)
+ .headRowNumber(1) // 琛ㄥご琛屾暟
+ .head(ContractExceVO.class) // 鎸囧畾瀹炰綋绫�
+ .registerReadListener(new BatchInsertListener<ContractExceVO>(data -> {
+ baseList.addAll(data);
+ // 寤鸿锛氬湪杩欓噷鐩存帴璋冪敤 service 淇濆瓨锛岃�屼笉鏄� addTo List锛岄櫎闈炴暟鎹噺寰堝皬
+ // contractService.saveBaseInfo(data);
+ }))
+ .build();
+
+ // 2. 鏋勫缓绗簩涓� Sheet 鐨勮鍙栭厤缃�
+ ReadSheet sheet1 = EasyExcel.readSheet(1)
+ .headRowNumber(1)
+ .head(ContractSubjectMatterExceVO.class)
+ .registerReadListener(new BatchInsertListener<ContractSubjectMatterExceVO>(data -> {
+ matterList.addAll(data);
+ // contractService.saveSchedule(data);
+ }))
+ .build();
+
+ // 3. 鏋勫缓绗笁涓� Sheet 鐨勮鍙栭厤缃�
+ ReadSheet sheet2 = EasyExcel.readSheet(2)
+ .headRowNumber(1)
+ .head(ContractPaymentScheduleExceVO.class) // 娉ㄦ剰锛氳繖閲屼綘鍘熶唬鐮佸啓鐨勬槸 ContractPaymentScheduleExceVO锛屼絾鍙橀噺鏄� matterList锛岄渶纭瀹炰綋绫绘槸鍚︿竴鑷�
+ .registerReadListener(new BatchInsertListener<ContractPaymentScheduleExceVO>(data -> {
+ scheduleList.addAll(data);
+ // contractService.saveMatter(data);
+ }))
+ .build();
+
+ // 4. 渚濇鎵ц璇诲彇
+ // 娉ㄦ剰锛歟xcelReader.read(sheet) 浼氬鐢ㄥ悓涓�涓緭鍏ユ祦锛屾墍浠ュ繀椤荤敤 try-with-resources 纭繚娴佺鐞嗘纭�
+ excelReader.read(sheet0);
+ excelReader.read(sheet1);
+ excelReader.read(sheet2);
+ // 鍚庣画澶勭悊 baseList, scheduleList, matterList
+ log.info("涓昏〃鏁版嵁閲�: " + baseList.size());
+ log.info("杩涘害琛ㄦ暟鎹噺: " + scheduleList.size());
+ log.info("鏍囩殑鐗╂暟鎹噺: " + matterList.size());
+ List<Map<String, String>> errList = new ArrayList<>();
+ for (int i = 0; i < baseList.size(); i++) {
+ ContractExceVO contractExceVO = baseList.get(i);
+ if (StrUtil.isBlank(contractExceVO.getContractNo())) {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("lineNum", "绗�" + (i + 1) + "琛�");
+ map.put("errors", "鍚堝悓缂栧彿涓虹┖");
+ errList.add(map);
+ continue;
+ }
+ BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
+ .eq(BusinessCustomer::getErpCompanyCode, contractExceVO.getBcErpCode()));
+ if (ObjUtil.isNull(bc)) {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("lineNum", "绗�" + (i + 1) + "琛�");
+ map.put("errors", "瀹㈡埛erp缂栫爜涓嶅瓨鍦�");
+ errList.add(map);
+ continue;
+ }
+ R<List<SysDictItem>> rem = remoteDictService.getDictByType("economic_matters");
+ if (!rem.isOk()) {
+ return R.failed("缁忔祹浜嬮」瀛楀吀鏌ヨ寮傚父");
+ }
+ List<SysDictItem> itemList = rem.getData();
+ for (SysDictItem dictItem : itemList
+ ) {
+ if (StrUtil.equals(contractExceVO.getEconomicMatters(), dictItem.getLabel())) {
+ contractExceVO.setEconomicMatters(dictItem.getItemValue());
+ break;
+ }
+ }
+ R<List<SysDictItem>> rsa = remoteDictService.getDictByType("supply_attribute");
+ if (!rsa.isOk()) {
+ return R.failed("渚涘簲灞炴�у瓧鍏告煡璇㈠紓甯�");
+ }
+ for (SysDictItem dictItem : rsa.getData()
+ ) {
+ if (StrUtil.equals(contractExceVO.getSupplyAttribute().replace(" ", ""), dictItem.getLabel())) {
+ contractExceVO.setSupplyAttribute(dictItem.getItemValue());
+ break;
+ }
+ }
+ R<List<SysDictItem>> rssa = remoteDictService.getDictByType("server_attribute");
+ if (!rssa.isOk()) {
+ return R.failed("鏈嶅姟灞炴�у瓧鍏告煡璇㈠紓甯�");
+ }
+ for (SysDictItem dictItem : rssa.getData()
+ ) {
+ if (StrUtil.equals(contractExceVO.getContractAttribute().replace(" ", ""), dictItem.getLabel())) {
+ contractExceVO.setContractAttribute(dictItem.getItemValue());
+ break;
+ }
+ }
+ R<List<SysDictItem>> ris = remoteDictService.getDictByType("industry_sector");
+ if (!ris.isOk()) {
+ return R.failed("鏈嶅姟灞炴�у瓧鍏告煡璇㈠紓甯�");
+ }
+ for (SysDictItem dictItem : ris.getData()
+ ) {
+ if (StrUtil.equals(contractExceVO.getIndustryCode(), dictItem.getLabel())) {
+ contractExceVO.setIndustryCode(dictItem.getItemValue());
+ break;
+ }
+ }
+ List<Contract> contractList = baseMapper.selectList(Wrappers.<Contract>lambdaQuery()
+ .eq(Contract::getContractNo, contractExceVO.getContractNo()));
+ if (CollUtil.isNotEmpty(contractList)) {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("lineNum", "绗�" + (i + 1) + "琛�");
+ map.put("errors", "鍚堝悓缂栧彿宸插瓨鍦�");
+ errList.add(map);
+ continue;
+ }
+ Contract contract = BeanUtil.copyProperties(contractExceVO, Contract.class);
+ if (ObjUtil.isNotNull(contract.getSignDate()) && ObjUtil.isNotNull(contract.getExpirationDate())) {
+ Long bd = DateUtil.betweenDay(contract.getExpirationDate(), contract.getSignDate(), true);
+ contract.setDeliveryCycle(bd.intValue());
+ }
+ contract.setPartyA(bc.getCompanyName());
+ contract.setPartyAId(bc.getId());
+ contract.setPartyB(SecurityUtils.getUser().getCompName());
+ contract.setPartyBId(SecurityUtils.getUser().getCompId());
+ contract.setContractStatus(2);
+ contract.setPaidAmount(ObjUtil.isNotNull(contract.getPaidAmount()) ?
+ contract.getPaidAmount() : new BigDecimal("0"));
+ contract.setBillingAmout(ObjUtil.isNotNull(contract.getBillingAmout()) ?
+ contract.getBillingAmout() : new BigDecimal("0"));
+ contract.setBillingStatus("1");
+ baseMapper.insert(contract);
+ BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
+ List<ContractSubjectMatterExceVO> resultMatter = matterList.stream().filter(item ->
+ StrUtil.isNotBlank(item.getMaterialCode()) &&
+ StrUtil.equals(item.getContractNo(), contract.getContractNo())).collect(Collectors.toList());
+ if (CollUtil.isNotEmpty(resultMatter)) {
+ for (ContractSubjectMatterExceVO subMatEx : resultMatter
+ ) {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(subMatEx, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+ subjectMatter.setDeliveredQuantity(StrUtil.isBlank(subMatEx.getDeliveredQuantity())
+ ? new BigDecimal("0") : new BigDecimal(subMatEx.getDeliveredQuantity()));
+ subjectMatter.setRemainingQuantity(subjectMatter.getQuantity().subtract(subjectMatter.getDeliveredQuantity()));
+ subjectMatter.setDeliveryStatus(subjectMatter.getRemainingQuantity().compareTo(subjectMatter.getQuantity()) == 0 ? 0
+ : subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0 ? 1 : 2);
+ subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+ contractSubjectMatterMapper.insert(subjectMatter);
+ if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
+ //鍑哄簱鍗�
+ ContractOutBound outBound = new ContractOutBound();
+ outBound.setBusGuestId(contract.getPartyAId());
+ outBound.setBusGuestName(contract.getPartyA());
+ outBound.setContractId(contract.getId());
+ outBound.setContractName(contract.getContractName());
+ outBound.setInvoiceNum(new BigDecimal("0"));
+ outBound.setInvoiceStatus("0");
+ outBound.setOutBoundTime(new Date());
+ outBound.setOutBoundNum(subjectMatter.getDeliveredQuantity());
+ outBound.setSubjectMatterName(subjectMatter.getMaterialInternalName());
+ outBound.setSubjectMatterCode(subjectMatter.getMaterialCode());
+ contractOutBoundMapper.insert(outBound);
+ if (contract.getBillingAmout().compareTo(new BigDecimal("0")) == 0) {
+ contract.setBillingStatus("2");
+ baseMapper.updateById(contract);
+ }
+ }
+
+ }
+ }
+ List<ContractPaymentScheduleExceVO> resultSchedule = scheduleList.stream().filter(item ->
+ StrUtil.equals(item.getContractNo(), contract.getContractNo())).collect(Collectors.toList());
+ if (CollUtil.isNotEmpty(resultSchedule)) {
+
+ for (int j = 0; j < resultSchedule.size(); j++) {
+ ContractPaymentSchedule schedule = new ContractPaymentSchedule();
+ schedule.setStageName(resultSchedule.get(j).getStageName());
+ schedule.setContractId(contract.getId());
+ schedule.setPaymentRatio(StrUtil.isBlank(resultSchedule.get(j).getPaymentRatio())
+ ? new BigDecimal("0") : new BigDecimal(resultSchedule.get(j).getPaymentRatio()));
+ schedule.setAgreedDays(StrUtil.isBlank(resultSchedule.get(j).getAgreedDays())
+ ? 0 : Integer.valueOf(resultSchedule.get(j).getPaymentRatio()));
+ schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio())
+ .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
+ schedule.setPaymentStatus(0);
+ schedule.setStageOrder(j + 1);
+ if (remainAmount.compareTo(new BigDecimal("0")) > 0 && schedule.getPlannedAmount().compareTo(new BigDecimal("0")) > 0) {
+ remainAmount = remainAmount.subtract(schedule.getPlannedAmount());
+ if (remainAmount.compareTo(new BigDecimal("0")) >= 0) {
+ schedule.setPaymentStatus(2);
+ schedule.setActualAmount(schedule.getPlannedAmount());
+ }
+ if (remainAmount.compareTo(new BigDecimal("0")) < 0) {
+ schedule.setPaymentStatus(1);
+ schedule.setActualAmount(schedule.getPlannedAmount().add(remainAmount));
+ }
+ }
+ contractPaymentScheduleMapper.insert(schedule);
+ if (schedule.getStageName().equals("璐ㄤ繚閲�") && contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount()) ?
+ contract.getPaidAmount() : new BigDecimal("0")).compareTo(new BigDecimal("0")) > 0) {
+ PaymentConfirm confirm = new PaymentConfirm();
+ confirm.setBusGuestId(contract.getPartyAId());
+ confirm.setBusGuestName(contract.getPartyA());
+ confirm.setBusinessType("璐ㄤ繚閲戝簲鏀�");
+ confirm.setConfirmTime(new Date());
+ confirm.setContractId(contract.getId());
+ confirm.setContractName(contract.getContractName());
+ confirm.setContractNo(contract.getContractNo());
+ confirm.setScheduleId(schedule.getId());
+ confirm.setScheduleName(schedule.getStageName());
+ confirm.setTransationAmount(contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount()) ?
+ contract.getPaidAmount() : new BigDecimal("0")));
+ confirm.setReceivableAmount(confirm.getTransationAmount());
+ confirm.setTotalAmount(confirm.getTransationAmount().multiply(new BigDecimal("-1")));
+ paymentConfirmMapper.insert(confirm);
+ }
+ }
+ }
+ }
+ if (CollUtil.isNotEmpty(errList)) {
+ return R.failed(errList);
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return R.failed("鏂囦欢瑙ｆ瀽澶辫触: " + e.getMessage());
+ }
+ return R.ok();
+ }
+
+
+ @Override
+ public R subjectChange(ContractSubjectChangeDTO changeDTO) {
+ Contract contract = baseMapper.selectById(changeDTO.getId());
+ if (ObjUtil.isNull(contract)){
+ return R.failed("鍚堝悓鐘舵�佸紓甯�");
+ }
+ if (contract.getBillingAmout().compareTo(new BigDecimal("0"))>0){
+ return R.failed("鍚堝悓宸插紑绁紝涓嶈兘杩涜鍙樻洿");
+ }
+ if (ObjUtil.isNotNull(contract.getOutBoundAmout())&&contract.getOutBoundAmout().compareTo(new BigDecimal("0"))>0){
+ return R.failed("鍚堝悓鏍囩殑鐗╁凡鍑哄簱锛屼笉鑳借繘琛屽彉鏇�");
+ }
+ if (CollUtil.isEmpty(changeDTO.getContractSubjectMatter())){
+ return R.failed("鍚堝悓鍙樻洿鍚庢爣鐨勭墿涓嶈兘涓虹┖");
+ }
+ BigDecimal changeAmount = changeDTO.getContractSubjectMatter().stream().map(subject->subject.getUnitPrice().multiply(subject.getQuantity())).reduce(BigDecimal.ZERO,BigDecimal::add);
+ if (contract.getAmount().compareTo(changeAmount)!=0){
+ return R.failed("鍚堝悓鍙樻洿鍚庢爣鐨勭墿鎬讳环蹇呴』涓庡悎鍚屾�讳环涓�鑷�");
+ }
+ List<ContractSubjectMatter> beforeList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,changeDTO.getId()));
+ ContractSubjectMatterChange change = new ContractSubjectMatterChange();
+ change.setContractId(contract.getId());
+ change.setBeforeChange(JSONObject.toJSONString(beforeList));
+ change.setAfterChange(JSONObject.toJSONString(changeDTO.getContractSubjectMatter()));
+ changeMapper.insert(change);
+ contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,changeDTO.getId()));
+ changeDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+ subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+ subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+ subjectMatter.setDeliveryStatus(0);
+ subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+ contractSubjectMatterMapper.insert(subjectMatter);
+ });
+ return R.ok();
+ }
+
+ @Override
+ public Page subjectChangePage(Page page, ContracQueryDTO queryDTO) {
+ return changeMapper.subjectChangePage(page,queryDTO,DataScope.of("comp_id"));
+ }
}
--
Gitblit v1.9.1