YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by linlong
Commit 4eb8e9b20355a0b917f0001b8af0a674c9c8a29a 1 parent f5fa4e98

update

Inline Side-by-side
Showing 2 changed files with 20 additions and 15 deletions
... ... @@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.yoho.service.model.union.response.ActivateDeviceIdResponseBO;
import com.yoho.service.model.union.response.PageActivateDeviceIdResponseBO;
import com.yoho.unions.common.model.DeviceIdMatchBO;
import com.yoho.unions.common.service.IBusinessImportService;
import com.yoho.unions.dal.IUnionLogsDAO;
... ... @@ -89,7 +90,9 @@ public class DeviceIdMatchImportServiceImpl implements IBusinessImportService {
BeanUtils.copyProperties(input, output);
return output;
});
PageActivateDeviceIdResponseBO pageActivateDeviceIdResponseBO = new PageActivateDeviceIdResponseBO();
pageActivateDeviceIdResponseBO.setList(responseBOList);
logger.debug("method batchImport(List<Object>) out.");
return responseBOList;
return pageActivateDeviceIdResponseBO;
}
}
... ...
... ... @@ -75,11 +75,11 @@
<div id="imeiImportDiv" style="margin-left: 30px;"></div>
</form>
</div>
<div region="center" style="height: 800px;">
<div style="margin-left: 30px;margin-top: 20px; height:100px;">
<div region="center" >
<div style="margin-left: 30px;margin-top: 20px; height:420px;overflow:auto;">
<table id="activateTalbe2"></table>
</div>
<div id="matchDiv" style="padding:30px;height:420px;"></div>
<!--<div id="matchDiv" style="padding:30px;height:420px;"></div>-->
</div>
</div>
<div title="点击查询" style="padding:20px;display:none;overflow:auto;">
... ... @@ -591,12 +591,14 @@
msg: "匹配完成",
height: 250
});
console.info(data)
var match = data.data;
var output = "匹配的内容</br>";
for (var i = 0; i < match.length; i++) {
output += JSON.stringify(match[i])+"</br>";
}
$("#matchDiv").append(output);
$("#activateTalbe2").datagrid('loadData', data);
// var output = "匹配的内容</br>";
// for (var i = 0; i < match.length; i++) {
// output += JSON.stringify(match[i])+"</br>";
// }
// $("#matchDiv").append(output);
}
});
... ... @@ -615,12 +617,12 @@
height: 250
});
var match = data.data;
var match = data.data;
var output = "匹配的内容</br>";
for (var i = 0; i < match.length; i++) {
output += JSON.stringify(match[i])+"</br>";
}
$("#matchDiv").append(output);
$("#activateTalbe2").datagrid('loadData', match);
// var output = "匹配的内容</br>";
// for (var i = 0; i < match.length; i++) {
// output += JSON.stringify(match[i])+"</br>";
// }
// $("#matchDiv").append(output);
}
});
});
... ...