From d3511369121e3c08a0eda6b37e8f3906eb4020ec Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Sat, 7 Sep 2024 11:36:53 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9A=E6=8A=A5=E9=94=80=E5=8D=95=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=BC=96=E8=BE=91=E6=8A=A5=E9=94=80?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=BAserializeArray=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E3=80=82=20=20=20=20=20=20=20=20=20=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9A=E6=8A=A5=E9=94=80=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8A=A5=E9=94=80=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E3=80=82?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=B9=E4=B8=BA=E6=8A=A5=E9=94=80=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 。 --- .../system/controller/BaseExpenseAccountController.java | 8 +++++++- .../service/impl/BaseExpenseAccountServiceImpl.java | 7 ++++++- .../main/resources/templates/financial/expense/edit.html | 2 +- .../resources/templates/financial/expense/expense.html | 5 +++-- .../templates/system/baseExpense/baseExpense.html | 4 ++-- .../resources/templates/system/baseExpense/detail.html | 6 +++++- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java index 575c9034..c6187605 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java @@ -252,7 +252,13 @@ public class BaseExpenseAccountController extends BaseController @ResponseBody public AjaxResult editSave(@RequestBody BaseExpenseAccount baseExpenseAccount) { - return toAjax(baseExpenseAccountService.updateBaseExpenseAccount(baseExpenseAccount)); + baseExpenseAccount.setCreateBy(ShiroUtils.getLoginName()); + baseExpenseAccount.setUseStatus("0"); + baseExpenseAccount.setAuditStatus("0"); + baseExpenseAccount.setFinanceAuditStatus("0"); + baseExpenseAccount.setManagerAuditStatus("0"); + baseExpenseAccountService.submitApply(baseExpenseAccount); + return AjaxResult.success(); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java index fd8c9b9a..a0917d9c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java @@ -306,6 +306,7 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService } + /** * 提交申请 * @param baseExpenseAccount @@ -317,11 +318,15 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService SysUser user = ShiroUtils.getSysUser(); baseExpenseAccount.setApplyUser(user.getLoginName()); baseExpenseAccount.setApplyTime(DateUtils.getNowDate()); + String applyTitle = ""; if (baseExpenseAccount.getExpenseId() == null || baseExpenseAccount.getExpenseId() == 0){ insertBaseExpenseAccount(baseExpenseAccount); + applyTitle = user.getUserName()+"发起了报销单提交审批-"+DateUtils.dateTimeNow(); + }else{ + updateBaseExpenseAccount(baseExpenseAccount); + applyTitle = user.getUserName()+"发起了报销单修改提交审批-"+DateUtils.dateTimeNow(); } // 启动流程 - String applyTitle = user.getUserName()+"发起了报销单提交审批-"+DateUtils.dateTimeNow(); String instanceType = "submit"; ProcessInstance processInstance = startProcessInstance(applyTitle,instanceType,baseExpenseAccount, user); String processInstanceId = processInstance.getProcessInstanceId(); diff --git a/ruoyi-admin/src/main/resources/templates/financial/expense/edit.html b/ruoyi-admin/src/main/resources/templates/financial/expense/edit.html index 6b32183c..1d5dbb4d 100644 --- a/ruoyi-admin/src/main/resources/templates/financial/expense/edit.html +++ b/ruoyi-admin/src/main/resources/templates/financial/expense/edit.html @@ -91,7 +91,7 @@