显示指令中文名称

java110-bean/src/main/java/com/java110/dto/machine/MachineTranslateDto.java

@@ -64,6 +64,7 @@ public class MachineTranslateDto extends PageDto implements Serializable {
     private String bId;
 
     private String machineCmd;
+    private String machineCmdName;
 
     private String objBId;
 
@@ -214,4 +215,12 @@ public class MachineTranslateDto extends PageDto implements Serializable {
         }
         this.remark = remark;
     }
+
+    public String getMachineCmdName() {
+        return machineCmdName;
+    }
+
+    public void setMachineCmdName(String machineCmdName) {
+        this.machineCmdName = machineCmdName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/machineTranslate/ApiMachineTranslateDataVo.java

@@ -17,6 +17,8 @@ public class ApiMachineTranslateDataVo implements Serializable {
     private String updateTime;
 
     private String machineCmd;
+    private String machineCmdName;
+    private String remark;
 
     private String objBId;
 
@@ -123,4 +125,20 @@ public class ApiMachineTranslateDataVo implements Serializable {
     public void setObjBId(String objBId) {
         this.objBId = objBId;
     }
+
+    public String getMachineCmdName() {
+        return machineCmdName;
+    }
+
+    public void setMachineCmdName(String machineCmdName) {
+        this.machineCmdName = machineCmdName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

java110-db/src/main/resources/mapper/common/MachineTranslateServiceDaoImplMapper.xml

@@ -142,8 +142,8 @@
         typeCd,t.machine_translate_id,t.machine_translate_id machineTranslateId,t.obj_id,t.obj_id
         objId,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name objName,t.state,t.community_id,t.community_id
         communityId,t.b_id,t.b_id bId,td.name typeCdName,td1.name stateName,t.create_time createTime,t.update_time
-        updateTime,t.machine_cmd,t.obj_b_id,t.machine_cmd machineCmd,t.obj_b_id objBId,t.remark
-        from machine_translate t,t_dict td,t_dict td1
+        updateTime,t.machine_cmd,t.obj_b_id,t.machine_cmd machineCmd,td2.`name` machineCmdName,t.obj_b_id objBId,t.remark
+        from machine_translate t,t_dict td,t_dict td1,t_dict td2
         where 1 =1
         and t.type_cd=td.status_cd
         and td.table_name='machine_translate'
@@ -151,6 +151,9 @@
         and t.state=td1.status_cd
         and td1.table_name='machine_translate'
         and td1.table_columns='state'
+        and t.machine_cmd = td2.status_cd
+        and td2.table_name='machine_translate'
+        and td2.table_columns='machine_cmd'
         <if test="machineId !=null and machineId != ''">
             and t.machine_id= #{machineId}
         </if>