From cdc70177bb321008754711f32246a5b5d75a222a Mon Sep 17 00:00:00 2001 From: zty Date: Fri, 13 Dec 2024 17:32:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20sflog=20work=5Fdate=20=E9=BB=98?= =?UTF-8?q?=E8=AE=A4start=5Ftime.date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/services.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/wpm/services.py b/apps/wpm/services.py index d1adad78..8725c4b5 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -96,7 +96,7 @@ def make_sflogs(mgroup: Mgroup, start_date: datetime.date, end_date: datetime.da sflog, is_created = SfLog.objects.get_or_create(mgroup=mgroup, shift=shift, start_time=start_time, defaults={ "mgroup": mgroup, "shift": shift, - "work_date": current_date, + "work_date": start_time.date(), "start_time": start_time, "end_time": end_time, "total_sec_now": total_sec, From d364a0ae1e03478ac2100fd64c93b2e5adbc19c2 Mon Sep 17 00:00:00 2001 From: zty Date: Fri, 13 Dec 2024 17:41:50 +0800 Subject: [PATCH 2/3] fix: enstatupdateserializer --- apps/enm/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/enm/views.py b/apps/enm/views.py index 0df7dca9..3a1c621f 100644 --- a/apps/enm/views.py +++ b/apps/enm/views.py @@ -4,7 +4,8 @@ from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet from apps.utils.mixins import BulkCreateModelMixin, BulkDestroyModelMixin, CustomListModelMixin, BulkUpdateModelMixin from apps.enm.serializers import (MpointSerializer, MpLogxSerializer, MpointStatSerializer, EnStatSerializer, EnStat2Serializer, ReCalSerializer, - MpointStatCorrectSerializer, EnStatAnaSerializer, XscriptSerializer, XscriptDetailSerializer) + MpointStatCorrectSerializer, + EnStatAnaSerializer, EnStatUpdateSerializer, XscriptSerializer, XscriptDetailSerializer) from apps.enm.filters import MpointStatFilter, EnStatFilter, EnStat2Filter from apps.enm.tasks import cal_mpointstat_manual from rest_framework.response import Response @@ -239,6 +240,7 @@ class EnStatViewSet(CustomListModelMixin, BulkUpdateModelMixin, CustomGenericVi perms_map = {"get": "*"} queryset = EnStat.objects.all() serializer_class = EnStatSerializer + update_serializer_class = EnStatUpdateSerializer select_related_fields = ["mgroup", "team", "mgroup__belong_dept"] filterset_class = EnStatFilter ordering = ["mgroup__sort", "year_s", "month_s", "day_s", "create_time"] From c1e958f2f9c655d692c4cc4384535c0214f9dc0d Mon Sep 17 00:00:00 2001 From: zty Date: Fri, 13 Dec 2024 17:46:28 +0800 Subject: [PATCH 3/3] feat: enstate note makemigration --- apps/enm/migrations/0051_enstat_note.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 apps/enm/migrations/0051_enstat_note.py diff --git a/apps/enm/migrations/0051_enstat_note.py b/apps/enm/migrations/0051_enstat_note.py new file mode 100644 index 00000000..70860dfc --- /dev/null +++ b/apps/enm/migrations/0051_enstat_note.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2024-12-13 09:46 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('enm', '0050_mpoint_is_rep_ep0_running_state'), + ] + + operations = [ + migrations.AddField( + model_name='enstat', + name='note', + field=models.TextField(blank=True, default='', verbose_name='备注'), + ), + ]