diff --git a/klp-cost/src/main/java/com/klp/cost/domain/CostItem.java b/klp-cost/src/main/java/com/klp/cost/domain/CostItem.java index c8f8bb3e..fcbc32c0 100644 --- a/klp-cost/src/main/java/com/klp/cost/domain/CostItem.java +++ b/klp-cost/src/main/java/com/klp/cost/domain/CostItem.java @@ -44,6 +44,10 @@ public class CostItem extends BaseEntity { * 备注 */ private String remark; + /** + * 查询条件(JSON格式) + */ + private String queryCondition; /** * 删除标识 0=正常 2=删除 */ diff --git a/klp-cost/src/main/java/com/klp/cost/domain/bo/CostItemBo.java b/klp-cost/src/main/java/com/klp/cost/domain/bo/CostItemBo.java index f1cc05dc..25d1cf3b 100644 --- a/klp-cost/src/main/java/com/klp/cost/domain/bo/CostItemBo.java +++ b/klp-cost/src/main/java/com/klp/cost/domain/bo/CostItemBo.java @@ -47,5 +47,10 @@ public class CostItemBo extends BaseEntity { */ private String remark; + /** + * 查询条件(JSON格式) + */ + private String queryCondition; + } diff --git a/klp-cost/src/main/java/com/klp/cost/domain/vo/CostItemVo.java b/klp-cost/src/main/java/com/klp/cost/domain/vo/CostItemVo.java index c2f29d4c..d7aa837e 100644 --- a/klp-cost/src/main/java/com/klp/cost/domain/vo/CostItemVo.java +++ b/klp-cost/src/main/java/com/klp/cost/domain/vo/CostItemVo.java @@ -55,5 +55,11 @@ public class CostItemVo { @ExcelProperty(value = "备注") private String remark; + /** + * 查询条件(JSON格式) + */ + @ExcelProperty(value = "查询条件(JSON格式)") + private String queryCondition; + } diff --git a/klp-cost/src/main/java/com/klp/cost/service/impl/CostItemServiceImpl.java b/klp-cost/src/main/java/com/klp/cost/service/impl/CostItemServiceImpl.java index 437ff716..ff2bb8d4 100644 --- a/klp-cost/src/main/java/com/klp/cost/service/impl/CostItemServiceImpl.java +++ b/klp-cost/src/main/java/com/klp/cost/service/impl/CostItemServiceImpl.java @@ -65,6 +65,7 @@ public class CostItemServiceImpl implements ICostItemService { lqw.like(StringUtils.isNotBlank(bo.getItemName()), CostItem::getItemName, bo.getItemName()); lqw.eq(StringUtils.isNotBlank(bo.getCategory()), CostItem::getCategory, bo.getCategory()); lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CostItem::getUnit, bo.getUnit()); + lqw.eq(StringUtils.isNotBlank(bo.getQueryCondition()), CostItem::getQueryCondition, bo.getQueryCondition()); return lqw; } diff --git a/klp-cost/src/main/resources/mapper/cost/CostItemMapper.xml b/klp-cost/src/main/resources/mapper/cost/CostItemMapper.xml index fe2965c4..c2b63d28 100644 --- a/klp-cost/src/main/resources/mapper/cost/CostItemMapper.xml +++ b/klp-cost/src/main/resources/mapper/cost/CostItemMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +