ITStudio_OUC/ITShowPlatform
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据修改后的model修改了view

Browse Source
This commit is contained in:
康家辉
2022-05-11 21:26:01 +08:00
parent bd36d90a3b
commit 72e28e0dd7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/history/views.py
+8 -8
View File
@@ -17,9 +17,9 @@ class DepartmentViewSet(APIView):
"code": 20000, "code": 20000,
"msg": "成功", "msg": "成功",
} }
obj = Department.objects.all().filter(did=request.GET.get('did')).first() # 获取符合did的DepartmentObject obj = Department.objects.all().filter(id=request.GET.get('did')).first() # 获取符合did的DepartmentObject
# （默认每个部门只对应一个object） # （默认每个部门只对应一个object）
d = {'did': obj.did, 'department_cn': obj.department_cn, 'department_en': obj.department_en, 'content': obj.content, d = {'did': obj.id, 'department_cn': obj.department_cn, 'department_en': obj.department_en, 'content': obj.content,
'introduction': obj.introduction} # 将其转为字典类（用于放入serializer检验） 'introduction': obj.introduction} # 将其转为字典类（用于放入serializer检验）
serializer = DepartmentSerializer(data=d) serializer = DepartmentSerializer(data=d)
if serializer.is_valid(): if serializer.is_valid():
@@ -43,7 +43,7 @@ class MemberViewSet(APIView):
} }
grade = request.GET.get('grade') grade = request.GET.get('grade')
did = request.GET.get('did') did = request.GET.get('did')
queryset = Members.objects.all().filter(Q(did=did) & Q(grade=grade)) # 获得所有符合要求的object queryset = Members.objects.all().filter(Q(department_id=did) & Q(grade=grade)) # 获得所有符合要求的object
l = [] # 建一个列表用于存储最终输出的data l = [] # 建一个列表用于存储最终输出的data
# 对符合要求的每一个object都转为字典并通过serializer检验数据是否合法 # 对符合要求的每一个object都转为字典并通过serializer检验数据是否合法
for x in queryset: for x in queryset:
@@ -77,10 +77,10 @@ class HistoryViewSet(APIView):
"code": 20000, "code": 20000,
"msg": "成功", "msg": "成功",
} }
ser = History.objects.all() # 获取全部历史列表信息 history_list = History.objects.all() # 获取全部历史列表信息
# 同上，对每一个object进行判断 # 同上，对每一个object进行判断
for x in ser: for x in history_list:
d = {'did': x.did, 'grade': x.grade, 'department_cn': x.department_cn} d = {'did': x.department_id, 'grade': x.grade, 'department_cn': x.department_cn}
serializer = HistorySerializer(data=d) serializer = HistorySerializer(data=d)
if serializer.is_valid(): if serializer.is_valid():
continue continue
@@ -97,10 +97,10 @@ class HistoryViewSet(APIView):
y = [] y = []
for j in range(0, 6): for j in range(0, 6):
try: try:
a = History.objects.get(Q(did=j) & Q(grade=i)) a = History.objects.get(Q(department_id=j) & Q(grade=i))
except History.DoesNotExist: # 若为空，则继续判断下一个部门 except History.DoesNotExist: # 若为空，则继续判断下一个部门
continue continue
x = {'id': a.did, 'department_name': a.department_cn} x = {'id': a.department_id, 'department_name': a.department_cn}
y.append(x) y.append(x)
data['data'] = y data['data'] = y
info.append(data) info.append(data)