diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java index 7e0fe2e..35e2585 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java @@ -126,4 +126,8 @@ public class SysOaFinance extends BaseEntity { private Long status; //签约公司 private String signingCompany; + + + //cost_category varchar(32) 成本分类 + private String costCategory; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java index c721f63..f5789de 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java @@ -142,4 +142,7 @@ public class SysOaFinanceBo extends BaseEntity { //签约公司 private String signingCompany; + //cost_category varchar(32) 成本分类 + private String costCategory; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java index 1d19451..17f4c5a 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java @@ -171,4 +171,8 @@ public class SysOaFinanceVo extends SysOaFinance { private String signingCompany; + //cost_category varchar(32) 成本分类 + private String costCategory; + + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java index 7eb6c7c..d98593d 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java @@ -94,6 +94,7 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService { //前端设定了projectId的值为0和1,0:非项目进出账(添加时候默认为0),1:项目进出账(项目的id是数字串整数,添加时候该字段存储;gt大于0表示项目字段值 lqw.eq(ObjectUtil.isNotNull(bo.getProjectId()), "sof.project_id", bo.getProjectId()); lqw.eq(StringUtils.isNotBlank(bo.getFinanceType()), "sof.finance_type", bo.getFinanceType()); + lqw.eq(StringUtils.isNotBlank(bo.getCostCategory()), "sof.cost_category", bo.getCostCategory()); lqw.orderByDesc("sof.create_time"); return lqw; } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml index a5e9d9d..1712b92 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml @@ -83,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.detail_id, b.detail_title, sof.out_type, + sof.cost_category, b.price, b.big_price, b.remark as detail_remark, @@ -115,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sof.update_by, sof.update_time, sof.out_type, + sof.cost_category, b.detail_id, b.detail_title, b.price, @@ -152,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sof.update_by, sof.update_time, sof.out_type, + sof.cost_category, b.detail_id, b.detail_title, b.price,