From 27862fa22b8128089ff9d13a28411dca8c06b4b3 Mon Sep 17 00:00:00 2001 From: XingQue Date: Tue, 21 Jul 2026 00:37:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A5=E5=8D=95=E5=9B=BE=E7=89=87/?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=A1=A8=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=B9=E5=90=8D=EF=BC=8C=E9=81=BF=E5=85=8D=E4=B8=8E=E5=A4=96?= =?UTF-8?q?=E9=94=AE=20gongdan=5Fid=20=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- gongdan/migrations/0001_initial.py | 4 ++-- gongdan/models.py | 5 +++-- gongdan/services.py | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gongdan/migrations/0001_initial.py b/gongdan/migrations/0001_initial.py index d456bef..cc6ccf7 100644 --- a/gongdan/migrations/0001_initial.py +++ b/gongdan/migrations/0001_initial.py @@ -39,7 +39,7 @@ class Migration(migrations.Migration): name='GongdanImage', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('gongdan_id', models.CharField(db_index=True, max_length=32, verbose_name='工单号冗余')), + ('gongdan_hao', models.CharField(db_index=True, max_length=32, verbose_name='工单号冗余')), ('url', models.CharField(max_length=512, verbose_name='图片URL')), ('paixu', models.IntegerField(default=0, verbose_name='排序')), ('CreateTime', models.DateTimeField(auto_now_add=True)), @@ -51,7 +51,7 @@ class Migration(migrations.Migration): name='GongdanShengji', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('gongdan_id', models.CharField(db_index=True, max_length=32, verbose_name='工单号冗余')), + ('gongdan_hao', models.CharField(db_index=True, max_length=32, verbose_name='工单号冗余')), ('cishu', models.IntegerField(verbose_name='第几次升级')), ('shuoming', models.CharField(max_length=500, verbose_name='补充说明')), ('shenqingren_id', models.CharField(db_index=True, max_length=32, verbose_name='申请人')), diff --git a/gongdan/models.py b/gongdan/models.py index 03b180b..2766b86 100644 --- a/gongdan/models.py +++ b/gongdan/models.py @@ -42,7 +42,8 @@ class GongdanImage(QModel): gongdan = models.ForeignKey( Gongdan, on_delete=models.CASCADE, related_name='images', db_column='gongdan_pk', ) - gongdan_id = models.CharField(max_length=32, db_index=True, verbose_name='工单号冗余') + # 冗余业务工单号（勿命名 gongdan_id，会与 FK 访问器冲突） + gongdan_hao = models.CharField(max_length=32, db_index=True, verbose_name='工单号冗余') url = models.CharField(max_length=512, verbose_name='图片URL') paixu = models.IntegerField(default=0, verbose_name='排序') CreateTime = models.DateTimeField(auto_now_add=True) @@ -58,7 +59,7 @@ class GongdanShengji(QModel): gongdan = models.ForeignKey( Gongdan, on_delete=models.CASCADE, related_name='shengji_list', db_column='gongdan_pk', ) - gongdan_id = models.CharField(max_length=32, db_index=True, verbose_name='工单号冗余') + gongdan_hao = models.CharField(max_length=32, db_index=True, verbose_name='工单号冗余') cishu = models.IntegerField(verbose_name='第几次升级') shuoming = models.CharField(max_length=500, verbose_name='补充说明') shenqingren_id = models.CharField(max_length=32, db_index=True, verbose_name='申请人') diff --git a/gongdan/services.py b/gongdan/services.py index c870234..c15ef0c 100644 --- a/gongdan/services.py +++ b/gongdan/services.py @@ -132,7 +132,7 @@ def _replace_images(gd, image_urls): for i, url in enumerate(urls): GongdanImage.objects.create( gongdan=gd, - gongdan_id=gd.gongdan_id, + gongdan_hao=gd.gongdan_id, url=url[:512], paixu=i, ) @@ -210,7 +210,7 @@ def escalate_gongdan(*, gongdan_id, yonghuid, shuoming, image_urls=None): next_cishu = (gd.shengji_cishu or 0) + 1 GongdanShengji.objects.create( gongdan=gd, - gongdan_id=gd.gongdan_id, + gongdan_hao=gd.gongdan_id, cishu=next_cishu, shuoming=text, shenqingren_id=yonghuid,