diff --git a/vue-fastapi-backend/module_admin/controller/metadata_config_controller.py b/vue-fastapi-backend/module_admin/controller/metadata_config_controller.py index dbcb44d..9164fa5 100644 --- a/vue-fastapi-backend/module_admin/controller/metadata_config_controller.py +++ b/vue-fastapi-backend/module_admin/controller/metadata_config_controller.py @@ -181,7 +181,7 @@ async def get_biz_config_list_all( return ResponseUtil.success(data=result) @metadataConfigController.post("/bizConfig/add") -@ValidateFields(["bizModule", "configType", "securityLevel", "applyType"]) +@ValidateFields(["bizModule", "configType", "data_sec_lvl", "applyType"]) async def add_biz_config( item: SecuBizConfigAddModel, db: AsyncSession = Depends(get_db), diff --git a/vue-fastapi-backend/module_admin/dao/datastd_dao.py b/vue-fastapi-backend/module_admin/dao/datastd_dao.py index 81a2a0b..6f1f438 100644 --- a/vue-fastapi-backend/module_admin/dao/datastd_dao.py +++ b/vue-fastapi-backend/module_admin/dao/datastd_dao.py @@ -324,6 +324,7 @@ class DataStdDao: DataStdDict.data_dict_eng_name, DataStdDict.data_dict_cn_name, DataStdDict.data_dict_vest, + DataStdDict.data_dict_type, DataStdDict.data_dict_data_type, DataStdDict.src_sys, DataStdDict.src_sys, @@ -796,7 +797,7 @@ class DataStdDao: DataStdMain.data_std_eng_name, DataStdMain.data_std_cn_name, DataStdMain.data_std_type, - DataStdMain.securityLevel, + DataStdMain.data_sec_lvl, DataStdMain.src_sys, DataStdMain.data_std_vest, DataStdMain.data_std_busi_defn, @@ -847,7 +848,7 @@ class DataStdDao: DataStdMain.data_std_eng_name, DataStdMain.data_std_cn_name, DataStdMain.data_std_type, - DataStdMain.securityLevel, + DataStdMain.data_sec_lvl, DataStdMain.src_sys, DataStdMain.data_std_vest, DataStdMain.data_std_busi_defn, diff --git a/vue-fastapi-backend/module_admin/entity/do/datastd_do.py b/vue-fastapi-backend/module_admin/entity/do/datastd_do.py index 45579a6..79cae7d 100644 --- a/vue-fastapi-backend/module_admin/entity/do/datastd_do.py +++ b/vue-fastapi-backend/module_admin/entity/do/datastd_do.py @@ -144,7 +144,7 @@ class DataStdMain(Base): data_std_eng_name = Column(String(50), default=None, comment='标准英文名') data_std_cn_name = Column(String(200), default=None, comment='标准中文名') data_std_type = Column(String(1), default=None, comment='标准类型（0：基础数据 1：指标数据）') - securityLevel = Column(String(1), default=None, comment='安全等级') + data_sec_lvl = Column(String(1), default=None, comment='安全等级') src_sys = Column(String(50), default=None, comment='来源系统') data_std_vest = Column(String(50), default=None, comment='数据标准归属(公司级、系统级)') data_std_busi_defn = Column(String(200), default=None, comment='标准业务定义') @@ -175,7 +175,7 @@ class DataStdMainAppr(Base): data_std_eng_name = Column(String(50), default=None, comment='标准英文名') data_std_cn_name = Column(String(200), default=None, comment='标准中文名') data_std_type = Column(String(1), default=None, comment='标准类型（0：基础数据 1：指标数据）') - securityLevel = Column(String(1), default=None, comment='安全等级') + data_sec_lvl = Column(String(1), default=None, comment='安全等级') src_sys = Column(Integer, default=None, comment='来源系统') data_std_vest = Column(String(50), default=None, comment='数据标准归属(公司级、系统级)') data_std_busi_defn = Column(String(200), default=None, comment='标准业务定义') diff --git a/vue-fastapi-backend/module_admin/entity/vo/datastd_vo.py b/vue-fastapi-backend/module_admin/entity/vo/datastd_vo.py index f0a4312..67108b2 100644 --- a/vue-fastapi-backend/module_admin/entity/vo/datastd_vo.py +++ b/vue-fastapi-backend/module_admin/entity/vo/datastd_vo.py @@ -107,7 +107,7 @@ class DataStdMainModel(BaseModel): data_std_eng_name: Optional[str] = Field(default=None, description='标准英文名') data_std_cn_name: Optional[str] = Field(default=None, description='标准中文名') data_std_type: Optional[str] = Field(default=None, description='标准类型（0：基础数据 1：指标数据）') - securityLevel: Optional[str] = Field(default=None, description='安全等级') + data_sec_lvl: Optional[str] = Field(default=None, description='安全等级') src_sys: Optional[int] = Field(default=None, description='归属系统') data_std_busi_defn: Optional[str] = Field(default=None, description='标准业务定义') cd_id: Optional[str] = Field(default=None, description='代码id') diff --git a/vue-fastapi-backend/module_admin/service/datastd_service.py b/vue-fastapi-backend/module_admin/service/datastd_service.py index 538a15b..7a2cc1b 100644 --- a/vue-fastapi-backend/module_admin/service/datastd_service.py +++ b/vue-fastapi-backend/module_admin/service/datastd_service.py @@ -127,7 +127,7 @@ class DataStdService: try: # 创建新的 page_object 实例，避免修改原始对象 new_page_object = DataStdCodeModel(**page_object.model_dump(by_alias=True)) - new_page_object.cd_val_stat="9" + new_page_object.cd_val_stat="1" # 调用 DAO 方法插入数据 await DataStdDao.add_std_code(query_db, new_page_object) return CrudResponseModel(is_success=True, message='新增标准代码成功') @@ -240,7 +240,7 @@ class DataStdService: std_code_appr.compareId = last_appr.onum std_code_appr.oldInstId = data_std_no.onum std_code_appr.approStatus = "waiting" - std_code_appr.cd_val_stat = "9" + std_code_appr.cd_val_stat = "1" std_code_appr.flowId = flow_id std_code_appr.onum=str(uuid.uuid4()) std_code_appr.create_by = current_user.user.user_name @@ -260,7 +260,7 @@ class DataStdService: appr_item.compareId = last_appr_item.onum appr_item.oldInstId = appr_item.onum appr_item.approStatus = "waiting" - appr_item.cd_val_stat = "9" + appr_item.cd_val_stat = "1" appr_item.flowId = flow_id appr_item.onum=str(uuid.uuid4()) appr_item.create_by = current_user.user.user_name @@ -368,7 +368,7 @@ class DataStdService: appr_model.changeType = "add" appr_model.compareId = code.onum appr_model.oldInstId = code.onum - appr_model.cd_val_stat="9" + appr_model.cd_val_stat="1" appr_model.approStatus = "waiting" appr_model.flowId = str(uuid.uuid4()) # 新生成 Flow ID @@ -632,7 +632,7 @@ class DataStdService: raise ServiceException(message=f"数据字典{page_object.data_dict_no}已存在") # 创建新的 page_object 实例，避免修改原始对象 new_page_object = DataStdDictModel(**page_object.model_dump(by_alias=True)) - new_page_object.data_dict_stat="9" + new_page_object.data_dict_stat="1" new_page_object.onum=str(uuid.uuid4()) # 调用 DAO 方法插入数据 await DataStdDao.add_std_dict(query_db, new_page_object) @@ -1182,7 +1182,7 @@ class DataStdService: if not await cls.check_std_num_unique(query_db, model): raise ServiceException(message=f"标准编号 {model.data_std_no} 已存在") model.onum=str(uuid.uuid4()) - model.std_status="9" + model.std_status="1" model.belt_data_std_content=2 await DataStdDao.add_std_main(query_db, model) return CrudResponseModel(is_success=True, message='新增标准成功') @@ -1203,7 +1203,7 @@ class DataStdService: if not await cls.check_std_num_unique(query_db, model): raise ServiceException(message=f"标准编号 {model.data_std_no} 已存在") model.onum=str(uuid.uuid4()) - model.std_status="9" + model.std_status="1" model.belt_data_std_content=2 # 将 DataStdMainModel 转换为 DataStdMainApprModel，保留字段原始名 apprModel = DataStdMainApprModel(**model.model_dump(exclude_unset=True, by_alias=True)) @@ -1224,7 +1224,7 @@ class DataStdService: if not await cls.check_dict_unique_services(query_db, model): raise ServiceException(message=f"字典编号 {model.data_dict_no} 已存在") model.onum=str(uuid.uuid4()) - model.data_dict_stat="9" + model.data_dict_stat="1" # 将 DataStdMainModel 转换为 DataStdMainApprModel，保留字段原始名 apprModel = DataStdDictApprModel(**model.model_dump(exclude_unset=True, by_alias=True)) apprModel.changeType="add" @@ -1243,7 +1243,7 @@ class DataStdService: async def edit_std_main_appr(cls, query_db: AsyncSession, model: DataStdMainModel): if not await cls.check_std_num_unique(query_db, model): raise ServiceException(message=f"标准编号 {model.data_std_no} 已存在") - model.std_status="9" + model.std_status="1" # 将 DataStdMainModel 转换为 DataStdMainApprModel，保留字段原始名 watingList=await DataStdDao.check_std_main_waiting(model.onum, query_db) @@ -1268,7 +1268,7 @@ class DataStdService: async def edit_std_dict_appr(cls, query_db: AsyncSession, model: DataStdDictModel): if not await cls.check_dict_unique_services(query_db, model): raise ServiceException(message=f"字典编号 {model.c} 已存在") - model.data_dict_stat="9" + model.data_dict_stat="1" watingList=await DataStdDao.check_std_dict_waiting(model.onum, query_db) if len(watingList)>0 : # 如果 watingList 存在，意味着标准正在审批中 diff --git a/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue b/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue index f993c7f..97b9b6c 100644 --- a/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue +++ b/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue @@ -40,13 +40,16 @@ - - + + + - + @@ -314,7 +317,7 @@ const handleSubmit = () => { const res = await api(submitData); if (res.code === 200) { - ElMessage.success(props.isEdit ? '修改成功' : '新增成功'); + ElMessage.success(props.isEdit ? '已提交修改审核' : '已提交新增审核'); emit('refresh'); handleClose(); } else { diff --git a/vue-fastapi-frontend/src/views/datastd/main/index.vue b/vue-fastapi-frontend/src/views/datastd/main/index.vue index b568ec6..cd35d4b 100644 --- a/vue-fastapi-frontend/src/views/datastd/main/index.vue +++ b/vue-fastapi-frontend/src/views/datastd/main/index.vue @@ -238,7 +238,19 @@ - + + + + - + - +