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

修复若干bug，优化若干代码

Browse Source
This commit is contained in:
ladeng07
2022-05-20 21:54:20 +08:00
parent f65714f84e
commit 970f7563c0
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/history/serializers.py
+1
View File
@@ -116,6 +116,7 @@ class DepartmentSerializer(serializers.ModelSerializer):
obj = Department.objects.filter(id=data)
if not obj:
raise serializers.ValidationError("查询的部门不存在")
return data
# class MembersSerializer(serializers.HyperlinkedModelSerializer):
apps/history/views.py
+17 -9
View File
@@ -40,27 +40,35 @@ conf.read(os.path.join(BASE_DIR, "config.ini"), encoding="utf-8")
class DepartmentMessageView(GenericAPIView):
"""获取部门信息"""
serializer_class = DepartmentSerializer
def get(self, request):
queryset = Department.objects.all()
if request.query_params:
try:
# serializer = DepartmentSerializer(instance=queryset.get(id=request.query_params['id']))
serializer = DepartmentSerializer(instance=queryset.get(id=request.query_params['id']))
department_data = dict(serializer.data)
department_data["background"] = conf.get("Django", "Host") + department_data["background"]
department_data["icon"] = conf.get("Django", "Host") + department_data["icon"]
return Response({"code": 20000, "msg": get_msg("20000"), "data": department_data})
# department_data = dict(serializer.data)
# department_data["background"] = conf.get("Django", "Host") + department_data["background"]
# department_data["icon"] = conf.get("Django", "Host") + department_data["icon"]
# return Response({"code": 20000, "msg": get_msg("20000"), "data": department_data})
return Response({"code": 20000, "msg": get_msg("20000"), "data": serializer.data})
except Department.DoesNotExist:
return Response({"code": 40000, "msg": "查询部门不存在"})
# except TypeError:
# return Response({"code": 40000, "msg": "查询部门不存在"})
else:
serializer = DepartmentSerializer(instance=queryset, many=True)
department_data = dict(serializer.data)
department_data["background"] = conf.get("Django", "Host") + department_data["background"]
department_data["icon"] = conf.get("Django", "Host") + department_data["icon"]
return Response({"code": 20000, "msg": get_msg("20000"), "data": department_data})
# department_data = dict(serializer.data)
# department_data["background"] = conf.get("Django", "Host") + department_data["background"]
# department_data["icon"] = conf.get("Django", "Host") + department_data["icon"]
# return Response({"code": 20000, "msg": get_msg("20000"), "data": department_data})
return Response({"code": 20000, "msg": get_msg("20000"), "data": serializer.data})
# print(request.query_params)
@@ -138,7 +146,7 @@ class HistoryViewSet(APIView):
response["code"] = 40000
response["msg"] = "查询部门不存在"
return Response(data=response)
for i in range(ser.first().years, ser.last().years + 1):
for i in range(ser.last().years, ser.first().years - 1, -1):
msg["years"] = i
msg["data"] = HistorySerializer(instance=ser.filter(years=i), many=True).data
data.append(msg.copy())