This commit is contained in:
caoqianming 2024-12-13 18:09:45 +08:00
commit 28d89176e6
3 changed files with 22 additions and 2 deletions

View File

@ -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='备注'),
),
]

View File

@ -4,7 +4,8 @@ from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet
from apps.utils.mixins import BulkCreateModelMixin, BulkDestroyModelMixin, CustomListModelMixin, BulkUpdateModelMixin from apps.utils.mixins import BulkCreateModelMixin, BulkDestroyModelMixin, CustomListModelMixin, BulkUpdateModelMixin
from apps.enm.serializers import (MpointSerializer, MpLogxSerializer, MpointStatSerializer, from apps.enm.serializers import (MpointSerializer, MpLogxSerializer, MpointStatSerializer,
EnStatSerializer, EnStat2Serializer, ReCalSerializer, EnStatSerializer, EnStat2Serializer, ReCalSerializer,
MpointStatCorrectSerializer, EnStatAnaSerializer, XscriptSerializer, XscriptDetailSerializer) MpointStatCorrectSerializer,
EnStatAnaSerializer, EnStatUpdateSerializer, XscriptSerializer, XscriptDetailSerializer)
from apps.enm.filters import MpointStatFilter, EnStatFilter, EnStat2Filter from apps.enm.filters import MpointStatFilter, EnStatFilter, EnStat2Filter
from apps.enm.tasks import cal_mpointstat_manual from apps.enm.tasks import cal_mpointstat_manual
from rest_framework.response import Response from rest_framework.response import Response
@ -239,6 +240,7 @@ class EnStatViewSet(CustomListModelMixin, BulkUpdateModelMixin, CustomGenericVi
perms_map = {"get": "*", "put": "enstat.update"} perms_map = {"get": "*", "put": "enstat.update"}
queryset = EnStat.objects.all() queryset = EnStat.objects.all()
serializer_class = EnStatSerializer serializer_class = EnStatSerializer
update_serializer_class = EnStatUpdateSerializer
select_related_fields = ["mgroup", "team", "mgroup__belong_dept"] select_related_fields = ["mgroup", "team", "mgroup__belong_dept"]
filterset_class = EnStatFilter filterset_class = EnStatFilter
ordering = ["mgroup__sort", "year_s", "month_s", "day_s", "create_time"] ordering = ["mgroup__sort", "year_s", "month_s", "day_s", "create_time"]

View File

@ -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={ sflog, is_created = SfLog.objects.get_or_create(mgroup=mgroup, shift=shift, start_time=start_time, defaults={
"mgroup": mgroup, "mgroup": mgroup,
"shift": shift, "shift": shift,
"work_date": current_date, "work_date": start_time.date(),
"start_time": start_time, "start_time": start_time,
"end_time": end_time, "end_time": end_time,
"total_sec_now": total_sec, "total_sec_now": total_sec,