|
|
@ -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" |
|
|
|