new

saicLogistics/src/main/java/com/fuzamei/mapper/OrdersIssueMapper.xml

@@ -25,8 +25,8 @@
 			o.supplier_id=u.user_id
 		<where>
 			o.planner_id=#{userId}
-			<if test="supplierName!=null and supplierName!=''">
-				and u.person_name=#{supplierName}
+			<if test="supplierId!=null">
+				and o.supplier_id=#{supplierId}
 			</if>
 			<if test="boxNo!=null and boxNo!=''">
 				and o.box_no=#{boxNo}
@@ -44,38 +44,24 @@
 	
 	<select id="findQueryCountByPlanner" parameterType="Params" resultType="int">
 		select 
-			count(*) 
-		from
-			(select 
-				o.order_id,
-				u.person_name as supplier_name,
-				o.part_no,
-				o.box_no,
-				o.inbox_qty,
-				o.require_time,
-				o.status_id,
-				o.update_time
-			from 
-				orders o
-			left join 
-				users u
-			on 
-				o.supplier_id=u.user_id
-			<where>
-				o.planner_id=#{userId}
-				<if test="supplierName!=null and supplierName!=''">
-					and u.person_name=#{supplierName}
-				</if>
-				<if test="boxNo!=null and boxNo!=''">
-					and o.box_no=#{boxNo}
-				</if>
-				<if test="statusId!=null">
-					and o.status_id=#{statusId}
-				</if>
-				<if test="startTime!=null and endTime!=null">
-					and o.require_time between #{startTime} and #{endTime}
-				</if>
-			</where>) temp
+			count(*)
+		from 
+			orders
+		<where>
+			planner_id=#{userId}
+			<if test="supplierId!=null">
+				and supplier_id=#{supplierId}
+			</if>
+			<if test="boxNo!=null and boxNo!=''">
+				and box_no=#{boxNo}
+			</if>
+			<if test="statusId!=null">
+				and status_id=#{statusId}
+			</if>
+			<if test="startTime!=null and endTime!=null">
+				and require_time between #{startTime} and #{endTime}
+			</if>
+		</where>
 	</select>
 	
 	<select id="queryOrdersBySupplier" parameterType="Params" resultType="IssueOrder">

saicLogistics/src/main/java/com/fuzamei/service/CargoConsignService.java

@@ -1,5 +1,6 @@
 package com.fuzamei.service;
 
+import java.util.List;
 import java.util.Map;
 
 import com.fuzamei.entity.Params;
@@ -13,6 +14,6 @@ public interface CargoConsignService {
 
 	void doCarry(Params params);
 
-	Map<String, Object> orderTracking(Params params);
+	List<Object> orderTracking(Params params);
 
 }

saicLogistics/src/main/java/com/fuzamei/service/CargoDeliverService.java

@@ -1,5 +1,6 @@
 package com.fuzamei.service;
 
+import java.util.List;
 import java.util.Map;
 
 import com.fuzamei.entity.Params;
@@ -9,6 +10,6 @@ public interface CargoDeliverService {
 
 	PageDTO queryOrdersByCarrier(Params params);
 
-	Map<String, Object> orderTracking(Params params);
+	List<Object> orderTracking(Params params);
 
 }

saicLogistics/src/main/java/com/fuzamei/service/CargoTallyService.java

@@ -1,5 +1,6 @@
 package com.fuzamei.service;
 
+import java.util.List;
 import java.util.Map;
 
 import com.fuzamei.entity.Params;
@@ -14,6 +15,6 @@ public interface CargoTallyService {
 
 	void confirmOrReject(Params params);
 
-	Map<String, Object> orderTracking(Params params);
+	List<Object> orderTracking(Params params);
 
 }

saicLogistics/src/main/java/com/fuzamei/service/OrdersIssueService.java

@@ -1,5 +1,6 @@
 package com.fuzamei.service;
 
+import java.util.List;
 import java.util.Map;
 
 import com.fuzamei.entity.Orders;
@@ -12,7 +13,7 @@ public interface OrdersIssueService {
 
 	void addOrder(Params params);
 
-	Map<String, Object> orderTracking(Params params);
+	List<Object> orderTracking(Params params);
 
 	PageDTO queryOrdersBySupplier(Params params);
 

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/CargoConsignServiceImpl.java

@@ -65,7 +65,7 @@ public class CargoConsignServiceImpl implements CargoConsignService {
 	}
 
 	@Override
-	public Map<String, Object> orderTracking(Params params) {
+	public List<Object> orderTracking(Params params) {
 		Orders order = params.getOrder();
 		return OrdersIssueServiceImpl.dispatchOrderInfo(order);
 	}

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/CargoDeliverServiceImpl.java

@@ -31,7 +31,7 @@ public class CargoDeliverServiceImpl implements CargoDeliverService {
 	}
 
 	@Override
-	public Map<String, Object> orderTracking(Params params) {
+	public List<Object> orderTracking(Params params) {
 		Orders order = params.getOrder();
 		return OrdersIssueServiceImpl.dispatchOrderInfo(order);
 	}

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/CargoTallyServiceImpl.java

@@ -67,7 +67,7 @@ public class CargoTallyServiceImpl implements CargoTallyService {
 	}
 
 	@Override
-	public Map<String, Object> orderTracking(Params params) {
+	public List<Object> orderTracking(Params params) {
 		Orders order = params.getOrder();
 		return OrdersIssueServiceImpl.dispatchOrderInfo(order);
 	}

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/OrdersIssueServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fuzamei.service.serviceImpl;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -88,7 +89,7 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 	}
 
 	@Override
-	public Map<String, Object> orderTracking(Params params) {
+	public List<Object> orderTracking(Params params) {
 		Orders order = params.getOrder();
 		return dispatchOrderInfo(order);
 	}
@@ -104,8 +105,8 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 	* @date 2018年1月25日 下午9:11:39
 	* @throws
 	 */
-	public static final Map<String, Object> dispatchOrderInfo(Orders order){
-		Map<String, Object> map = new LinkedHashMap<String, Object>();
+	public static final List<Object> dispatchOrderInfo(Orders order){
+		List<Object> list=new ArrayList<Object>();
 		IssueOrder issueOrder=new IssueOrder();
 		issueOrder.setOrderId(order.getOrderId());
 		issueOrder.setBoxNo(order.getBoxNo());
@@ -117,7 +118,7 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 		issueOrder.setUpdateTime(order.getUpdateTime());
 		issueOrder.setStatusName(order.getStatusName());
 		issueOrder.setSupplierName(order.getSupplierName());
-		map.put("issueOrder", issueOrder);
+		list.add(issueOrder);
 		if(!Statuses.UNSEND.equals(order.getStatusId())){
 			SendOrder sendOrder=new SendOrder();
 			sendOrder.setOrderId(order.getOrderId());
@@ -130,7 +131,7 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 			sendOrder.setSendTime(order.getSendTime());
 			sendOrder.setStatusName(order.getStatusName());
 			sendOrder.setSupplierName(order.getSupplierName());
-			map.put("sendOrder", sendOrder);
+			list.add(sendOrder);
 		}
 		if(Statuses.DELIVERING.equals(order.getStatusId())||Statuses.TALLIED.equals(order.getStatusId())||Statuses.REJECTED.equals(order.getStatusId())){
 			DeliverOrder deliverOrder = new DeliverOrder();
@@ -143,7 +144,7 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 			deliverOrder.setStatusName(order.getStatusName());
 			deliverOrder.setTransportTime(order.getTransportTime());
 			deliverOrder.setUpdateTime(order.getUpdateTime());
-			map.put("deliverOrder", deliverOrder);
+			list.add(deliverOrder);
 		}
 		if(Statuses.TALLIED.equals(order.getStatusId())||Statuses.REJECTED.equals(order.getStatusId())){
 			TallyOrder tallyOrder=new TallyOrder();
@@ -156,9 +157,9 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 			tallyOrder.setReceiverName(order.getReceiverName());
 			tallyOrder.setStatusName(order.getStatusName());
 			tallyOrder.setTallyTime(order.getTallyTime());
-			map.put("tallyOrder", tallyOrder);
+			list.add(tallyOrder);
 		}
-		return map;
+		return list;
 	}
 
 	

saicLogistics/src/main/java/com/fuzamei/web/CargoConsignAction.java

@@ -244,8 +244,8 @@ public class CargoConsignAction {
 				if(!params.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权查看");
 			}
 			params.setOrder(order);
-			Map<String, Object> map = cargoConsignService.orderTracking(params);
-			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, map);
+			List<Object> list = cargoConsignService.orderTracking(params);
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}

saicLogistics/src/main/java/com/fuzamei/web/CargoDeliverAction.java

@@ -1,5 +1,6 @@
 package com.fuzamei.web;
 
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -102,8 +103,8 @@ public class CargoDeliverAction {
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(!params.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权查看");
 			params.setOrder(order);
-			Map<String, Object> map = cargoDeliverService.orderTracking(params);
-			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, map);
+			List<Object> list = cargoDeliverService.orderTracking(params);
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}

saicLogistics/src/main/java/com/fuzamei/web/CargoTallyAction.java

@@ -1,5 +1,6 @@
 package com.fuzamei.web;
 
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -166,8 +167,8 @@ public class CargoTallyAction {
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(!params.getUserId().equals(order.getReceiverId())) throw new RuntimeException("无权查看");
 			params.setOrder(order);
-			Map<String, Object> map = cargoTallyService.orderTracking(params);
-			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, map);
+			List<Object> list = cargoTallyService.orderTracking(params);
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}

saicLogistics/src/main/java/com/fuzamei/web/OrdersIssueAction.java

@@ -326,8 +326,8 @@ public class OrdersIssueAction {
 				if(!params.getUserId().equals(order.getSupplierId())) throw new RuntimeException(HintMSG.NO_AUTH);
 			}
 			params.setOrder(order);
-			Map<String, Object> map = ordersIssueService.orderTracking(params);
-			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, map);
+			List<Object> list = ordersIssueService.orderTracking(params);
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
 		}