From d77166f2852d1b3f75197592bf164737a7acfe4e Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Wed, 7 Aug 2024 19:49:37 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=85=AC=E5=8F=B8=E6=88=90=E6=9C=AC?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=85=AC=E5=8F=B8=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E6=96=B0=E5=A2=9E=E5=85=AC=E5=8F=B8=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9A=E5=B9=B4=E6=9C=88=E5=AD=98=E5=9C=A8=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=89=8D=E7=AB=AF=E6=A3=80=E6=B5=8B=EF=BC=8C=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=B9=B4=E6=9C=88=E6=B7=BB=E5=8A=A0=E5=94=AF=E4=B8=80?= =?UTF-8?q?=EF=BC=8C=20=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E7=BC=96=E5=8F=B7=E7=94=9F=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BAredisCache.generateNo("CB"=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=A6=82:CB001=E3=80=81CB002=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E6=B5=81=E7=A8=8B=E5=8F=B7=E7=94=9F=E6=88=90=E3=80=82?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9:=E5=85=AC=E5=8F=B8=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CompanyCostController.java | 15 +- .../service/ICompanyCostService.java | 2 +- .../service/impl/CompanyCostServiceImpl.java | 5 +- .../templates/financial/companyCost/add.html | 88 ++++++------ .../financial/companyCost/companyCost.html | 9 +- .../financial/companyCost/detail.html | 132 ++++++++++++++++++ .../templates/financial/companyCost/edit.html | 86 +++++++----- 7 files changed, 252 insertions(+), 85 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/financial/companyCost/detail.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/CompanyCostController.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/CompanyCostController.java index 14cd6eee..05b86087 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/CompanyCostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/controller/CompanyCostController.java @@ -96,6 +96,19 @@ public class CompanyCostController extends BaseController return prefix + "/edit"; } + /** + * 公司成本详情 + * @param id + * @param mmap + * @return + */ + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") Long id, ModelMap mmap) + { + CompanyCost companyCost = companyCostService.selectCompanyCostById(id); + mmap.put("companyCost", companyCost); + return prefix + "/detail"; + } /** * 修改保存公司成本 */ @@ -148,7 +161,7 @@ public class CompanyCostController extends BaseController @RequiresPermissions("financial:companyCost:add") @PostMapping( "/checkCompanyCostByYearMonth") @ResponseBody - public Integer checkCompanyCostByYearMonth(CompanyCost companyCost) + public String checkCompanyCostByYearMonth(CompanyCost companyCost) { return companyCostService.checkCompanyByYearMonth(companyCost); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/ICompanyCostService.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/ICompanyCostService.java index 4f0810eb..8d3b0deb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/ICompanyCostService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/ICompanyCostService.java @@ -100,5 +100,5 @@ public interface ICompanyCostService * @return */ - int checkCompanyByYearMonth(CompanyCost companyCost); + String checkCompanyByYearMonth(CompanyCost companyCost); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/CompanyCostServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/CompanyCostServiceImpl.java index 5a2b2b7c..210dfb18 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/CompanyCostServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/CompanyCostServiceImpl.java @@ -70,6 +70,7 @@ public class CompanyCostServiceImpl implements ICompanyCostService companyCost.setCreateTime(DateUtils.getNowDate()); String loginName = ShiroUtils.getLoginName(); companyCost.setCreateBy(loginName); + companyCost.setCtcId(redisCache.generateNo("CB")); return companyCostMapper.insertCompanyCost(companyCost); } @@ -147,8 +148,8 @@ public class CompanyCostServiceImpl implements ICompanyCostService } @Override - public int checkCompanyByYearMonth(CompanyCost companyCost) { + public String checkCompanyByYearMonth(CompanyCost companyCost) { int count = companyCostMapper.checkCompanyByYearMonth(companyCost); - return count > 0 ? 1 : 0; + return count > 0 ? "1" : "0"; } } diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/add.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/add.html index f739fba6..9eb137df 100644 --- a/ruoyi-admin/src/main/resources/templates/financial/companyCost/add.html +++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/add.html @@ -2,34 +2,25 @@