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