Browse Source

元数据标签计算配置

master
xueyinfei 2 weeks ago
parent
commit
682c780b6d
  1. 4
      vue-fastapi-backend/module_admin/dao/meta_dao.py
  2. 2
      vue-fastapi-backend/module_admin/service/approval_service.py
  3. 13
      vue-fastapi-frontend/src/views/system/flow/index.vue

4
vue-fastapi-backend/module_admin/dao/meta_dao.py

@ -419,8 +419,8 @@ class MetaDao:
@classmethod
async def get_meta_col_supp_vett(cls, table: MetadataSuppInfoVett, db: AsyncSession):
sql_query = text("select max(apply_time) from t_metadata_fld_supp_info_vett where ssys_id ='" + table.ssys_id +
"' and mdl_name = '" + table.mdl_name + "' and tab_eng_name = '" + table.tab_eng_name +
sql_query = text("select max(apply_time) from t_metadata_fld_supp_info_vett where ssys_id =" + str(table.ssys_id) +
" and mdl_name = '" + table.mdl_name + "' and tab_eng_name = '" + table.tab_eng_name +
"'")
maxTime = (await db.execute(sql_query)).scalar()

2
vue-fastapi-backend/module_admin/service/approval_service.py

@ -131,7 +131,7 @@ class ApprovalService:
await MetaDao.insertMetadataFldSuppInfo(column, result_db)
else:
await MetaDao.updateMetadataFldSuppInfo(suppColumn.onum, column, result_db)
suppTable = await MetaDao.get_supp_table_by_vett(table.ssys_cd, table.mdl_name, table.tab_eng_name, result_db)
suppTable = await MetaDao.get_supp_table_by_vett(table.ssys_id, table.mdl_name, table.tab_eng_name, result_db)
await MetaDao.updateMetadataSuppInfoVett(table.onum, operateType, result_db)
if operateType != 'canceled':
if suppTable is None:

13
vue-fastapi-frontend/src/views/system/flow/index.vue

@ -563,16 +563,18 @@ import DataStdMainTable from '@/views/system/flow/dataStdMainAppr.vue'; // 路
import DataStdDictTable from '@/views/system/flow/dataStdDictAppr.vue'; //
import DataStdCodeTable from '@/views/system/flow/dataStdCodeAppr.vue'; //
import DataAssetMainAppr from "@/views/system/flow/dataAssetMainAppr.vue"; //
import { ref, nextTick, computed, watch, reactive, onMounted } from 'vue'
import cache from "../../../plugins/cache.js";
import {Graph} from "@antv/x6";
import useUserStore from "@/store/modules/user.js";
const userStore = useUserStore(); //
const dsSysList = userStore.dsSysList; // 访
const stdMainVisible = ref(false);
const stdDictVisible = ref(false);
const stdCodeVisible = ref(false);
const dataAssetMainVisible = ref(false);
const { proxy } = getCurrentInstance();
import { ref, nextTick, computed, watch, reactive, onMounted } from 'vue'
import cache from "../../../plugins/cache.js";
import {Graph} from "@antv/x6";
const flowTab = ref('waiting')
const selectedFlowId = ref('');
@ -884,6 +886,7 @@ function showBusinessDataDialog(row){
}
table.showTabClas = showOldTabClas
oldTableInfo.value = JSON.parse(JSON.stringify(table))
oldTableInfo.value.ssysCd = dsSysList.find(item => item.id === oldTableInfo.value.ssysId)?.name
newTableInfo.value = {
applyStatus:data.table.applyStatus,
applyTime:data.table.applyTime,
@ -894,7 +897,7 @@ function showBusinessDataDialog(row){
pic:data.table.pic,
recStat:data.table.recStat,
recSubmPrsn:data.table.recSubmPrsn,
ssysCd:data.table.ssysCd,
ssysCd:dsSysList.find(item => item.id === data.table.ssysId)?.name,
tabClas:data.table.tabClas,
tabCrrctName:data.table.tabCrrctName,
tabDesc:data.table.tabDesc,

Loading…
Cancel
Save