Forráskód Böngészése

查询规则维护下拉获取表字段信息加入表名称(中文查询条件)

zhanghang 3 éve
szülő
commit
272ab7ed20

+ 2 - 1
daqe-center/src/main/java/com/lantone/daqe/facade/ColumnVerifyManagementFacade.java

@@ -125,7 +125,8 @@ public class ColumnVerifyManagementFacade {
     public List<GetColumnNameDTO> getColumnName(GetColumnNameVO getColumnNameVO) {
         List<ColumnInfo> columnInfoList = columnInfoFacade.getBaseMapper().selectList(new QueryWrapper<ColumnInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("table_ename",getColumnNameVO.getTableEname())
+                .eq(StringUtil.isNotBlank(getColumnNameVO.getTableEname()),"table_ename",getColumnNameVO.getTableEname())
+                .eq(StringUtil.isNotBlank(getColumnNameVO.getTableCname()),"table_cname",getColumnNameVO.getTableCname())
                 .like(StringUtil.isNotBlank(getColumnNameVO.getColumnCname()), "column_cname", getColumnNameVO.getColumnCname())
                 .like(StringUtil.isNotBlank(getColumnNameVO.getColumnEname()), "column_ename", getColumnNameVO.getColumnEname())
                 .groupBy("column_cname", "column_ename")

+ 4 - 1
daqe-center/src/main/java/com/lantone/daqe/vo/GetColumnNameVO.java

@@ -19,9 +19,12 @@ public class GetColumnNameVO implements Serializable {
 
     private static final long serialVersionUID = 5838762135714290423L;
 
-    @ApiModelProperty(value = "表名称(英文)", required = true)
+    @ApiModelProperty(value = "表名称(英文)")
     private String tableEname;
 
+    @ApiModelProperty(value = "表名称(英文)")
+    private String tableCname;
+
     @ApiModelProperty(value = "字段名称(中文)")
     private String columnCname;