diff --git a/apps/ofm/migrations/0019_auto_20251011_1128.py b/apps/ofm/migrations/0019_auto_20251011_1128.py new file mode 100644 index 00000000..2bc69c66 --- /dev/null +++ b/apps/ofm/migrations/0019_auto_20251011_1128.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.12 on 2025-10-11 03:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ofm', '0018_auto_20251011_0922'), + ] + + operations = [ + migrations.AlterField( + model_name='publicity', + name='dept_opinion', + field=models.JSONField(default=list, help_text=['同意', '不同意'], verbose_name='部门负责人意见'), + ), + migrations.AlterField( + model_name='publicity', + name='publicity_opinion', + field=models.JSONField(blank=True, default=list, help_text=['同意公开宣传报道', '不同意任何渠道的宣传报道'], verbose_name='宣传统战部审查意见'), + ), + migrations.AlterField( + model_name='publicity', + name='review', + field=models.JSONField(blank=True, default=list, help_text=['内容不涉及国家秘密和商业秘密,申请公开', '内容涉及国家秘密,申请按涉密渠道发布'], verbose_name='第一撰稿人自审'), + ), + ] diff --git a/apps/ofm/migrations/0020_auto_20251011_1427.py b/apps/ofm/migrations/0020_auto_20251011_1427.py new file mode 100644 index 00000000..24954f8a --- /dev/null +++ b/apps/ofm/migrations/0020_auto_20251011_1427.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.12 on 2025-10-11 06:27 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ofm', '0019_auto_20251011_1128'), + ] + + operations = [ + migrations.AlterField( + model_name='publicity', + name='dept_opinion', + field=models.JSONField(blank=True, default=list, help_text=['同意', '不同意'], null=True, verbose_name='部门负责人意见'), + ), + migrations.AlterField( + model_name='publicity', + name='publicity_opinion', + field=models.JSONField(blank=True, default=list, help_text=['同意公开宣传报道', '不同意任何渠道的宣传报道'], null=True, verbose_name='宣传统战部审查意见'), + ), + migrations.AlterField( + model_name='publicity', + name='review', + field=models.JSONField(blank=True, default=list, help_text=['内容不涉及国家秘密和商业秘密,申请公开', '内容涉及国家秘密,申请按涉密渠道发布'], null=True, verbose_name='第一撰稿人自审'), + ), + ] diff --git a/apps/ofm/migrations/0021_alter_publicity_publicity_opinion.py b/apps/ofm/migrations/0021_alter_publicity_publicity_opinion.py new file mode 100644 index 00000000..86dae1b4 --- /dev/null +++ b/apps/ofm/migrations/0021_alter_publicity_publicity_opinion.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2025-10-13 01:01 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ofm', '0020_auto_20251011_1427'), + ] + + operations = [ + migrations.AlterField( + model_name='publicity', + name='publicity_opinion', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='宣传报道意见'), + ), + ] diff --git a/apps/ofm/models.py b/apps/ofm/models.py index 91d71d49..6fc1d986 100644 --- a/apps/ofm/models.py +++ b/apps/ofm/models.py @@ -137,30 +137,27 @@ class Publicity(CommonBDModel): channel = models.JSONField('发布渠道', default=list, help_text=['互联网', '信息平台', '官微', '公开发行物', '其它']) other_channel = models.CharField('其它渠道', max_length=50, blank=True, null=True) report_name = models.CharField('报道名称', max_length=50, blank=True, null=True) - review = models.JSONField('第一撰稿人自审', default=list, help_text=['内容不涉及国家秘密和商业秘密,申请公开', '内容涉及国家秘密,申请按涉密渠道发布'], null=True, blank=True) + review = models.JSONField('第一撰稿人自审', default=list, help_text=['内容不涉及国家秘密和商业秘密,申请公开', '内容涉及国家秘密,申请按涉密渠道发布'], null=True,blank=True) dept_opinion = models.JSONField('部门负责人意见', default=list, help_text=['同意', '不同意'], null=True, blank=True) secret_period = models.CharField('秘密期限', max_length=50, blank=True, null=True) dept_opinion_review = models.CharField('部门审查意见', max_length=100, blank=True, null=True) - publicity_opinion = models.JSONField('宣传统战部审查意见', default=list, help_text=['同意公开宣传报道', '不同意任何渠道的宣传报道'], null=True, blank=True) + publicity_opinion = models.CharField('宣传报道意见', max_length=100, blank=True, null=True) ticket = models.ForeignKey('wf.ticket', verbose_name='关联工单', on_delete=models.SET_NULL, related_name='publicity_ticket', null=True, blank=True, db_constraint=False) # 记录编号自动生成 def save(self, *args, **kwargs): if not self.number: - with transaction.atomic(): - # 加行锁,防止并发取到相同 last_number - last_number = self.__class__.objects.select_for_update(skip_locked=True).order_by('-id').first() # skip_locked 锁定行,避免并发冲突 - if last_number: - try: - last_num = int(last_number.number.split('-')[-1]) - except ValueError: - last_num = 0 - new_num= last_num + 1 - else: - new_num = 1 - # 格式化编号,带补零 - self.number = f"(GXKG-{datetime.now().year}-{new_num:02d})" + last_number = self.__class__.objects.filter(number__startswith=f"GXKG-{datetime.now().year}-").order_by('-number').first() + if last_number: + try: + last_num = int(last_number.number.split('-')[-1]) + except ValueError: + last_num = 0 + else: + last_num =0 + # 格式化编号,带补零 + self.number = f"GXKG-{datetime.now().year}-{last_num+1:02d}" super().save(*args, **kwargs) diff --git a/apps/ofm/services.py b/apps/ofm/services.py index 0cfad707..7e95286c 100644 --- a/apps/ofm/services.py +++ b/apps/ofm/services.py @@ -90,4 +90,17 @@ def bind_publicity(ticket: Ticket, transition, new_ticket_data: dict): ticket.save() if ins.ticket is None: ins.ticket = ticket - ins.save() \ No newline at end of file + ins.save() + + +def save_ticket_data(ticket: Ticket, new_ticket_data: dict, **kwargs): + try: + obj = Publicity.objects.get(id=new_ticket_data['t_id']) + except Publicity.DoesNotExist: + raise ParseError("Publicity t_id 不存在") + data_save = {k: v for k, v in new_ticket_data.items() if k not in ['t_model', 't_id']} + + for k, v in data_save.items(): + setattr(obj, k, v) + obj.save() + \ No newline at end of file