Skip to content

Commit 942f0e8

Browse files
feat(backend): 单据免审批优化 #11293
1 parent 0db9860 commit 942f0e8

File tree

5 files changed

+27
-4
lines changed

5 files changed

+27
-4
lines changed

dbm-ui/backend/ticket/handler.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,14 +347,15 @@ def batch_process_ticket(cls, username, action, ticket_ids, params):
347347
return TicketHandler.batch_process_todo(user=username, action=action, operations=operations)
348348

349349
@classmethod
350-
def create_ticket_flow_config(cls, bk_biz_id, cluster_ids, ticket_types, configs, operator):
350+
def create_ticket_flow_config(cls, bk_biz_id, cluster_ids, ticket_types, configs, operator, remark):
351351
"""
352352
创建单据流程
353353
@param bk_biz_id: 业务ID,为0表示平台业务
354354
@param cluster_ids: 集群ID列表,表示规则生效的集群范围
355355
@param ticket_types: 单据类型列表
356356
@param configs: 流程配置
357357
@param operator: 创建者
358+
@param remark: 备注
358359
"""
359360

360361
def check_create_config(ticket_type):
@@ -395,13 +396,14 @@ def check_create_config(ticket_type):
395396
configs=configs,
396397
creator=operator,
397398
updater=operator,
399+
remark=remark,
398400
)
399401
flows_config_list.append(flows_config)
400402

401403
TicketFlowsConfig.objects.bulk_create(flows_config_list)
402404

403405
@classmethod
404-
def update_ticket_flow_config(cls, bk_biz_id, cluster_ids, ticket_types, configs, config_ids, operator):
406+
def update_ticket_flow_config(cls, bk_biz_id, cluster_ids, ticket_types, configs, config_ids, operator, remark):
405407
"""
406408
更新单据流程
407409
@param bk_biz_id: 业务ID,为0表示平台业务
@@ -410,6 +412,7 @@ def update_ticket_flow_config(cls, bk_biz_id, cluster_ids, ticket_types, configs
410412
@param configs: 流程配置
411413
@param config_ids: 更新的流程ID列表
412414
@param operator: 更新人
415+
@param remark: 更新人
413416
"""
414417
cluster_ids = cluster_ids or []
415418
config_ids = config_ids or []
@@ -423,7 +426,7 @@ def update_ticket_flow_config(cls, bk_biz_id, cluster_ids, ticket_types, configs
423426
# 业务级别先删除,再创建,可以复用校验流程
424427
with transaction.atomic():
425428
config_qs.filter(id__in=config_ids).delete()
426-
cls.create_ticket_flow_config(bk_biz_id, cluster_ids, ticket_types, configs, operator)
429+
cls.create_ticket_flow_config(bk_biz_id, cluster_ids, ticket_types, configs, operator, remark)
427430

428431
@classmethod
429432
def query_ticket_flows_describe(cls, bk_biz_id, db_type, ticket_types=None):
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 3.2.25 on 2025-06-26 08:24
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('ticket', '0015_ticket_config'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='ticketflowsconfig',
15+
name='remark',
16+
field=models.CharField(default=None, max_length=512, null=True, verbose_name='备注'),
17+
),
18+
]

dbm-ui/backend/ticket/models/ticket.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ class TicketFlowsConfig(AuditedModel):
370370
ticket_type = models.CharField(_("单据类型"), choices=TicketType.get_choices(), max_length=128)
371371
editable = models.BooleanField(_("是否支持用户配置"), default=True)
372372
configs = models.JSONField(_("单据配置 eg: {'need_itsm': false, 'need_manual_confirm': false}"), default=dict)
373+
remark = models.CharField(_("备注"), max_length=LEN_L_LONG, default=None, null=True)
373374

374375
class Meta:
375376
verbose_name_plural = verbose_name = _("单据流程配置(TicketFlowsConfig)")

dbm-ui/backend/ticket/serializers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ class CreateTicketFlowConfigSerializer(serializers.Serializer):
337337
help_text=_("单据类型"), child=serializers.ChoiceField(choices=TicketType.get_choices())
338338
)
339339
configs = serializers.DictField(help_text=_("单据可配置项"))
340+
remark = serializers.CharField(help_text=_("备注"), required=False)
340341

341342

342343
class UpdateTicketFlowConfigSerializer(CreateTicketFlowConfigSerializer):

dbm-ui/config/default.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"pipeline.component_framework",
8787
"pipeline.eri",
8888
# bk-iam
89-
"backend.iam_app",
89+
# "backend.iam_app",
9090
"iam.contrib.iam_migration",
9191
# bk-audit
9292
"bk_audit.contrib.bk_audit",

0 commit comments

Comments
 (0)