优化接口

src/main/java/com/jeeplus/modules/warehouse/ledger/web/LedgerController.java

@@ -5,6 +5,8 @@ package com.jeeplus.modules.warehouse.ledger.web;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -255,8 +257,7 @@ public class LedgerController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "findByQrOrCode")
-	public AjaxJson findByQrOrCode(String qrId, String code) {
-		AjaxJson j = new AjaxJson();
+	public Map<String, Object>findByQrOrCode(String qrId, String code) {
 		boolean b = false;
 		if (StringUtils.isNotBlank(qrId)) {
 			b = true;
@@ -264,6 +265,8 @@ public class LedgerController extends BaseController {
 		if (StringUtils.isNotBlank(code)) {
 			b = true;
 		}
+		Map<String, Object> map = new HashMap<>();
+		List<LedgerInfo> ledgerInfoList = new ArrayList<>();
 		if (b) {
 			LedgerInfo temLi = new LedgerInfo();
 			QrCode qrCode = new QrCode();
@@ -271,13 +274,10 @@ public class LedgerController extends BaseController {
 			temLi.setQr(qrCode);
 			temLi.setCode(code);
 			LedgerInfo ledgerInfo = ledgerService.findByQrOrCode(temLi);
-			j.put("ledgerInfo", ledgerInfo);
-			j.setSuccess(true);
-			j.setMsg("查询成功");
-		} else {
-			j.setSuccess(false);
-			j.setMsg("查询失败");
+			ledgerInfoList.add(ledgerInfo);
+			map.put("rows", ledgerInfoList);
+			map.put("total", ledgerInfoList.size());
 		}
-		return j;
+		return  map;
 	}
 }
\ No newline at end of file