From be3471de0b3679912a47a0afed6446d931b0b738 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 26 May 2020 14:40:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/FunctionDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/FunctionEntity.java | 5 +++++ .../src/main/java/com/epmet/excel/FunctionExcel.java | 3 +++ .../java/com/epmet/service/impl/FunctionServiceImpl.java | 8 +++++++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionDTO.java index c126791cb7..9b581662e4 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/FunctionDTO.java @@ -43,6 +43,11 @@ public class FunctionDTO implements Serializable { */ private String functionName; + /** + * 功能图标 + */ + private String functionIcon; + /** * 功能类型：0.默认功能，1.定制功能 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionEntity.java index 19cc3939b8..33c8431792 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionEntity.java @@ -43,6 +43,11 @@ public class FunctionEntity extends BaseEpmetEntity { */ private String functionName; + /** + * 功能图标 + */ + private String functionIcon; + /** * 功能类型：0.默认功能，1.定制功能 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/FunctionExcel.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/FunctionExcel.java index ad9fd88ba6..d09dd51a35 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/FunctionExcel.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/FunctionExcel.java @@ -37,6 +37,9 @@ public class FunctionExcel { @Excel(name = "功能名称") private String functionName; + @Excel(name = "功能图标") + private String functionIcon; + @Excel(name = "功能类型：0.默认功能，1.定制功能") private Integer functionGroup; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java index cf46526f8a..65631c1b65 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java @@ -68,9 +68,15 @@ public class FunctionServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String functionName = (String)params.get("functionName"); + String functionGroup = (String)params.get("functionGroup"); + String shoppingStatus = (String)params.get("shoppingStatus"); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) + .like(StringUtils.isNotBlank(functionName), "FUNCTION_NAME", functionName) + .eq(StringUtils.isNotBlank(functionGroup), "FUNCTION_GROUP", functionGroup) + .eq(StringUtils.isNotBlank(shoppingStatus), "SHOPPING_STATUS", shoppingStatus); return wrapper; }