From fd810a4567192ee7648fa851f15183ab5e7e34c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 12 Dec 2024 13:49:30 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=BA=94=E4=BB=98=E8=B4=A6=E6=AC=BE=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BA=94=E4=BB=98=E8=B4=A6=E6=AC=BE=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E5=92=8Cmapper=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=BB=93=E6=A1=88?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BA=94=E4=BB=98=E8=B4=A6=E6=AC=BE=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E7=BB=93=E6=A1=88=E5=92=8C=E4=BF=9D=E5=AD=98=E7=BB=93=E6=A1=88?= =?UTF-8?q?controller=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E5=BA=94=E4=BB=98?= =?UTF-8?q?=E8=B4=A6=E6=AC=BE=E7=BB=93=E6=A1=88service=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinancialAccountsPayableController.java | 22 ++++++++++++++----- .../domain/FinancialAccountsPayable.java | 11 ++++++++++ .../IFinancialAccountsPayableService.java | 2 +- .../FinancialAccountsPayableServiceImpl.java | 7 ++++-- .../FinancialAccountsPayableMapper.xml | 11 +++++++--- 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/FinancialAccountsPayableController.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/FinancialAccountsPayableController.java index e475a05f..89b0c364 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/FinancialAccountsPayableController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/FinancialAccountsPayableController.java @@ -171,15 +171,25 @@ public class FinancialAccountsPayableController extends BaseController return toAjax(financialAccountsPayableService.deleteFinancialAccountsPayableByIds(ids)); } + /** - * 结案 + * 应收款账单结案 */ - @RequiresPermissions("financial:payable:payableClosing") - @Log(title = "财务应付账款", businessType = BusinessType.UPDATE) - @GetMapping( "/payableClosing/{accountsPayableId}") + @GetMapping("/closed/{accountsPayableId}") + public String receivablesClosed(@PathVariable("accountsPayableId") Long accountsPayableId, ModelMap mmap) + { + FinancialAccountsPayable accountsPayable = financialAccountsPayableService.selectFinancialAccountsPayableById(accountsPayableId); + mmap.put("accountsPayable", accountsPayable); + return prefix + "/closed"; + } + /** + * 保存应收账款结案 + */ + @PostMapping("/closed") @ResponseBody - public AjaxResult receivablesClosing(@PathVariable("accountsPayableId") Long accountsPayableId){ - return toAjax(financialAccountsPayableService.closingFinancialAccountsPayableById(accountsPayableId)); + public AjaxResult saveClosed(FinancialAccountsPayable accountsPayable) + { + return toAjax(financialAccountsPayableService.closingFinancialAccountsPayableById(accountsPayable)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialAccountsPayable.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialAccountsPayable.java index ef592d7d..050137de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialAccountsPayable.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialAccountsPayable.java @@ -135,6 +135,9 @@ public class FinancialAccountsPayable extends BaseEntity // @Excel(name = "操作人") private String operatorPeople; + /** 结案原因 */ + private String closedReason; + public void setAccountsPayableId(Long accountsPayableId) { this.accountsPayableId = accountsPayableId; @@ -399,6 +402,14 @@ public class FinancialAccountsPayable extends BaseEntity this.updateTime = updateTime; } + public String getClosedReason() { + return closedReason; + } + + public void setClosedReason(String closedReason) { + this.closedReason = closedReason; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/IFinancialAccountsPayableService.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/IFinancialAccountsPayableService.java index 3805929c..2c128dd9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/IFinancialAccountsPayableService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/IFinancialAccountsPayableService.java @@ -76,5 +76,5 @@ public interface IFinancialAccountsPayableService // 根据编号集合查询应付账款列表 public List selectFinancialAccountsPayableByCodes(String[] accountsPayableCodes); - int closingFinancialAccountsPayableById(Long accountsPayableId); + int closingFinancialAccountsPayableById(FinancialAccountsPayable accountsPayable); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialAccountsPayableServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialAccountsPayableServiceImpl.java index fb517683..b7d78e2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialAccountsPayableServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialAccountsPayableServiceImpl.java @@ -130,8 +130,11 @@ public class FinancialAccountsPayableServiceImpl implements IFinancialAccountsPa } @Override - public int closingFinancialAccountsPayableById(Long accountsPayableId) { - int result = financialAccountsPayableMapper.updatePayableClosingStatusById(accountsPayableId); + public int closingFinancialAccountsPayableById(FinancialAccountsPayable accountsPayable) { + accountsPayable.setAccountsPayableStatus("4");//结案 + accountsPayable.setUpdateBy(ShiroUtils.getLoginName()); + accountsPayable.setUpdateTime(DateUtils.getNowDate()); + int result = financialAccountsPayableMapper.updateFinancialAccountsPayable(accountsPayable); return result; } diff --git a/ruoyi-admin/src/main/resources/mapper/financial/FinancialAccountsPayableMapper.xml b/ruoyi-admin/src/main/resources/mapper/financial/FinancialAccountsPayableMapper.xml index 66cc3916..dea673c0 100644 --- a/ruoyi-admin/src/main/resources/mapper/financial/FinancialAccountsPayableMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/financial/FinancialAccountsPayableMapper.xml @@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" price_excluding_tax, price_includes_tax, payment_condition, actual_paid_price, unpaid_price, purchase_buyer, storage_status, paid_voucher_code, paid_price, paid_time, paid_detail, paid_photoUrl, - operator_people, create_time, create_by, update_by, update_time + operator_people, create_time, create_by, update_by, update_time, closed_reason from financial_accounts_payable @@ -62,10 +63,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and currency_type = #{currencyType} and purchase_buyer like concat('%', #{purchaseBuyer}, '%') and storage_status = #{storageStatus} - and create_time between #{params.beginCreateTime} and #{params.endCreateTime} + and Date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime} and update_by = #{updateBy} - and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime} + and Date(update_time) between #{params.beginUpdateTime} and #{params.endUpdateTime} + order by create_time desc