diff --git a/apps/ofm/migrations/0003_remove_lendingseal_submit_user.py b/apps/ofm/migrations/0003_remove_lendingseal_submit_user.py new file mode 100644 index 00000000..25d6a559 --- /dev/null +++ b/apps/ofm/migrations/0003_remove_lendingseal_submit_user.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.12 on 2025-09-08 03:11 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('ofm', '0002_lendingseal'), + ] + + operations = [ + migrations.RemoveField( + model_name='lendingseal', + name='submit_user', + ), + ] diff --git a/apps/ofm/models.py b/apps/ofm/models.py index fa5fa4a6..46301b82 100644 --- a/apps/ofm/models.py +++ b/apps/ofm/models.py @@ -58,8 +58,8 @@ class LendingSeal(CommonBDModel): return_date = models.DateField('拟归还日期', blank=True, null=True) actual_return_date = models.DateField('实际归还日期', blank=True, null=True) reason = models.CharField('借用理由', max_length=100, blank=True, null=True) - submit_user = models.ForeignKey( - User, verbose_name='提交人', on_delete=models.CASCADE, null=True, blank=True, related_name='seal_submit_user') + # submit_user = models.ForeignKey( + # User, verbose_name='提交人', on_delete=models.CASCADE, null=True, blank=True, related_name='seal_submit_user') ticket = models.ForeignKey('wf.ticket', verbose_name='关联工单', on_delete=models.SET_NULL, related_name='seal_ticket', null=True, blank=True, db_constraint=False) note = models.TextField('备注', null=True, blank=True) diff --git a/apps/ofm/serializers.py b/apps/ofm/serializers.py index fae4c315..2211539b 100644 --- a/apps/ofm/serializers.py +++ b/apps/ofm/serializers.py @@ -79,7 +79,7 @@ class MroomSlotSerializer(CustomModelSerializer): class LendingSealSerializer(CustomModelSerializer): - # seal_name = serializers.CharField(source='seal.name', read_only=True) + create_by_name = serializers.CharField(source='create_by.name', read_only=True) class Meta: model = LendingSeal fields = '__all__' diff --git a/apps/ofm/services.py b/apps/ofm/services.py index f9e221e1..657c5e74 100644 --- a/apps/ofm/services.py +++ b/apps/ofm/services.py @@ -1,7 +1,7 @@ from apps.wf.models import Ticket # TicketFlow, Transition, Workflow, CustomField, State, -from apps.ofm.models import SealManage, LendingSeal +from apps.ofm.models import LendingSeal from rest_framework.exceptions import ParseError @@ -12,7 +12,7 @@ def seal_submit_validate(ins: LendingSeal): raise ParseError('该任务已停止!') def bind_lendingseal(ticket: Ticket, transition, new_ticket_data: dict): - ins = SealManage.objects.get(id=new_ticket_data['t_id']) + ins = LendingSeal.objects.get(id=new_ticket_data['t_id']) if ins.submit_time is not None: raise ParseError('该印章申请不可提交审批') # seal_submit_validate(ins)