Browse Source

feat(generator): 添加下拉查询功能支持

- 在 OnlCgreportItem 模型中新增 isSelectQuery 字段用于控制下拉查询
- 修改 OnlCgreportHeadServiceImpl 实现类中的导入语句,优化代码结构
- 实现动态查询逻辑,当启用下拉查询时根据 searchKeyword 进行字段匹配
- 添加对 selectQuery 类型字段的过滤和关键词映射处理
- 清理临时查询参数,确保数据处理的准确性
feature/2026-07-ccc-dev
chenchuchuan 2 weeks ago
parent
commit
2945a0f428
  1. 3
      common/common-generator/src/main/java/apelet/common/generator/model/OnlCgreportItem.java
  2. 18
      common/common-generator/src/main/java/apelet/common/generator/service/impl/OnlCgreportHeadServiceImpl.java

3
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显示") @Schema(description = "是否下拉显示 0否,1显示")
private Integer isSelectShow; private Integer isSelectShow;
@Schema(description = "是否下拉查询 0否,1是")
private Integer isSelectQuery;
@Schema(description = "排序") @Schema(description = "排序")
private Integer orderNum; private Integer orderNum;

18
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.dao.OnlCgreportHeadMapper;
import apelet.common.generator.dto.OnlCgreportHeadDto; import apelet.common.generator.dto.OnlCgreportHeadDto;
import apelet.common.generator.dto.SQLParseDto; import apelet.common.generator.dto.SQLParseDto;
import apelet.common.generator.model.*; import apelet.common.generator.model.OnlCgreportHead;
import apelet.common.generator.service.*; 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.utils.CompareType;
import apelet.common.generator.vo.OnlFormHeadVo2; import apelet.common.generator.vo.OnlFormHeadVo2;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.SQLUtils;
@ -424,7 +428,13 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
JSONObject f7Params = jsonObject.getJSONObject("self__f7Params"); JSONObject f7Params = jsonObject.getJSONObject("self__f7Params");
jsonObject.remove("self__f7Params");//移除 jsonObject.remove("self__f7Params");//移除
if (jsonObject.getBooleanValue("isSelectQuery") && jsonObject.containsKey("searchKeyword")) {
List<OnlCgreportItem> 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) { if (null != jsonObject) {
for (OnlCgreportItem item : queryList) { for (OnlCgreportItem item : queryList) {
String fieldName = item.getFieldName(); String fieldName = item.getFieldName();

Loading…
Cancel
Save