|
|
@@ -17,6 +17,7 @@
|
|
|
package org.springblade.salesPart.settlement.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
|
@@ -46,6 +47,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import javax.validation.Valid;
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -231,5 +233,32 @@ public class SettlementController extends BladeController {
|
|
|
return R.status(settlementService.removeByIds(idList));
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 分页 配件批发收付款表
|
|
|
+ */
|
|
|
+ @GetMapping("/getSettlementSum")
|
|
|
+ public R<BigDecimal> getSettlementSum(PjSettlement settlement) {
|
|
|
+ QueryWrapper<PjSettlement> lambdaQueryWrapper = new QueryWrapper<>();
|
|
|
+ lambdaQueryWrapper.select(" sum(amount) as advanceReceipt ");
|
|
|
+ lambdaQueryWrapper.lambda().eq(ObjectUtils.isNotNull(settlement.getCorpId()), PjSettlement::getCorpId, settlement.getCorpId());
|
|
|
+ lambdaQueryWrapper.lambda().like(ObjectUtils.isNotNull(settlement.getCorpName()), PjSettlement::getCorpName, settlement.getCorpName());
|
|
|
+ lambdaQueryWrapper.lambda().like(ObjectUtils.isNotNull(settlement.getSysNo()), PjSettlement::getSysNo, settlement.getSysNo());
|
|
|
+ lambdaQueryWrapper.lambda().like(ObjectUtils.isNotNull(settlement.getContractNumber()), PjSettlement::getContractNumber, settlement.getContractNumber());
|
|
|
+ lambdaQueryWrapper.lambda().eq(ObjectUtils.isNotNull(settlement.getAccountId()), PjSettlement::getAccountId, settlement.getAccountId());
|
|
|
+ lambdaQueryWrapper.lambda().eq(ObjectUtils.isNotNull(settlement.getFinanceStatus()), PjSettlement::getFinanceStatus, settlement.getFinanceStatus());
|
|
|
+ lambdaQueryWrapper.lambda().eq(ObjectUtils.isNotNull(settlement.getSettlementDate()), PjSettlement::getSettlementDate, settlement.getSettlementDate());
|
|
|
+ lambdaQueryWrapper.lambda().eq(PjSettlement::getSalesCompanyId, AuthUtil.getDeptId());
|
|
|
+ lambdaQueryWrapper.lambda().eq(ObjectUtils.isNotNull(settlement.getDc()), PjSettlement::getDc, settlement.getDc());
|
|
|
+ if (ObjectUtils.isNotNull(settlement.getSettlementDateList()) && !settlement.getSettlementDateList().isEmpty()) {
|
|
|
+ lambdaQueryWrapper.lambda().ge(PjSettlement::getSettlementDate, settlement.getSettlementDateList().get(0));
|
|
|
+ lambdaQueryWrapper.lambda().le(PjSettlement::getSettlementDate, settlement.getSettlementDateList().get(1));
|
|
|
+ }
|
|
|
+ lambdaQueryWrapper.lambda().eq(PjSettlement::getTenantId, AuthUtil.getTenantId()).eq(PjSettlement::getIsDeleted, 0);
|
|
|
+ PjSettlement pjSettlement = settlementService.getOne(lambdaQueryWrapper);
|
|
|
+ if (org.springframework.util.ObjectUtils.isEmpty(pjSettlement)) {
|
|
|
+ return R.data(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
+ return R.data(pjSettlement.getAdvanceReceipt());
|
|
|
+ }
|
|
|
|
|
|
}
|