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; @@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
4 import com.google.common.collect.Maps; 4 import com.google.common.collect.Maps;
5 import com.google.common.collect.Sets; 5 import com.google.common.collect.Sets;
6 import com.yoho.service.model.union.response.ActivateDeviceIdResponseBO; 6 import com.yoho.service.model.union.response.ActivateDeviceIdResponseBO;
  7 +import com.yoho.service.model.union.response.PageActivateDeviceIdResponseBO;
7 import com.yoho.unions.common.model.DeviceIdMatchBO; 8 import com.yoho.unions.common.model.DeviceIdMatchBO;
8 import com.yoho.unions.common.service.IBusinessImportService; 9 import com.yoho.unions.common.service.IBusinessImportService;
9 import com.yoho.unions.dal.IUnionLogsDAO; 10 import com.yoho.unions.dal.IUnionLogsDAO;
@@ -89,7 +90,9 @@ public class DeviceIdMatchImportServiceImpl implements IBusinessImportService { @@ -89,7 +90,9 @@ public class DeviceIdMatchImportServiceImpl implements IBusinessImportService {
89 BeanUtils.copyProperties(input, output); 90 BeanUtils.copyProperties(input, output);
90 return output; 91 return output;
91 }); 92 });
  93 + PageActivateDeviceIdResponseBO pageActivateDeviceIdResponseBO = new PageActivateDeviceIdResponseBO();
  94 + pageActivateDeviceIdResponseBO.setList(responseBOList);
92 logger.debug("method batchImport(List<Object>) out."); 95 logger.debug("method batchImport(List<Object>) out.");
93 - return responseBOList; 96 + return pageActivateDeviceIdResponseBO;
94 } 97 }
95 } 98 }
@@ -75,11 +75,11 @@ @@ -75,11 +75,11 @@
75 <div id="imeiImportDiv" style="margin-left: 30px;"></div> 75 <div id="imeiImportDiv" style="margin-left: 30px;"></div>
76 </form> 76 </form>
77 </div> 77 </div>
78 - <div region="center" style="height: 800px;">  
79 - <div style="margin-left: 30px;margin-top: 20px; height:100px;"> 78 + <div region="center" >
  79 + <div style="margin-left: 30px;margin-top: 20px; height:420px;overflow:auto;">
80 <table id="activateTalbe2"></table> 80 <table id="activateTalbe2"></table>
81 </div> 81 </div>
82 - <div id="matchDiv" style="padding:30px;height:420px;"></div> 82 + <!--<div id="matchDiv" style="padding:30px;height:420px;"></div>-->
83 </div> 83 </div>
84 </div> 84 </div>
85 <div title="点击查询" style="padding:20px;display:none;overflow:auto;"> 85 <div title="点击查询" style="padding:20px;display:none;overflow:auto;">
@@ -591,12 +591,14 @@ @@ -591,12 +591,14 @@
591 msg: "匹配完成", 591 msg: "匹配完成",
592 height: 250 592 height: 250
593 }); 593 });
  594 + console.info(data)
594 var match = data.data; 595 var match = data.data;
595 - var output = "匹配的内容</br>";  
596 - for (var i = 0; i < match.length; i++) {  
597 - output += JSON.stringify(match[i])+"</br>";  
598 - }  
599 - $("#matchDiv").append(output); 596 + $("#activateTalbe2").datagrid('loadData', data);
  597 +// var output = "匹配的内容</br>";
  598 +// for (var i = 0; i < match.length; i++) {
  599 +// output += JSON.stringify(match[i])+"</br>";
  600 +// }
  601 +// $("#matchDiv").append(output);
600 } 602 }
601 }); 603 });
602 604
@@ -615,12 +617,12 @@ @@ -615,12 +617,12 @@
615 height: 250 617 height: 250
616 }); 618 });
617 var match = data.data; 619 var match = data.data;
618 - var match = data.data;  
619 - var output = "匹配的内容</br>";  
620 - for (var i = 0; i < match.length; i++) {  
621 - output += JSON.stringify(match[i])+"</br>";  
622 - }  
623 - $("#matchDiv").append(output); 620 + $("#activateTalbe2").datagrid('loadData', match);
  621 +// var output = "匹配的内容</br>";
  622 +// for (var i = 0; i < match.length; i++) {
  623 +// output += JSON.stringify(match[i])+"</br>";
  624 +// }
  625 +// $("#matchDiv").append(output);
624 } 626 }
625 }); 627 });
626 }); 628 });