From f278056c80420f3a12a3ea3ed7a8d5b7b0cf6d06 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 24 Sep 2025 10:47:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=B7=BB=E5=8A=A0=E6=94=B6?=
=?UTF-8?q?=E5=85=A5=E6=94=AF=E5=87=BA=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96Excel=E5=AF=BC=E5=87=BA=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在GearOtherIncome实体类中新增type字段用于区分收入或支出
- 更新GearOtherIncomeBo业务对象，同步添加type字段- 修改GearOtherIncomeMapper.xml，增加type字段的映射配置- 在GearOtherIncomeServiceImpl中添加type字段的查询条件支持
- 优化GearOtherIncomeVo视图对象中Excel导出的列名显示
- 简化Excel表头名称，提升可读性：其他收入ID→ID、收入日期→日期等
- 在Excel导出配置中保留主键标识的转换表达式
- 统一金额相关字段在Excel中的展示格式
-为新添加的type字段在VO层添加注释说明用途
---
.../java/com/gear/oa/domain/GearOtherIncome.java | 3 +++
.../com/gear/oa/domain/bo/GearOtherIncomeBo.java | 2 ++
.../com/gear/oa/domain/vo/GearOtherIncomeVo.java | 14 ++++++++------
.../service/impl/GearOtherIncomeServiceImpl.java | 1 +
.../resources/mapper/oa/GearOtherIncomeMapper.xml | 1 +
5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/GearOtherIncome.java b/gear-oa/src/main/java/com/gear/oa/domain/GearOtherIncome.java
index 8fd62ec..a730b33 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/GearOtherIncome.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/GearOtherIncome.java
@@ -56,4 +56,7 @@ public class GearOtherIncome extends BaseEntity {
@TableLogic
private Integer delFlag;
+ // 收入还是支出
+ private Integer type;
+
}
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOtherIncomeBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOtherIncomeBo.java
index d37d24a..b368c44 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOtherIncomeBo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearOtherIncomeBo.java
@@ -51,6 +51,8 @@ public class GearOtherIncomeBo extends BaseEntity {
* 收入来源
*/
private String source;
+ // 收入还是支出
+ private Integer type;
/**
* 备注
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOtherIncomeVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOtherIncomeVo.java
index f8e1f21..9e5174c 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOtherIncomeVo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearOtherIncomeVo.java
@@ -29,14 +29,14 @@ public class GearOtherIncomeVo {
/**
* 其他收入ID（主键）
*/
- @ExcelProperty(value = "其他收入ID", converter = ExcelDictConvert.class)
- @ExcelDictFormat(readConverterExp = "主=键")
+ @ExcelProperty(value = "ID", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(readConverterExp = "主键")
private Long otherIncomeId;
/**
* 收入日期
*/
- @ExcelProperty(value = "收入日期")
+ @ExcelProperty(value = "日期")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date incomeDate;
@@ -44,19 +44,19 @@ public class GearOtherIncomeVo {
/**
* 收入类型
*/
- @ExcelProperty(value = "收入类型")
+ @ExcelProperty(value = "类型")
private String incomeType;
/**
* 收入金额
*/
- @ExcelProperty(value = "收入金额")
+ @ExcelProperty(value = "金额")
private BigDecimal amount;
/**
* 收入来源
*/
- @ExcelProperty(value = "收入来源")
+ @ExcelProperty(value = "来源")
private String source;
/**
@@ -65,5 +65,7 @@ public class GearOtherIncomeVo {
@ExcelProperty(value = "备注")
private String remark;
+ // 收入还是支出
+ private Integer type;
}
diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearOtherIncomeServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearOtherIncomeServiceImpl.java
index d1954cb..7049f4f 100644
--- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearOtherIncomeServiceImpl.java
+++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearOtherIncomeServiceImpl.java
@@ -65,6 +65,7 @@ public class GearOtherIncomeServiceImpl implements IGearOtherIncomeService {
lqw.eq(StringUtils.isNotBlank(bo.getIncomeType()), GearOtherIncome::getIncomeType, bo.getIncomeType());
lqw.eq(bo.getAmount() != null, GearOtherIncome::getAmount, bo.getAmount());
lqw.eq(StringUtils.isNotBlank(bo.getSource()), GearOtherIncome::getSource, bo.getSource());
+ lqw.eq(bo.getType()!=null, GearOtherIncome::getType, bo.getType());
return lqw;
}
diff --git a/gear-oa/src/main/resources/mapper/oa/GearOtherIncomeMapper.xml b/gear-oa/src/main/resources/mapper/oa/GearOtherIncomeMapper.xml
index 516bdbf..3396f16 100644
--- a/gear-oa/src/main/resources/mapper/oa/GearOtherIncomeMapper.xml
+++ b/gear-oa/src/main/resources/mapper/oa/GearOtherIncomeMapper.xml
@@ -10,6 +10,7 @@
+