From 5180a58133de1cf3eb20709053609b39a2952f8a Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Thu, 8 Aug 2024 19:51:55 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=85=AC?=
=?UTF-8?q?=E5=8F=B8=E6=88=90=E6=9C=AC=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/ruoyi/financial/domain/CompanyCost.java | 16 ++++++++++------
.../financial/companyCost/companyCost.html | 3 +++
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/CompanyCost.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/CompanyCost.java
index f03f25a2..6bb3f6ee 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/CompanyCost.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/CompanyCost.java
@@ -1,6 +1,8 @@
package com.ruoyi.financial.domain;
import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -31,9 +33,7 @@ public class CompanyCost extends BaseEntity
@Excel(name = "月份")
private Long costMonth;
- /** 经营成本 */
- @Excel(name = "经营成本")
- private Long operatingCosts;
+
/** 工资费用 */
@Excel(name = "工资费用")
@@ -55,9 +55,9 @@ public class CompanyCost extends BaseEntity
@Excel(name = "其他费用")
private BigDecimal ohterExpenses;
- /** 业务成本 */
- @Excel(name = "业务成本")
- private BigDecimal businessCost;
+ /** 经营成本 */
+ @Excel(name = "经营成本合计")
+ private Long operatingCosts;
/** 运输费用 */
@Excel(name = "运输费用")
@@ -83,6 +83,10 @@ public class CompanyCost extends BaseEntity
@Excel(name = "业务提成")
private BigDecimal businessCommission;
+ /** 业务成本 */
+ @Excel(name = "业务成本合计")
+ private BigDecimal businessCost;
+
public void setId(Long id)
{
this.id = id;
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 67c2305d..10240f2a 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html
@@ -44,6 +44,9 @@
添加
+
+ 导出
+