调整机器查询

src/main/java/com/minpay/shouhuo/equmentaction/MachineManageAction.java

@@ -153,8 +153,8 @@ public class MachineManageAction implements IMINAction {
                 .queryEquipment(map, rows);
         //格式化时间和状态
         list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
-        list = new MINCopyFormat("{equState:'sttDesc',type:'typeDesc'}").format(list);
-        list = Service.lookup(IFormatService.class).formatEnum(list, "{sttDesc:'EQUIPMENT_STATE','typeDesc':'GAME_TYPE'}");
+        list = new MINCopyFormat("{equState:'sttDesc',type:'typeDesc',applyState:'applyStateDesc'}").format(list);
+        list = Service.lookup(IFormatService.class).formatEnum(list, "{sttDesc:'EQUIPMENT_STATE','typeDesc':'GAME_TYPE','applyStateDesc':'EQUIPMENT_CODE_STATE'}");
         //传递数据
         res.set(IMINBusinessConstant.F_PAGING_LAY, list);
         res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());

src/main/resources/com/minpay/db/table/own/mapper/MachineManageMapper.xml

@@ -173,7 +173,9 @@
 		equ.VEQ_CREATE_TIME 			'createTime',
 		us2.USR_NAME 					'modifyUser',
 		equ.VEQ_MODIFY_TIME 			'modifyTime',
-		equ.VEQ_MACHINE_NO			'machineNo'
+		equ.VEQ_MACHINE_NO			'machineNo',
+		equ.VEQ_IMEI_ADDR			'imeiAddr',
+		equ.VEQ_APPLYSTATE			'applyState'
 		FROM vm_equipment_inf equ
 		LEFT JOIN im_user us1
 		ON us1.USR_ID = equ.VEQ_CREATE_USER