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 @@ + +
-

公司成本

+

添加公司成本

- +
- +
- +
- +
@@ -44,40 +35,40 @@

经营成本

- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -90,45 +81,47 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
+ + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html index ef43ca5b..67c2305d 100644 --- a/ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html +++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html @@ -19,7 +19,7 @@
  • - + + +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + + +
    +

    经营成本

    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + + +
    +

    业务成本

    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/financial/companyCost/edit.html b/ruoyi-admin/src/main/resources/templates/financial/companyCost/edit.html index 0b3c38f2..3f2164dc 100644 --- a/ruoyi-admin/src/main/resources/templates/financial/companyCost/edit.html +++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/edit.html @@ -1,25 +1,26 @@ - +
    - +
    - +
    - +
    - +
    - +
    @@ -31,42 +32,42 @@
    -
    +

    经营成本

    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -74,45 +75,45 @@

    业务成本

    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -122,9 +123,28 @@