From c5c284896ce6428cffc5092e9cdef4fefc23409f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 18 九月 2026 17:12:49 +0800
Subject: [PATCH] feat: 石煤机客商产品查询处理 合同推送新增选商方式和是否关联交易
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java | 290 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 162 insertions(+), 128 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
index be9ffc8..13a4196 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
@@ -1,8 +1,8 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,15 +12,16 @@
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
import com.by4cloud.platformx.business.vo.ContractPaymentScheduleVo;
-import com.by4cloud.platformx.business.vo.ScheduleProcessVo;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 灞ョ害鑺傜偣
@@ -33,29 +34,87 @@
public class ContractPaymentScheduleProcessServiceImpl extends ServiceImpl<ContractPaymentScheduleProcessMapper, ContractPaymentScheduleProcess> implements ContractPaymentScheduleProcessService {
private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
- private final ContractPaymentScheduleProcessMapper processMapper;
private final ContractMapper contractMapper;
private final ContractSubjectMatterMapper subjectMatterMapper;
private final PaymentConfirmMapper paymentConfirmMapper;
+ private final ContractOutBoundMapper contractOutBoundMapper;
@Override
public R add(ContractPaymentScheduleProcessAddDTO addDTO) {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(addDTO.getScheduleId());
- if (ObjUtil.isNull(schedule)){
+ if (ObjUtil.isNull(schedule)) {
return R.failed("灞ョ害闃舵涓庡悎鍚屼笉涓�鑷达紝璇疯仈绯绘妧鏈汉鍛�");
}
//鍚堝悓
Contract contract = contractMapper.selectById(schedule.getContractId());
- List<ContractSubjectMatter> subjectMatterList = subjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contract.getId()));
- if (ArrayUtil.isEmpty(subjectMatterList.toArray())){
- return R.failed("璇ュ悎鍚屾爣鐨勭墿寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
+ if (ObjUtil.isNull(contract)) {
+ return R.failed("鍚堝悓淇℃伅寮傚父");
}
- if (!subjectMatterList.stream().allMatch(item->item.getDeliveryStatus()==2)){
- return R.failed("鍑哄簱鏁伴噺灏忎簬褰撳墠鍚堝悓鏍囩殑鐗╂暟閲忥紝鏃犳硶杩涜褰撳墠鎿嶄綔");
+ return handleSchedule(addDTO, schedule, contract);
+
+ }
+
+ public void saveScheduleProcess(Date date, ContractPaymentSchedule schedule) {
+ //鏇存柊灞ョ害
+ ContractPaymentScheduleProcess contractPaymentScheduleProcess = new ContractPaymentScheduleProcess();
+ contractPaymentScheduleProcess.setContractId(schedule.getContractId());
+ contractPaymentScheduleProcess.setContractName(schedule.getContractName());
+ contractPaymentScheduleProcess.setScheduleId(schedule.getId());
+ contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
+ contractPaymentScheduleProcess.setProcessDate(date);
+ ContractPaymentScheduleProcess lastProcess = baseMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery().eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
+ .eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
+ if (ObjUtil.isNull(lastProcess)) {
+ baseMapper.insert(contractPaymentScheduleProcess);
}
+ }
+
+ private R handleSchedule(ContractPaymentScheduleProcessAddDTO addDTO, ContractPaymentSchedule schedule, Contract contract) {
+ if (schedule.getStageName().equals("璐у埌绛炬敹")) {
+ if (CollUtil.isEmpty(addDTO.getContractOutBoundIds())) {
+ return R.failed("绛炬敹淇℃伅涓嶈兘涓虹┖");
+ }
+ //鏇存柊鍚堝悓鍑哄簱鍒拌揣鏃堕棿
+ addDTO.getContractOutBoundIds().forEach(contractOutBoundId -> {
+ ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundId);
+ contractOutBound.setArrivalTime(addDTO.getProcessDate());
+ contractOutBound.setArrivalAttNames(addDTO.getOutBoundAttNames());
+ contractOutBound.setArrivalAttPaths(addDTO.getOutBoundAttPaths());
+ contractOutBoundMapper.updateById(contractOutBound);
+ });
+ }
+ //浠樻姣斾緥涓嶄负0 淇濆瓨鏀舵鏄庣粏
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ savePaymentConfirm(addDTO, contract, schedule);
+ }
+
+ updateCurrentSchedule(addDTO.getProcessDate(), schedule, contract);
+ //淇濆瓨灞ョ害璁板綍
+ saveScheduleProcess(addDTO.getProcessDate(), schedule);
+ return R.ok();
+ }
+
+ private void savePaymentConfirm(ContractPaymentScheduleProcessAddDTO addDTO, Contract contract, ContractPaymentSchedule schedule) {
+ BigDecimal amount = schedule.getPlannedAmount();
+ if (schedule.getStageName().equals("璐у埌绛炬敹")) {
+ amount = new BigDecimal("0");
+ //璁＄畻绛炬敹浠锋牸
+ for (Long contractOutBoundId : addDTO.getContractOutBoundIds()) {
+ ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundId);
+ ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId, contract.getId())
+ .eq(ContractSubjectMatter::getMaterialCode, contractOutBound.getSubjectMatterCode())
+ .eq(ContractSubjectMatter::getLineNo, contractOutBound.getLineNo())
+ .last("limit 1"));
+ amount = amount.add(contractOutBound.getOutBoundNum().multiply(subjectMatter.getUnitPrice()));
+ }
+ //瀹為檯鍒拌揣閲戦鎸夋瘮渚嬭绠�
+ amount = schedule.getPlannedAmount().multiply(amount.divide(contract.getAmount(), 2, RoundingMode.HALF_UP));
+ }
+
//鏂板褰撳墠闃舵搴旀敹
PaymentConfirm currentConfim = new PaymentConfirm();
- currentConfim.setBusinessType(schedule.getStageName()+"搴旀敹");
+ currentConfim.setBusinessType(schedule.getStageName() + "搴旀敹");
currentConfim.setBusGuestId(contract.getPartyAId());
currentConfim.setBusGuestName(contract.getPartyA());
currentConfim.setContractId(contract.getId());
@@ -64,135 +123,110 @@
currentConfim.setScheduleId(schedule.getId());
currentConfim.setScheduleName(schedule.getStageName());
currentConfim.setConfirmTime(addDTO.getProcessDate());
- currentConfim.setTransationAmount(schedule.getPlannedAmount());
- currentConfim.setReceivableAmount(schedule.getPlannedAmount());
- PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+ currentConfim.setTransationAmount(amount);
+ currentConfim.setReceivableAmount(amount);
+ PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- BigDecimal lastTotal = new BigDecimal("0");
- if(ObjUtil.isNotNull(lastConfirm)){
- lastTotal = lastConfirm.getTotalAmount();
- }
- currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
- paymentConfirmMapper.insert(currentConfim);
- //灞ョ害
- ContractPaymentScheduleProcess contractPaymentScheduleProcess = BeanUtil.copyProperties(addDTO,ContractPaymentScheduleProcess.class);
- contractPaymentScheduleProcess.setContractId(schedule.getContractId());
- contractPaymentScheduleProcess.setContractName(schedule.getContractName());
- contractPaymentScheduleProcess.setScheduleId(schedule.getId());
- contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
- baseMapper.insert(contractPaymentScheduleProcess);
- //鏇存柊褰撳墠闃舵
- if (ObjUtil.isNull(schedule.getEffectiveDate())) {
- schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(),schedule.getAgreedDays()));
- contractPaymentScheduleMapper.updateById(schedule);
- }
- //鏌ヨ鏄惁鏈変箣鍓嶉樁娈�
- ContractPaymentSchedule beforeSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
- .lt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()).orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
- if (ObjUtil.isNotNull(beforeSchedule)){
- beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
- contractPaymentScheduleMapper.updateById(beforeSchedule);
- //涔嬪墠闃舵鏄惁鏀舵瀹屾垚
-// if (beforeSchedule.getPaymentStatus()!=2){
-// //鏂板涔嬪墠闃舵瓒呮湡
-// PaymentConfirm beforeConfim = new PaymentConfirm();
-// beforeConfim.setBusinessType("搴旀敹瓒呮湡");
-// beforeConfim.setBusGuestId(contract.getPartyAId());
-// beforeConfim.setBusGuestName(contract.getPartyA());
-// beforeConfim.setContractId(contract.getId());
-// beforeConfim.setContractName(contract.getContractName());
-// beforeConfim.setContractNo(contract.getContractNo());
-// beforeConfim.setScheduleId(schedule.getId());
-// beforeConfim.setScheduleName(schedule.getStageName());
-// beforeConfim.setConfirmTime(addDTO.getProcessDate());
-// beforeConfim.setTransationAmount(schedule.getPlannedAmount());
-// PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
-// .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-// beforeConfim.setOverdueAmount(StrUtil.equals(schedule.getPaymentStatus()+"","0")?
-// schedule.getPlannedAmount():
-// schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
-// beforeConfim.setTotalAmount(newLastConfirm.getTotalAmount());
-// paymentConfirmMapper.insert(beforeConfim);
-// }
-
- }
- //鏌ヨ鏄惁鏈夊悗缁樁娈�
- List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
- .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
- if (ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()==1){
- //鏈�鍚庨樁娈电敓鏁堟椂闂�
- ContractPaymentSchedule endSchedule = afterSchedule.get(0);
- if (StrUtil.equals(endSchedule.getStageName(),"璐ㄤ繚閲�")) {
- endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
- endSchedule.setEffectiveEndDate(contract.getExpirationDate());
- contractPaymentScheduleMapper.updateById(endSchedule);
- //褰撳墠闃舵鐢熸晥鏃堕棿
- schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
- schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
- contractPaymentScheduleMapper.updateById(schedule);
- //鏈�鍚庨樁娈靛簲鏀�
- 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(schedule.getStageName());
- newConfim.setConfirmTime(addDTO.getProcessDate());
- 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()));
- paymentConfirmMapper.insert(newConfim);
+ if (ObjUtil.isNotNull(lastConfirm)) {
+ currentConfim.setTotalAmount(lastConfirm.getTotalAmount().subtract(currentConfim.getTransationAmount()));
+ if (contract.getContractNo().startsWith("ZB-")) {
+ paymentConfirmMapper.insert(currentConfim);
}
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName(endSchedule.getStageName());
- contractMapper.updateById(contract);
+ return;
}
- if(ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()>1){
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName(afterSchedule.get(0).getStageName());
- contractMapper.updateById(contract);
- }
- if(ArrayUtil.isEmpty(afterSchedule.toArray())){
- schedule.setEffectiveEndDate(contract.getExpirationDate());
- contractPaymentScheduleMapper.updateById(schedule);
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName("鏃�");
- contractMapper.updateById(contract);
- //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
- //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
- contract.setContractStatus(3);
+ currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
+ paymentConfirmMapper.insert(currentConfim);
+ handleBeforeRemain(currentConfim, contract);
+ }
+
+ public void handleBeforeRemain(PaymentConfirm currentConfim, Contract contract) {
+ //瀹㈡埛浠樻瀹屾垚鍚堝悓
+ List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
+ .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).eq(Contract::getContractStatus, 3));
+ if (CollUtil.isNotEmpty(customerCompleteContractList)) {
+ List<BigDecimal> outAmountList = new ArrayList<>();
+ for (Contract completeContract : customerCompleteContractList) {
+ PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, completeContract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ //鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
+ if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0 &&
+ contract.getContractNo().startsWith("ZB-")) {
+ //鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
+ 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"));
+ if (contract.getContractNo().startsWith("ZB-")) {
+ paymentConfirmMapper.insert(outConfirm);
+ }
+ outAmountList.add(contractLastConfirm.getTotalAmount());
+ }
+ }
+ if (CollUtil.isNotEmpty(outAmountList)) {
+ BigDecimal currentSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+ //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
+ PaymentConfirm inConfirm = BeanUtil.copyProperties(currentConfim, PaymentConfirm.class, "id", "transationAmount",
+ "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
+ inConfirm.setBusinessType("璧勯噾杞叆");
+ inConfirm.setConfirmTime(new Date());
+ inConfirm.setTransationAmount(currentSum);
+ inConfirm.setTotalAmount(currentConfim.getTotalAmount().add(currentSum));
+ if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
+ inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
+ } else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
+ inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+ }
+ if (contract.getContractNo().startsWith("ZB-")) {
+ paymentConfirmMapper.insert(inConfirm);
+ }
+ contract.setPaidAmount(currentSum);
contractMapper.updateById(contract);
}
}
- return R.ok();
+ }
+
+ private void updateCurrentSchedule(Date date, ContractPaymentSchedule schedule, Contract contract) {
+
+ //鏌ヨ鏄惁鏈夊悗缁樁娈�
+ ContractPaymentSchedule afterOneSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
+ .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder())
+ .orderByAsc(ContractPaymentSchedule::getCreateTime)
+ .last("limit 1"));
+ if (ObjUtil.isNotNull(afterOneSchedule)) {
+ //鏇存柊涓嬮樁娈靛悕绉�
+ List<ContractOutBound> contractOutBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery().eq(ContractOutBound::getContractId, contract.getId())
+ .isNull(ContractOutBound::getArrivalTime));
+ if (CollUtil.isEmpty(contractOutBoundList)) {
+ contract.setNextScheduleName(afterOneSchedule.getStageName());
+ }
+ }
+ if (ObjUtil.isNull(afterOneSchedule)) {
+ contract.setNextScheduleName("");
+ }
+ contractMapper.updateById(contract);
+ //鏇存柊灞ョ害闃舵鏃堕棿
+ if (ObjUtil.isNull(schedule.getEffectiveDate()) && ObjUtil.isNull(schedule.getEffectiveEndDate())) {
+ schedule.setEffectiveEndDate(DateUtil.offsetDay(date, schedule.getAgreedDays()));
+ }
+ contractPaymentScheduleMapper.updateById(schedule);
}
@Override
public R selectScheduleProcess(Long id) {
MPJLambdaWrapper<ContractPaymentSchedule> wrapper = new MPJLambdaWrapper<ContractPaymentSchedule>()
- .select(ContractPaymentSchedule::getId,ContractPaymentSchedule::getStageName,ContractPaymentSchedule::getEffectiveDate,
- ContractPaymentSchedule::getPlannedAmount,ContractPaymentSchedule::getPlannedAmount,
- ContractPaymentSchedule::getEffectiveEndDate,ContractPaymentSchedule::getPaymentDate,
- ContractPaymentSchedule::getPaymentStatus,ContractPaymentSchedule::getActualAmount,
- ContractPaymentSchedule::getAgreedDays)
+ .select(ContractPaymentSchedule::getId, ContractPaymentSchedule::getStageName, ContractPaymentSchedule::getEffectiveDate,
+ ContractPaymentSchedule::getPlannedAmount, ContractPaymentSchedule::getPlannedAmount,
+ ContractPaymentSchedule::getEffectiveEndDate, ContractPaymentSchedule::getPaymentDate,
+ ContractPaymentSchedule::getPaymentStatus, ContractPaymentSchedule::getActualAmount,
+ ContractPaymentSchedule::getAgreedDays, ContractPaymentSchedule::getPaymentRatio)
.select(ContractPaymentScheduleProcess::getProcessDate)
- .leftJoin(ContractPaymentScheduleProcess.class,ContractPaymentScheduleProcess::getScheduleId,ContractPaymentSchedule::getId)
- .eq(ContractPaymentSchedule::getContractId,id)
+ .leftJoin(ContractPaymentScheduleProcess.class, ContractPaymentScheduleProcess::getScheduleId, ContractPaymentSchedule::getId)
+ .eq(ContractPaymentSchedule::getContractId, id)
.orderByAsc(ContractPaymentSchedule::getCreateTime);
- List<ContractPaymentScheduleVo> scheduleVoList = contractPaymentScheduleMapper.selectJoinList(ContractPaymentScheduleVo.class,wrapper);
+ List<ContractPaymentScheduleVo> scheduleVoList = contractPaymentScheduleMapper.selectJoinList(ContractPaymentScheduleVo.class, wrapper);
return R.ok(scheduleVoList);
}
}
\ No newline at end of file
--
Gitblit v1.9.1