From eb4238b1ae68a571c42d370948dd20141e48195f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 22 Dec 2023 10:15:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E8=BF=94=E5=9B=9Eful?=
 =?UTF-8?q?l=5Fname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/em/models.py      | 2 +-
 apps/em/serializers.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/em/models.py b/apps/em/models.py
index df22f117..693bdc4d 100644
--- a/apps/em/models.py
+++ b/apps/em/models.py
@@ -89,7 +89,7 @@ class Equipment(CommonBModel):
         verbose_name_plural = verbose_name
 
     def __str__(self):
-        return self.number + '-' + self.name
+        return f'{self.number}|{self.name}|{self.model}'
 
 
 class EcheckRecord(CommonADModel):
diff --git a/apps/em/serializers.py b/apps/em/serializers.py
index 834a7299..932c73a0 100644
--- a/apps/em/serializers.py
+++ b/apps/em/serializers.py
@@ -13,6 +13,7 @@ class EquipmentSerializer(CustomModelSerializer):
     belong_dept_name = serializers.CharField(
         source='belong_dept.name', read_only=True)
     mgroup_name = serializers.CharField(source='mgroup.name', read_only=True)
+    full_name = serializers.SerializerMethodField()
 
     def validate(self, attrs):
         mgroup = attrs.get('mgroup', None)
@@ -20,6 +21,9 @@ class EquipmentSerializer(CustomModelSerializer):
             attrs['belong_dept'] = mgroup.belong_dept
         return super().validate(attrs)
 
+    def get_full_name(self, obj):
+        return f'{obj.number}|{obj.name}|{obj.model}'
+
     class Meta:
         model = Equipment
         fields = '__all__'