车车 1 сар өмнө
parent
commit
d04910aa34

+ 4 - 0
ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMap.java

@@ -31,6 +31,10 @@ public class IsMap extends BaseBean
     @Excel(name = "地图名称")
     private String name;
 
+    @ApiModelProperty(value = "简称")
+    @Excel(name = "简称")
+    private String shortName;
+
     @ApiModelProperty(value = "图⽚地址")
     @Excel(name = "图⽚地址")
     private String imageUrl;

+ 3 - 0
ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/loto/IsLotoStationVO.java

@@ -55,6 +55,9 @@ public class IsLotoStationVO extends BaseBean
     @ApiModelProperty(value = "电机地图name")
     private String motorMapName;
 
+    @ApiModelProperty(value = "地图ShortName")
+    private String motorMapShortName;
+
     @ApiModelProperty(value = "状态")
     @Excel(name = "状态")
     private String status;

+ 2 - 1
ktg-iscs/src/main/resources/mapper/IsLotoStationMapper.xml

@@ -9,7 +9,8 @@
         l.*,
         w.workstation_name,
         m.name as map_name,
-        m1.name as motor_map_name
+        m1.name as motor_map_name,
+        m1.short_name as motor_map_short_name
         FROM
         is_loto_station l
         LEFT JOIN is_workstation w ON w.workstation_id = l.workstation_id