ソースを参照

优化财务对账时客户筛选,加快反映速度

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7232 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 年 前
コミット
cb34fa4b0f

+ 11 - 10
src/main/java/com/uas/platform/b2b/controller/SaleApCheckController.java

@@ -31,6 +31,7 @@ import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ErpProdIODetailService;
 import com.uas.platform.b2b.service.PurchaseApCheckService;
 import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.service.VendorService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -63,6 +64,9 @@ public class SaleApCheckController {
 	@Autowired
 	PurchaseApCheckService purchaseApCheckService;
 
+	@Autowired
+	private VendorService vendorService;
+
 	@Autowired
 	private UserService userService;
 
@@ -131,24 +135,21 @@ public class SaleApCheckController {
 	@RequestMapping(value = "/getAllCustomers", method = RequestMethod.GET)
 	@ResponseBody
 	public Set<Object> getAllApChecksCustomers() {
-		List<Long> distributes = null;
+		Set<Object> set = new HashSet<>();
 		// 判断当前用户是否被客户分配
 		if (!SystemSession.getUser().isSys()) {
 			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
-			distributes = new ArrayList<Long>();
 			if (!CollectionUtils.isEmpty(vendors)) {
 				for (Vendor v : vendors) {
-					distributes.add(v.getMyEnUU());
+					set.add(v.getVendorEnterprise().getEnName());
 				}
 			} else {
 				return null;
 			}
-		}
-		List<ErpProdIODetail> erpProdIODetails = erpProdIODetailService.findAllApChecks(distributes);
-		Set<Object> set = new HashSet<>();
-		if (!CollectionUtils.isEmpty(erpProdIODetails)) {
-			for (ErpProdIODetail erpProdIODetail : erpProdIODetails) {
-				set.add(erpProdIODetail.getCustName());
+		} else {
+			List<Vendor> vendors = vendorService.findMyCustomers();
+			for (Vendor vendor : vendors) {
+				set.add(vendor.getMyEnterprise().getEnName());
 			}
 		}
 		return set;
@@ -172,7 +173,7 @@ public class SaleApCheckController {
 			if (!CollectionUtils.isEmpty(vendors)) {
 				for (Vendor v : vendors) {
 					distributes.add(v.getMyEnUU());
-				}
+				} 
 			} else {
 				return null;
 			}

+ 2 - 2
src/main/webapp/resources/tpl/index/fa/custInfo.html

@@ -7,12 +7,12 @@
 	<div>
 		<table width="50%" class="block table table-bordered table-striped table-hover">
 		<thead>
-				<th width="80px;" class="text-center">用户名称</th>
+				<th width="120px;" class="text-center">客户名称</th>
 		</thead>
 		<tbody>
 				<div style="overflow-y:scroll; width:100%;max-height:500px">			
 					<tr ng-repeat="cust in custs">
-						<td width="80px;"><a ng-bind="cust" ng-click="CustName(cust)"></a></td>
+						<td width="80px;"><a style="text-decoration:none" ng-bind="cust" ng-click="CustName(cust)"></a></td>
 					</tr>
 				</div>
 		<tbody>