zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server

This commit is contained in:
caoqianming 2024-03-12 18:41:58 +08:00
parent 6589364eb4 38b7d0c586
commit 33a0ddad4c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/hrm/services.py
View File

@ -309,7 +309,7 @@ class HrmService:
time_20_x = datetime(year=s_time_f.year, month=s_time_f.month, time_20_x = datetime(year=s_time_f.year, month=s_time_f.month,
day=s_time_f.day, hour=16, minute=0, second=0, tzinfo=tzinfo) day=s_time_f.day, hour=16, minute=0, second=0, tzinfo=tzinfo)
time_20_y = datetime(year=s_time_f.year, month=s_time_f.month, time_20_y = datetime(year=s_time_f.year, month=s_time_f.month,
day=s_time_f.day, hour=18, minute=10, second=0, tzinfo=tzinfo) day=s_time_f.day, hour=18, minute=30, second=0, tzinfo=tzinfo)
if time_10_x < s_time_f < time_10_y: if time_10_x < s_time_f < time_10_y:
card_type = 10 card_type = 10
elif time_20_x < s_time_f < time_20_y: elif time_20_x < s_time_f < time_20_y:

4
apps/opm/filters.py
View File

@ -1,6 +1,7 @@
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from apps.opm.models import Operation from apps.opm.models import Operation
class OperationFilterset(filters.FilterSet): class OperationFilterset(filters.FilterSet):
class Meta: class Meta:
model = Operation model = Operation
@ -9,4 +10,5 @@ class OperationFilterset(filters.FilterSet):
'area': ['exact'], 'area': ['exact'],
'create_by': ['exact'], 'create_by': ['exact'],
'create_time': ['gte', 'lte'], 'create_time': ['gte', 'lte'],
} 'cates': ['exact', 'in']
}