Browse Source

标准码值审批处理

master
si@aidatagov.com 1 month ago
parent
commit
6c9815b700
  1. 1
      .gitignore
  2. 20
      vue-fastapi-backend/.env.dev
  3. 26
      vue-fastapi-backend/module_admin/service/datastd_service.py
  4. 2
      vue-fastapi-frontend/src/api/datastd/std.js
  5. 4
      vue-fastapi-frontend/src/views/datastd/stdcode/index.vue

1
.gitignore

@ -137,3 +137,4 @@ dmypy.json
# Cython debug symbols
cython_debug/
vue-fastapi-backend/.env.dev
vue-fastapi-backend/.env.dev

20
vue-fastapi-backend/.env.dev

@ -34,23 +34,23 @@ JWT_REDIS_EXPIRE_MINUTES = 30
DB_TYPE = 'mysql'
# 数据库主机
#DB_HOST = '192.168.0.3'
DB_HOST = '47.113.147.166'
# DB_HOST = '127.0.0.1'
# DB_HOST = '47.113.147.166'
DB_HOST = '127.0.0.1'
# 数据库端口
DB_PORT = 3306
# 数据库用户名
#DB_USERNAME = 'admin'
DB_USERNAME = 'dbf'
#DB_USERNAME = 'root'
# DB_USERNAME = 'dbf'
DB_USERNAME = 'root'
# 数据库密码
#DB_PASSWORD = '123456'
DB_PASSWORD = '1q2w3e4r'
# DB_PASSWORD = 'root'
# DB_PASSWORD = '1q2w3e4r'
DB_PASSWORD = 'root'
# 数据库名称
#DB_DATABASE = 'vue_faseapi'
DB_DATABASE = 'vfa_test_0115'
# DB_DATABASE = 'ruoyi-fastapi'
# DB_DATABASE = 'vfa_test_0115'
DB_DATABASE = 'ruoyi-fastapi'
# 是否开启sqlalchemy日志
DB_ECHO = true
@ -65,8 +65,8 @@ DB_POOL_TIMEOUT = 30
# -------- Redis配置 --------
# Redis主机
REDIS_HOST = '192.168.0.3'
#REDIS_HOST = '127.0.0.1'
# REDIS_HOST = '192.168.0.3'
REDIS_HOST = '127.0.0.1'
# Redis端口
REDIS_PORT = 6379

26
vue-fastapi-backend/module_admin/service/datastd_service.py

@ -75,7 +75,8 @@ class DataStdService:
item["codeMapId"] = f"{old_val} ==> {new_val}"
filtered_rows.append(item)
else:
filtered_rows.append(item)
col_list_result.rows = filtered_rows
return col_list_result
@ -216,7 +217,7 @@ class DataStdService:
last_appr= await DataStdDao.get_last_std_code_appr_by_id(query_db,std_id)
# 标准代码审批记录
std_code_appr = DataStdCodeApprModel(**std_code.model_dump(exclude_unset=True, by_alias=True))
std_code_appr = DataStdCodeApprModel(**CamelCaseUtil.transform_result(std_code))
std_code_appr.changeType = "delete"
std_code_appr.compareId = last_appr.id
std_code_appr.oldInstId = std_code.id
@ -227,6 +228,27 @@ class DataStdService:
std_code_appr.create_by = current_user.user.user_name
std_code_appr.create_time = datetime.now()
await DataStdDao.add_std_code_appr(query_db, std_code_appr)
queryCodeItem = DataStdCodePageQueryModel()
queryCodeItem.parent_id=std_code.id
queryCodeItem.class_id="codeItem"
queryCodeItem.page_size=100
queryCodeItem.page_num=1
code_item_list_old = await DataStdDao.get_std_code_list(query_db, queryCodeItem, False)
for code_item in code_item_list_old:
appr_item=DataStdCodeApprModel(**code_item)
last_appr_item= await DataStdDao.get_last_std_code_appr_by_id(query_db,std_id)
appr_item.changeType = "delete"
appr_item.parent_id = std_code_appr.id
appr_item.compareId = last_appr_item.id
appr_item.oldInstId = appr_item.id
appr_item.approStatus = "waiting"
appr_item.code_status = "9"
appr_item.flowId = flow_id
appr_item.id=str(uuid.uuid4())
appr_item.create_by = current_user.user.user_name
appr_item.create_time = datetime.now()
await DataStdDao.add_std_code_appr(query_db, appr_item)
# 发起审批流程(每个标准代码一条审批)
apply_model = ApplyModel()
apply_model.businessType = "dataStdCode"

2
vue-fastapi-frontend/src/api/datastd/std.js

@ -106,7 +106,7 @@ export function updateStdCodeItem(data) {
// 删除标准代码
export function deleteStdCode(colId) {
return request({
url: '/default-api/datastd/stdcodeappr/code/' + colId,
url: '/default-api/datastd/stdcode/codeappr/' + colId,
method: 'delete'
})
}

4
vue-fastapi-frontend/src/views/datastd/stdcode/index.vue

@ -325,9 +325,9 @@ const handleRemove = (row) => {
const codesToDelete = row.codeNum ? [row.codeNum] : codeNums.value;
proxy.$modal.confirm('是否确认删除ID为"' + codesToDelete.toString() + '"的数据项?').then(function () {
return deleteStdCode(idsToDelete.toString());
}).then(() => {
}).then((res) => {
handleQuery();
proxy.$modal.msgSuccess("删除成功");
proxy.$modal.msgSuccess(res.msg);
}).catch(() => {});
};

Loading…
Cancel
Save