From 6b969ca247b98e5a793e61ec5b0d89f4fccb3318 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 10 六月 2026 16:25:18 +0800
Subject: [PATCH] feat:抵抹账条件新增付款金额小于开票金额，红票审核拒绝后蓝票可重新开红票
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 216 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 159 insertions(+), 57 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 bec5082..a9cf047 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
@@ -8,19 +8,23 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
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.feign.RemoteDeptService;
import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
import com.by4cloud.platformx.business.constant.FlowNameEnum;
+import com.by4cloud.platformx.business.dto.ContracQueryDTO;
import com.by4cloud.platformx.business.dto.ContractAddDTO;
import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
+import com.by4cloud.platformx.business.dto.DelayOutApprovalDTO;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.business.utils.ContractNumberGenerator;
import com.by4cloud.platformx.business.vo.ContractDetailVo;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.datascope.DataScope;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
import com.deepoove.poi.XWPFTemplate;
@@ -29,7 +33,6 @@
import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
@@ -61,9 +64,7 @@
private final RemoteFlowProcessService remoteFlowProcessService;
private final ProductMapper productMapper;
private final RemoteDeptService remoteDeptService;
-
- @Value("${file.local.base-path}")
- private String basePath;
+ private final ContractDelayOutMapper contractDelayOutMapper;
@Override
public R add(ContractAddDTO addDTO) {
@@ -74,8 +75,12 @@
contract.setPaidAmount(new BigDecimal("0"));
contract.setBillingStatus("0");
contract.setErpPushFlag("0");
- List<Contract> contracts;
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
+
+ if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && (
+ StrUtil.equals(addDTO.getContractCategory(), "ymjgkcpmm")||StrUtil.equals(addDTO.getContractCategory(), "ymjgypmm"))) {
+ contract.setExpirationDate(DateUtil.offsetDay(contract.getSignDate(),contract.getDeliveryCycle()));
+ }
+ List<Contract> contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
while (ArrayUtil.isNotEmpty(contracts.toArray())) {
contract.setContractNo(ContractNumberGenerator.generateContractNumber());
contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
@@ -102,6 +107,12 @@
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);
}
});
@@ -144,9 +155,6 @@
}
- if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "water_house")) {
-
- }
return R.ok();
}
@@ -267,59 +275,112 @@
if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getContractId,id));
- if (ArrayUtil.isNotEmpty(subjectMatterList.toArray())) {
- subjectMatterList.stream().forEach(contractSubjectMatter -> {
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(contract.getSignDate(), contract.getExecDay());
- for (int i = 0; i < contract.getExecTimes(); i++) {
- if (StrUtil.equals(contract.getExecFrequency(), "1")) {
+ if (ArrayUtil.isNotEmpty(subjectMatterList.toArray())) {
+ 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");
- contractExecDateMapper.insert(execDate);
- }
- if (StrUtil.equals(contract.getExecFrequency(), "2")) {
- Date execDatei = DateUtil.offsetMonth(execDate0, i );
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- contractExecDateMapper.insert(execDate);
- }
- if (StrUtil.equals(contract.getExecFrequency(), "3")) {
- 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");
- contractExecDateMapper.insert(execDate);
- }
- if (StrUtil.equals(contract.getExecFrequency(), "4")) {
- 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");
- contractExecDateMapper.insert(execDate);
- }
- if (StrUtil.equals(contract.getExecFrequency(), "5")) {
- Date execDatei = DateUtil.offsetYear(execDate0, i);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- contractExecDateMapper.insert(execDate);
+ 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())
@@ -636,7 +697,7 @@
map.put("items", items);
//瀹氬埗鏂�
BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
- map.put("companyName", customer.getCompanyName());
+ map.put("companyName", customer.getRegisterName());
map.put("legalPerson", customer.getLegalPerson());
map.put("contactPhone", customer.getContactPhone());
map.put("bankName", customer.getBankName());
@@ -805,7 +866,7 @@
map.put("items", items);
//瀹氬埗鏂�
BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
- map.put("companyName", customer.getCompanyName());
+ map.put("companyName", customer.getRegisterName());
map.put("legalPerson", customer.getLegalPerson());
map.put("contactPhone", customer.getContactPhone());
map.put("bankName", customer.getBankName());
@@ -891,7 +952,7 @@
map.put("items", items);
//瀹氬埗鏂�
BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
- map.put("companyName", customer.getCompanyName());
+ map.put("companyName", customer.getRegisterName());
map.put("legalPerson", customer.getLegalPerson());
map.put("contactPhone", customer.getContactPhone());
map.put("bankName", customer.getBankName());
@@ -972,6 +1033,8 @@
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<>();
@@ -1024,7 +1087,7 @@
map.put("items", items);
//瀹氬埗鏂�
BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
- map.put("companyName", customer.getCompanyName());
+ map.put("companyName", customer.getRegisterName());
map.put("legalPerson", customer.getLegalPerson());
map.put("contactPhone", customer.getContactPhone());
map.put("bankName", customer.getBankName());
@@ -1073,4 +1136,43 @@
e.printStackTrace();
}
}
+
+ @Override
+ public R delayOutApproval(DelayOutApprovalDTO dto) {
+ Contract contract = baseMapper.selectById(dto.getContractId());
+ 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("applyName",SecurityUtils.getUser().getUsername());
+ map.put("applyTime",DateUtil.format(delayOut.getApplyTime(),DatePattern.NORM_DATETIME_FORMAT));
+ //鍚姩娴佺▼
+ ProcessInstanceParamDto paramDto = new ProcessInstanceParamDto();
+ paramDto.setParamMap(map);
+ paramDto.setFlowName(FlowNameEnum.寤舵湡鍑鸿揣瀹℃壒.name());
+ R r1 = remoteFlowProcessService.startProcessInstance(paramDto);
+ if (r1.getCode() == 1) {
+ return R.failed("娴佺▼鍚姩澶辫触");
+ }
+ contractDelayOutMapper.insert(delayOut);
+ return R.ok();
+ }
+
+ @Override
+ public Page pageScope(Page page, ContracQueryDTO queryDTO) {
+ return baseMapper.pageScope(page,queryDTO, DataScope.of("comp_id"));
+ }
+
+ public static void main(String[] args) {
+ System.out.println(DateUtil.beginOfQuarter(DateUtil.parseDate("2026-06-05")));
+ System.out.println(DateUtil.endOfQuarter(DateUtil.parseDate("2026-09-30")));
+ System.out.println(DateUtil.betweenMonth(DateUtil.beginOfQuarter(DateUtil.parseDate("2026-06-05")),
+ DateUtil.endOfQuarter(DateUtil.parseDate("2026-09-30")),true));
+ }
}
--
Gitblit v1.9.1