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