diff --git a/common/common-generator/src/main/java/apelet/common/generator/model/OnlCgreportItem.java b/common/common-generator/src/main/java/apelet/common/generator/model/OnlCgreportItem.java index 2f45d4f..2122df1 100644 --- a/common/common-generator/src/main/java/apelet/common/generator/model/OnlCgreportItem.java +++ b/common/common-generator/src/main/java/apelet/common/generator/model/OnlCgreportItem.java @@ -59,6 +59,9 @@ public class OnlCgreportItem extends BaseModel implements Serializable { @Schema(description = "是否下拉显示 0否,1显示") private Integer isSelectShow; + @Schema(description = "是否下拉查询 0否,1是") + private Integer isSelectQuery; + @Schema(description = "排序") private Integer orderNum; diff --git a/common/common-generator/src/main/java/apelet/common/generator/service/impl/OnlCgreportHeadServiceImpl.java b/common/common-generator/src/main/java/apelet/common/generator/service/impl/OnlCgreportHeadServiceImpl.java index 3139ddb..4a5ba1c 100644 --- a/common/common-generator/src/main/java/apelet/common/generator/service/impl/OnlCgreportHeadServiceImpl.java +++ b/common/common-generator/src/main/java/apelet/common/generator/service/impl/OnlCgreportHeadServiceImpl.java @@ -9,11 +9,15 @@ import apelet.common.eas.service.impl.EASSyncService; import apelet.common.generator.dao.OnlCgreportHeadMapper; import apelet.common.generator.dto.OnlCgreportHeadDto; import apelet.common.generator.dto.SQLParseDto; -import apelet.common.generator.model.*; -import apelet.common.generator.service.*; +import apelet.common.generator.model.OnlCgreportHead; +import apelet.common.generator.model.OnlCgreportItem; +import apelet.common.generator.model.OnlCgreportParam; +import apelet.common.generator.service.IOnlCgreportHeadService; +import apelet.common.generator.service.IOnlCgreportItemService; +import apelet.common.generator.service.IOnlCgreportParamService; +import apelet.common.generator.service.IOnlFormHeadService; import apelet.common.generator.utils.CompareType; import apelet.common.generator.vo.OnlFormHeadVo2; - import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.druid.sql.SQLUtils; @@ -424,7 +428,13 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl selectQuery = all.stream().filter(f -> f.getIsSelectQuery().equals(1)).collect(Collectors.toList()); + selectQuery.forEach(f -> { + where.put(f.getFieldName(), jsonObject.get("searchKeyword")); + }); + } + jsonObject.remove("isSelectQuery");//移除 if (null != jsonObject) { for (OnlCgreportItem item : queryList) { String fieldName = item.getFieldName();