feat:wpm/mloguser返回设备名称
This commit is contained in:
parent
7d91682e8a
commit
b108b48714
|
|
@ -1558,6 +1558,7 @@ class MlogUserSerializer(CustomModelSerializer):
|
||||||
handle_user_name = serializers.CharField(source='handle_user.name', read_only=True)
|
handle_user_name = serializers.CharField(source='handle_user.name', read_only=True)
|
||||||
process_name = serializers.CharField(source='process.name', read_only=True)
|
process_name = serializers.CharField(source='process.name', read_only=True)
|
||||||
shift_name = serializers.CharField(source='shift.name', read_only=True)
|
shift_name = serializers.CharField(source='shift.name', read_only=True)
|
||||||
|
equipment_name = serializers.CharField(source='equipment.name', read_only=True, default=None)
|
||||||
class Meta:
|
class Meta:
|
||||||
model = MlogUser
|
model = MlogUser
|
||||||
fields = "__all__"
|
fields = "__all__"
|
||||||
|
|
|
||||||
|
|
@ -1273,7 +1273,7 @@ class MlogUserViewSet(BulkCreateModelMixin, CustomListModelMixin, BulkDestroyMod
|
||||||
perms_map = {"get": "*", "post": "mlog.update", "delete": "mlog.update"}
|
perms_map = {"get": "*", "post": "mlog.update", "delete": "mlog.update"}
|
||||||
queryset = MlogUser.objects.all()
|
queryset = MlogUser.objects.all()
|
||||||
serializer_class = MlogUserSerializer
|
serializer_class = MlogUserSerializer
|
||||||
select_related_fields = ["handle_user", "shift", "process"]
|
select_related_fields = ["handle_user", "shift", "process", "equipment"]
|
||||||
filterset_fields = ["mlog"]
|
filterset_fields = ["mlog"]
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue