From 800fe7bbdcd513c06d23dd568850d8eb05dd4d63 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 14 十月 2026 15:17:19 +0800
Subject: [PATCH] feat:新增单位年度合同 开票 收款计划 新增统计页
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 392 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 379 insertions(+), 13 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 3add066..b03c778 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
@@ -789,7 +789,7 @@
}
if ((StrUtil.equals(contract.getPartyBId() + "", smj) ||
- StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) && StrUtil.isNotEmpty(smjErp)) {
+ StrUtil.equals(contract.getPartyBId() + "", smjhw)) && StrUtil.isNotEmpty(smjErp)) {
request.put("customerCode", customer.getErpCompanyCode());
request.put("currencyId", "RMB");
request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
@@ -1174,6 +1174,7 @@
return;
}
currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
+ currentConfim.setCompId(contract.getCompId());
paymentConfirmMapper.insert(currentConfim);
processService.handleBeforeRemain(currentConfim,contract);
}
@@ -2076,6 +2077,7 @@
}
Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
contract.setId(contractOld.getId());
+ contract.setContractNo(contractOld.getContractNo());
if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())) {
contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(), updateDTO.getDeliveryCycle()));
}
@@ -2707,6 +2709,8 @@
if (applyResp.getString("code").equals("00")) {
contract.setCenterPushFlag("1");
baseMapper.updateById(contract);
+ //搴旀敹
+ takeEffect(contract.getId());
return R.ok();
}
log.error("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}",applyResp.getString("msg"));
@@ -2775,11 +2779,12 @@
continue;
}
BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery()
- .eq(BusinessCustomer::getErpCompanyCode, contractExceVO.getBcErpCode()));
+ .eq(BusinessCustomer::getCompanyName, contractExceVO.getBcErpCode())
+ .last("limit 1"));
if (ObjUtil.isNull(bc)) {
Map<String, String> map = new HashMap<String, String>();
map.put("lineNum", "绗�" + (i + 1) + "琛�");
- map.put("errors", "瀹㈡埛erp缂栫爜涓嶅瓨鍦�");
+ map.put("errors", "瀹㈡埛鍚嶇О涓嶅瓨鍦�");
errList.add(map);
continue;
}
@@ -3009,10 +3014,10 @@
@Override
public R syncContractStatus(SyncContractStatusDTO dto) {
- log.info("鍚堝悓瀹℃壒缁撴灉鍚屾锛屽悎鍚岀紪鍙�:{}锛屽鎵圭粨鏋滐細{}",dto.getContractNumber(),dto.getStatus());
if (StrUtil.isBlank(dto.getFd_bizId())){
return R.failed("鏁版嵁ID涓嶈兘涓虹┖");
}
+ log.info("鍚堝悓瀹℃壒缁撴灉鍚屾锛屽悎鍚屾暟鎹甀D:{}锛屽鎵圭粨鏋滐細{}",dto.getFd_bizId(),dto.getStatus());
if (StrUtil.isBlank(dto.getStatus())){
return R.failed("瀹℃壒鐘舵�佷笉鑳戒负绌�");
}
@@ -3023,20 +3028,29 @@
return R.failed("瀹℃壒鏃堕棿涓嶈兘涓虹┖");
}
Contract contract = baseMapper.selectById(dto.getFd_bizId());
- if(ObjUtil.isNull(contract)){
+
+ if (ObjUtil.isNull(contract)) {
return R.failed("鏁版嵁ID寮傚父");
}
- if (StrUtil.equals(dto.getStatus(),"1")){
- takeEffect(contract.getId());
+ if (StrUtil.equals(dto.getStatus(), "1")) {
+ new Thread(() -> {
+ takeEffect(contract.getId());
+ saveContractApproval(contract,dto);
+ }).start();
}
- if (StrUtil.equals(dto.getStatus(),"2")){
- refuseApproval(contract.getId());
+ if (StrUtil.equals(dto.getStatus(), "2")) {
+ new Thread(() -> {
+ refuseApproval(contract.getId());
+ saveContractApproval(contract,dto);
+ }).start();
}
- if (StrUtil.equals(dto.getStatus(),"3")||StrUtil.equals(dto.getStatus(),"4")){
- contract.setContractStatus(3);
- baseMapper.updateById(contract);
+ if (StrUtil.equals(dto.getStatus(), "3") || StrUtil.equals(dto.getStatus(), "4")) {
+ new Thread(() -> {
+ contract.setContractStatus(3);
+ baseMapper.updateById(contract);
+ saveContractApproval(contract,dto);
+ }).start();
}
- saveContractApproval(contract,dto);
return R.ok();
}
@@ -3241,6 +3255,11 @@
@Override
public R addContractHis(ContractAddDTO addDTO) {
+ Contract contract1 = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,addDTO.getContractNo())
+ .last("limit 1"));
+ if (ObjUtil.isNotNull(contract1)){
+ return R.failed("鍚堝悓缂栧彿宸插瓨鍦�");
+ }
Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
contract.setPartyBId(SecurityUtils.getUser().getCompId());
contract.setPartyB(SecurityUtils.getUser().getCompName());
@@ -3383,4 +3402,351 @@
objVo.setLinkPartyC(selectVoList);
return R.ok(objVo);
}
+
+ @Override
+ public List<ContractExportExceVO> export(ContracQueryDTO queryDTO) {
+ return baseMapper.export(queryDTO, DataScope.of("comp_id"));
+ }
+
+ @Override
+ public R addContractHisNoCenter(ContractAddDTO addDTO) {
+ Contract contract1 = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,addDTO.getContractNo())
+ .last("limit 1"));
+ if (ObjUtil.isNotNull(contract1)){
+ return R.failed("鍚堝悓缂栧彿宸插瓨鍦�");
+ }
+ Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+ contract.setPartyBId(SecurityUtils.getUser().getCompId());
+ contract.setPartyB(SecurityUtils.getUser().getCompName());
+ if (StrUtil.isEmpty(addDTO.getPartyA())) {
+ BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
+ if (ObjUtil.isNotNull(bc)) {
+ contract.setPartyA(bc.getCompanyName());
+ }
+ if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())
+ && StrUtil.isEmpty(bc.getCreditCode())) {
+ return R.failed("璇峰畬鍠勫鎴稥RP缂栫爜鎴栫粍缁囨満鏋勪唬鐮�");
+ }
+ }
+
+ contract.setBillingStatus("1");
+ contract.setErpPushFlag("1");
+ contract.setCenterPushFlag("0");
+ contract.setContractStatus(0);
+ contract.setNickName(SecurityUtils.getUser().getNickname());
+ contract.setNextScheduleName("鍙戣揣鍓�");
+ if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
+ contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
+ }
+
+ if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+ return R.failed("鏍囩殑鐗╀笉鑳戒负绌�");
+ }
+
+ baseMapper.insert(contract);
+
+ if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+ addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+ subjectMatter.setDeliveredQuantity(ObjUtil.isNull(contractSubjectMatterAddDTO.getDeliveredQuantity())
+ ? new BigDecimal("0") : contractSubjectMatterAddDTO.getDeliveredQuantity());
+ subjectMatter.setRemainingQuantity(subjectMatter.getQuantity().subtract(subjectMatter.getDeliveredQuantity()));
+ subjectMatter.setDeliveryStatus(subjectMatter.getRemainingQuantity().compareTo(subjectMatter.getQuantity()) == 0 ? 0
+ : subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0 ? 1 : 2);
+ subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+ contractSubjectMatterMapper.insert(subjectMatter);
+ });
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId,contract.getId()).ne(ContractSubjectMatter::getDeliveryStatus,2));
+ if (CollUtil.isEmpty(subjectMatterList)){
+ contract.setNextScheduleName("璐у埌绛炬敹");
+ baseMapper.updateById(contract);
+ }
+ }
+ BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
+ if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+
+ for (int j = 0; j < addDTO.getContractPaymentSchedule().size(); j++) {
+ ContractPaymentSchedule schedule = new ContractPaymentSchedule();
+ schedule.setStageName(addDTO.getContractPaymentSchedule().get(j).getStageName());
+ schedule.setContractId(contract.getId());
+ schedule.setPaymentRatio(addDTO.getContractPaymentSchedule().get(j).getPaymentRatio());
+ schedule.setAgreedDays(addDTO.getContractPaymentSchedule().get(j).getAgreedDays());
+ schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio())
+ .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
+ schedule.setPaymentStatus(0);
+ schedule.setStageOrder(j + 1);
+ if (remainAmount.compareTo(new BigDecimal("0")) > 0 && schedule.getPlannedAmount().compareTo(new BigDecimal("0")) > 0) {
+ remainAmount = remainAmount.subtract(schedule.getPlannedAmount());
+ if (remainAmount.compareTo(new BigDecimal("0")) >= 0) {
+ schedule.setPaymentStatus(2);
+ schedule.setActualAmount(schedule.getPlannedAmount());
+ }
+ if (remainAmount.compareTo(new BigDecimal("0")) < 0) {
+ schedule.setPaymentStatus(1);
+ schedule.setActualAmount(schedule.getPlannedAmount().add(remainAmount));
+ }
+ }
+ contractPaymentScheduleMapper.insert(schedule);
+ if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐у埌绛炬敹")) {
+ contract.setArrivalScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+ contract.setAcceptScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐ㄤ繚閲�")) {
+ contract.setWarrantyScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ }
+ }
+
+ if (contract.getPaidAmount().compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
+ contract.setContractStatus(3);
+ baseMapper.updateById(contract);
+ }
+ return R.ok();
+ }
+
+ @Override
+ public R updContractHisNoCenter(ContractUpdateDTO updateDTO) {
+
+ Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
+ contract.setPartyBId(SecurityUtils.getUser().getCompId());
+ contract.setPartyB(SecurityUtils.getUser().getCompName());
+ contract.setBillingStatus("1");
+ contract.setErpPushFlag("1");
+ contract.setCenterPushFlag("0");
+ contract.setContractStatus(0);
+ contract.setNickName(SecurityUtils.getUser().getNickname());
+ contract.setContractCategory("his_no_center");
+ contract.setNextScheduleName("鍙戣揣鍓�");
+ if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())) {
+ contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(), updateDTO.getDeliveryCycle()));
+ }
+
+ if (CollUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
+ return R.failed("鏍囩殑鐗╀笉鑳戒负绌�");
+ }
+
+ baseMapper.insert(contract);
+
+ if (CollUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+ contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
+
+ updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+ subjectMatter.setDeliveredQuantity(ObjUtil.isNull(contractSubjectMatterAddDTO.getDeliveredQuantity())
+ ? new BigDecimal("0") : contractSubjectMatterAddDTO.getDeliveredQuantity());
+ subjectMatter.setRemainingQuantity(subjectMatter.getQuantity().subtract(subjectMatter.getDeliveredQuantity()));
+ subjectMatter.setDeliveryStatus(subjectMatter.getRemainingQuantity().compareTo(subjectMatter.getQuantity()) == 0 ? 0
+ : subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0 ? 1 : 2);
+ subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+ contractSubjectMatterMapper.insert(subjectMatter);
+ });
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId,contract.getId()).ne(ContractSubjectMatter::getDeliveryStatus,2));
+ if (CollUtil.isEmpty(subjectMatterList)){
+ contract.setNextScheduleName("璐у埌绛炬敹");
+ baseMapper.updateById(contract);
+ }
+ }
+ BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
+ if (CollUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
+ contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
+
+ for (int j = 0; j < updateDTO.getContractPaymentSchedule().size(); j++) {
+ ContractPaymentSchedule schedule = new ContractPaymentSchedule();
+ schedule.setStageName(updateDTO.getContractPaymentSchedule().get(j).getStageName());
+ schedule.setContractId(contract.getId());
+ schedule.setPaymentRatio(updateDTO.getContractPaymentSchedule().get(j).getPaymentRatio());
+ schedule.setAgreedDays(updateDTO.getContractPaymentSchedule().get(j).getAgreedDays());
+ schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio())
+ .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
+ schedule.setPaymentStatus(0);
+ schedule.setStageOrder(j + 1);
+ if (remainAmount.compareTo(new BigDecimal("0")) > 0 && schedule.getPlannedAmount().compareTo(new BigDecimal("0")) > 0) {
+ remainAmount = remainAmount.subtract(schedule.getPlannedAmount());
+ if (remainAmount.compareTo(new BigDecimal("0")) >= 0) {
+ schedule.setPaymentStatus(2);
+ schedule.setActualAmount(schedule.getPlannedAmount());
+ }
+ if (remainAmount.compareTo(new BigDecimal("0")) < 0) {
+ schedule.setPaymentStatus(1);
+ schedule.setActualAmount(schedule.getPlannedAmount().add(remainAmount));
+ }
+ }
+ contractPaymentScheduleMapper.insert(schedule);
+ if (updateDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐у埌绛炬敹")) {
+ contract.setArrivalScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ if (updateDTO.getContractPaymentSchedule().get(j).getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+ contract.setAcceptScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ if (updateDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐ㄤ繚閲�")) {
+ contract.setWarrantyScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ }
+ }
+
+ if (contract.getPaidAmount().compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
+ contract.setContractStatus(3);
+ baseMapper.updateById(contract);
+ }
+ return R.ok();
+ }
+
+ @Override
+ public R addContractNoSgb(ContractAddDTO addDTO) {
+ Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, addDTO.getDataId()).last("limit 1"));
+ if (ObjUtil.isNotNull(contractOld)) {
+ return R.failed("鍚堝悓鏁版嵁ID锛歿}宸插瓨鍦紝涓嶈兘鏂板閲嶅鏁版嵁", addDTO.getDataId());
+ }
+ if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+ return R.failed("璇锋坊鍔犳爣鐨勭墿");
+ }
+ if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
+ return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
+ }
+ if (!isValidPaymentStages(addDTO.getContractPaymentSchedule())) {
+ return R.failed("浠樻闃舵淇℃伅寮傚父");
+ }
+ if (addDTO.getContractPaymentSchedule().stream().map(item -> item.getPaymentRatio()).reduce(BigDecimal.ZERO, BigDecimal::add)
+ .compareTo(new BigDecimal("100.00")) != 0) {
+ return R.failed("浠樻闃舵姣斾緥寮傚父");
+ }
+ Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+ contract.setPartyBId(SecurityUtils.getUser().getCompId());
+ contract.setPartyB(SecurityUtils.getUser().getCompName());
+ contract.setContractStatus(2);
+ contract.setPaidAmount(new BigDecimal("0"));
+ contract.setBillingStatus("1");
+ contract.setErpPushFlag("1");
+ contract.setCenterPushFlag("0");
+ contract.setBillingAmout(new BigDecimal("0"));
+
+ BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getErpCompanyCode,
+ addDTO.getPartyACode()).last("limit 1"));
+ if (ObjUtil.isNull(bc)) {
+ return R.failed("erp瀹㈡埛缂栫爜涓嶅瓨鍦�");
+ }
+ contract.setPartyAId(bc.getId());
+ contract.setPartyA(bc.getCompanyName());
+ if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
+ contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
+ }
+ if (ObjUtil.isNotNull(contract.getSignDate()) && ObjUtil.isNotNull(contract.getExpirationDate())) {
+ Long bd = DateUtil.betweenDay(contract.getExpirationDate(), contract.getSignDate(), true);
+ contract.setDeliveryCycle(bd.intValue());
+ }
+ contract.setContractNo(generateGYBContractNo());
+
+ if (!StrUtil.equals(addDTO.getContractCategory(), "water_house")) {
+ // 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+ Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
+ .filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+ .max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+ if (maxDateObj.isPresent()) {
+ contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+ }
+ }
+ baseMapper.insert(contract);
+
+ if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+ addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+ if (StrUtil.isNotBlank(subjectMatter.getMaterialCode())){
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode())
+ .last("limit 1"));
+ if (ObjUtil.isNotNull(product)){
+ subjectMatter.setMaterialInternalName(product.getId()+"");
+ }
+ if (ObjUtil.isNull(product)){
+ product = new Product();
+ product.setParentId(2101559148831944705L);
+ product.setProductName(subjectMatter.getMaterialInternalName());
+ product.setErpCode(subjectMatter.getMaterialCode());
+ product.setProductType(subjectMatter.getSpecification());
+ product.setTaxCode("1090117040000000000");
+ product.setTaxClass("娉�");
+ productMapper.insert(product);
+ subjectMatter.setMaterialInternalName(product.getId()+"");
+ }
+ }
+ subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+ subjectMatter.setDeliveryStatus(0);
+ subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+ contractSubjectMatterMapper.insert(subjectMatter);
+ //姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
+ if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
+ ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
+ MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
+ record.setContractId(contract.getId());
+ record.setMatterId(subjectMatter.getId());
+ record.setContractName(contract.getContractName());
+ record.setBusGuestId(contract.getPartyAId());
+ record.setBusGuestName(contract.getPartyA());
+ record.setMeterReadTime(new Date());
+ meterReadRecordMapper.insert(record);
+ }
+ if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "ymjcg")
+ && ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate()) && ObjUtil.isNotNull(contract.getExpirationDate())
+ && DateUtil.compare(contract.getExpirationDate(), subjectMatter.getPlannedDeliveryDate()) > 0) {
+ contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
+ baseMapper.updateById(contract);
+ }
+ });
+
+ }
+
+ if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+ AtomicInteger index = new AtomicInteger(1);
+ addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+ int currentIndex = index.getAndIncrement();
+ ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+ if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+ schedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
+ }
+ if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
+ if (schedule.getEffectiveDate().before(DateUtil.date())) {
+ schedule.setFulfillmentStatus(1);
+ } else {
+ schedule.setFulfillmentStatus(0);
+ }
+ }
+ if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ schedule.setPaymentStatus(0);
+ } else {
+ schedule.setPaymentStatus(3);
+ }
+ schedule.setContractId(contract.getId());
+ schedule.setContractName(contract.getContractName());
+ schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+ schedule.setStageOrder(currentIndex);
+ contractPaymentScheduleMapper.insert(schedule);
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+ contract.setArrivalScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+ contract.setAcceptScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ });
+
+ }
+
+ //鎺ㄩ�佸悎鍚屼腑蹇�
+ return R.ok(contract.getContractNo());
+ }
}
--
Gitblit v1.9.1