diff --git a/vue-fastapi-backend/module_admin/dao/meta_dao.py b/vue-fastapi-backend/module_admin/dao/meta_dao.py index 5508d68..7262eea 100644 --- a/vue-fastapi-backend/module_admin/dao/meta_dao.py +++ b/vue-fastapi-backend/module_admin/dao/meta_dao.py @@ -126,7 +126,7 @@ class MetaDao: MetadataExtractInfo.tab_eng_name == MetadataFldSuppInfo.tab_eng_name ), isouter=True) .where( - MetadataExtractInfo.ssys_id == query_object.ssys_id if query_object.ssys_id else True, + MetadataExtractInfo.ssys_id == query_object.ssys_id if query_object.ssys_id and query_object.ssys_id != -1 else True, MetadataExtractInfo.mdl_name == query_object.mdl_name if query_object.mdl_name else True, or_(MetadataExtractInfo.tab_eng_name.like(f'%{query_object.tab_name}%'), MetadataExtractInfo.tab_cn_name.like(f'%{query_object.tab_name}%'), diff --git a/vue-fastapi-backend/module_admin/entity/do/meta_do.py b/vue-fastapi-backend/module_admin/entity/do/meta_do.py index fd86cde..e7e8de3 100644 --- a/vue-fastapi-backend/module_admin/entity/do/meta_do.py +++ b/vue-fastapi-backend/module_admin/entity/do/meta_do.py @@ -107,9 +107,9 @@ class MetadataFldTabExtractInfo(Base): fld_eng_name = Column(String(255, collation='utf8_general_ci'), comment='字段英文名称') fld_cn_name = Column(String(255, collation='utf8_general_ci'), comment='字段中文名称') fld_type = Column(String(50, collation='utf8_general_ci'), comment='字段类型') - pk_flag = Column(Boolean, default=False, comment='是否为主键') # 待确认字段类型 - require_flag = Column(Boolean, default=False, comment='是否必填') - idx_flag = Column(Boolean, default=False, comment='是否为索引') + pk_flag = Column(String(50, collation='utf8_general_ci'), comment='是否为主键') # 待确认字段类型 + require_flag = Column(String(50, collation='utf8_general_ci'), comment='是否必填') + idx_flag = Column(String(50, collation='utf8_general_ci'), comment='是否为索引') upd_time = Column(DateTime, comment='更新时间') diff --git a/vue-fastapi-backend/module_admin/service/meta_service.py b/vue-fastapi-backend/module_admin/service/meta_service.py index 0ebd0e4..f166fc5 100644 --- a/vue-fastapi-backend/module_admin/service/meta_service.py +++ b/vue-fastapi-backend/module_admin/service/meta_service.py @@ -578,7 +578,7 @@ class MetaService: '对象英文名': 'tab_eng_name', '补录对象名称': 'tab_crrct_name', '补录对象描述': 'tab_desc', - '负责人': 'rec_subm_prsn' + '负责人': 'pic' } column_header_dict = { '系统代码': 'ssys_cd', @@ -664,7 +664,7 @@ class MetaService: if overWrite: suppTableInfo.tab_crrct_name = row['tab_crrct_name'] suppTableInfo.tab_desc = row['tab_desc'] - suppTableInfo.rec_subm_prsn = row['rec_subm_prsn'] + suppTableInfo.rec_subm_prsn = row['pic'] else: suppTableInfo.tab_crrct_name = row['tab_crrct_name'] if row['tab_crrct_name'] and \ str(row[ @@ -672,10 +672,10 @@ class MetaService: suppTableInfo.tab_desc = row['tab_desc'] if row['tab_desc'] and \ str(row[ 'tab_desc']).strip() != '' else oldTable.tab_desc if oldTable else None - suppTableInfo.rec_subm_prsn = row['rec_subm_prsn'] if row['rec_subm_prsn'] and \ - str(row[ - 'rec_subm_prsn']).strip() != '' else oldTable.rec_subm_prsn if oldTable else None - suppTableInfo.pic = oldTable.pic if oldTable else None + suppTableInfo.rec_subm_prsn = row['pic'] if row['pic'] and \ + str(row[ + 'pic']).strip() != '' else oldTable.pic if oldTable else None + suppTableInfo.rec_subm_prsn = current_user.user.user_name suppTableInfo.gov_flag = oldTable.gov_flag if oldTable else None suppTableInfo.tab_clas = oldTable.tab_clas if oldTable else None suppTableInfo.apply_time = applyTime @@ -748,8 +748,8 @@ class MetaService: suppColumnInfo.fld_eng_name = row['fld_eng_name'] if overWrite: suppColumnInfo.fld_crrct_name = row['fld_crrct_name'] - suppColumnInfo.crrct_pk_flag = True if row['crrct_pk_flag'] and row[ - 'crrct_pk_flag'] == '是' else False + suppColumnInfo.crrct_pk_flag = 'Y' if row['crrct_pk_flag'] and row[ + 'crrct_pk_flag'] == '是' else 'N' suppColumnInfo.fld_desc = row['fld_desc'] suppColumnInfo.data_sec_lvl = row['data_sec_lvl'] suppColumnInfo.data_dict_id = dataDictId if dataDictId != '' else None diff --git a/vue-fastapi-frontend/src/views/meta/metaInfo/businssRelation.vue b/vue-fastapi-frontend/src/views/meta/metaInfo/businssRelation.vue index 5fff5a8..b8c938e 100644 --- a/vue-fastapi-frontend/src/views/meta/metaInfo/businssRelation.vue +++ b/vue-fastapi-frontend/src/views/meta/metaInfo/businssRelation.vue @@ -317,7 +317,7 @@ function initG6() { let currentTableLabel = props.currentTable.tabEngName if (props.currentTable.tabCnName && props.currentTable.tabCnName.length>0){ currentTableLabel += "("+props.currentTable.tabCnName+")" - }else if (props.currentTable.tabCrrctName && props.currentTable.tabCnName.tabCrrctName>0){ + }else if (props.currentTable.tabCrrctName && props.currentTable.tabCrrctName.length>0){ currentTableLabel += "("+props.currentTable.tabCrrctName+")" } const list = attrs; diff --git a/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue b/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue index b44fe6f..f1e1c9e 100644 --- a/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue +++ b/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue @@ -27,7 +27,7 @@ - + + + + @@ -261,20 +270,20 @@ @@ -285,7 +294,8 @@ @@ -298,11 +308,11 @@ - - - + + + + +