src/main/java/com/ruoyi/account/pojo/AccountIncome.java
@@ -13,6 +13,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Date; import java.util.List; /** * 财务管理--收入管理 @@ -79,6 +80,24 @@ private String incomeMethod; /** * 收款方式标签 */ @TableField(exist = false) private String incomeMethodLabel; /** * payment_methods 字典编码集合（business_type 为空时） */ @TableField(exist = false) private List<String> paymentMethodList; /** * receipt_payment_type 字典编码集合（business_type=1时） */ @TableField(exist = false) private List<String> receiptPaymentMethodList; /** * 发票号码 */ @Excel(name = "发票号码") src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java
@@ -5,13 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.account.dto.AccountDto2; import com.ruoyi.account.dto.AccountDto3; import com.ruoyi.account.dto.ReportDateDto; import com.ruoyi.account.mapper.AccountIncomeMapper; import com.ruoyi.account.pojo.AccountIncome; import com.ruoyi.account.service.AccountIncomeService; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.dto.DateQueryDto; import com.ruoyi.project.system.domain.SysDictData; @@ -24,9 +22,9 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @AllArgsConstructor @Service @@ -40,9 +38,40 @@ //分页查询 @Override public IPage<AccountIncome> accountIncomeListPage(Page page, AccountIncome accountIncome) { resolveIncomeMethodLabelFilter(accountIncome); return accountIncomeMapper.accountIncomeListPage(page,accountIncome); } private void resolveIncomeMethodLabelFilter(AccountIncome accountIncome) { if (accountIncome == null) { return; } if (accountIncome.getIncomeMethodLabel() == null || accountIncome.getIncomeMethodLabel().trim().isEmpty()) { return; } String targetLabel = accountIncome.getIncomeMethodLabel().trim(); List<String> paymentMethodList = selectDictValuesByLabel("payment_methods", targetLabel); List<String> receiptPaymentMethodList = selectDictValuesByLabel("receipt_payment_type", targetLabel); if (paymentMethodList.isEmpty()) { paymentMethodList = Collections.singletonList("__NO_MATCH__"); } if (receiptPaymentMethodList.isEmpty()) { receiptPaymentMethodList = Collections.singletonList("__NO_MATCH__"); } accountIncome.setPaymentMethodList(paymentMethodList); accountIncome.setReceiptPaymentMethodList(receiptPaymentMethodList); accountIncome.setIncomeMethod(null); } private List<String> selectDictValuesByLabel(String dictType, String label) { return sysDictDataMapper.selectDictDataByType(dictType).stream() .filter(item -> label.equals(item.getDictLabel())) .map(SysDictData::getDictValue) .filter(v -> v != null && !v.trim().isEmpty()) .distinct() .collect(Collectors.toList()); } //导出 @Override public void accountIncomeExport(HttpServletResponse response, AccountIncome accountIncome) { src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -131,7 +131,8 @@ accountExpense.setSupplierName(purchaseLedger.getSupplierName()); accountExpense.setExpenseMoney(paymentRegistration.getCurrentPaymentAmount()); accountExpense.setExpenseDescribed("付款支出"); accountExpense.setExpenseMethod("0"); accountExpense.setExpenseMethod(paymentRegistration.getPaymentMethod()); accountExpense.setBusinessId(paymentRegistration.getId()); accountExpense.setBusinessType(1); accountExpense.setInputTime(new Date()); src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -8,7 +8,6 @@ import com.ruoyi.account.service.AccountIncomeService; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.sales.dto.CustomerInteractionDto; import com.ruoyi.sales.dto.InvoiceLedgerDto; import com.ruoyi.sales.dto.ReceiptPaymentDto; import com.ruoyi.sales.dto.ReceiptPaymentExeclDto; @@ -16,7 +15,6 @@ import com.ruoyi.sales.mapper.ReceiptPaymentMapper; import com.ruoyi.sales.mapper.SalesLedgerMapper; import com.ruoyi.sales.mapper.SalesLedgerProductMapper; import com.ruoyi.sales.pojo.InvoiceLedger; import com.ruoyi.sales.pojo.ReceiptPayment; import com.ruoyi.sales.pojo.SalesLedger; import com.ruoyi.sales.pojo.SalesLedgerProduct; @@ -32,7 +30,6 @@ import java.time.LocalDate; import java.time.YearMonth; import java.util.*; import java.util.stream.Collectors; @Service public class ReceiptPaymentServiceImpl extends ServiceImpl<ReceiptPaymentMapper,ReceiptPayment> implements ReceiptPaymentService { @@ -82,9 +79,9 @@ accountIncome.setIncomeType("3"); accountIncome.setCustomerName(salesLedger.getCustomerName()); accountIncome.setIncomeMoney(receiptPayment.getReceiptPaymentAmount()); accountIncome.setIncomeMethod("0"); accountIncome.setIncomeMethod(receiptPayment.getReceiptPaymentType()); accountIncome.setInputTime(new Date()); accountIncome.setInputUser(salesLedger.getEntryPerson()); accountIncome.setInputUser(SecurityUtils.getLoginUser().getNickName()); accountIncome.setIncomeDescribed("回款收入"); accountIncome.setBusinessId(Long.parseLong(receiptPayment.getId().toString())); accountIncome.setBusinessType(1); src/main/resources/mapper/account/AccountIncomeMapper.xml
@@ -17,7 +17,26 @@ <if test="accountIncome.incomeType != null and accountIncome.incomeType != '' "> AND income_type = #{accountIncome.incomeType} </if> <if test="accountIncome.incomeMethod != null and accountIncome.incomeMethod != '' "> <if test="accountIncome.incomeMethodLabel != null and accountIncome.incomeMethodLabel != ''"> AND ( ( business_type = 1 AND income_method in <foreach collection="accountIncome.receiptPaymentMethodList" item="method" open="(" separator="," close=")"> #{method} </foreach> ) OR ( business_type is null AND income_method in <foreach collection="accountIncome.paymentMethodList" item="method" open="(" separator="," close=")"> #{method} </foreach> ) ) </if> <if test="(accountIncome.incomeMethodLabel == null or accountIncome.incomeMethodLabel == '') and accountIncome.incomeMethod != null and accountIncome.incomeMethod != '' "> AND income_method = #{accountIncome.incomeMethod} </if> </select>
