new

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

@@ -46,20 +46,20 @@
 		select 
 			count(*)
 		from 
-			orders
+			orders o
 		<where>
-			supplier_id=#{userId}
+			o.supplier_id=#{userId}
 			<if test="orderId!=null">
-				and order_id=#{orderId}
+				and o.order_id=#{orderId}
 			</if>
-			<if test="boxNo!=null">
-				and box_no=#{boxNo}
+			<if test="boxNo!=null and boxNo!=''">
+				and o.box_no=#{boxNo}
 			</if>
 			<if test="statusId!=null">
-				and status_id=#{statusId}
+				and o.status_id=#{statusId}
 			</if>
 			<if test="startTime!=null and endTime!=null">
-				and require_time between #{startTime} and #{endTime}
+				and o.require_time between #{startTime} and #{endTime}
 			</if>
 		</where>
 	</select>
@@ -84,7 +84,7 @@
 			<if test="orderId!=null">
 				and o.order_id=#{orderId}
 			</if>
-			<if test="boxNo!=null">
+			<if test="boxNo!=null and boxNo!=''">
 				and o.box_no=#{boxNo}
 			</if>
 			<if test="statusId!=null">
@@ -108,7 +108,7 @@
 			<if test="orderId!=null">
 				and order_id=#{orderId}
 			</if>
-			<if test="boxNo!=null">
+			<if test="boxNo!=null and boxNo!=''">
 				and box_no=#{boxNo}
 			</if>
 			<if test="statusId!=null">

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

@@ -11,6 +11,7 @@
 			o.inbox_qty,
 			o.require_time,
 			o.update_time,
+			o.status_id,
 			s.status_name
 		from 
 			orders o
@@ -30,6 +31,9 @@
 			<if test="boxNo!=null">
 				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>
@@ -49,6 +53,7 @@
 				o.box_no,
 				o.inbox_qty,
 				o.require_time,
+				o.status_id,
 				o.update_time
 			from 
 				orders o
@@ -64,6 +69,9 @@
 				<if test="boxNo!=null">
 					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>
@@ -108,20 +116,20 @@
 		select 
 			count(*)
 		from 
-			orders
+			orders o
 		<where>
-			supplier_id=#{userId}
+			o.supplier_id=#{userId}
 			<if test="orderId!=null">
-				and order_id=#{orderId}
+				and o.order_id=#{orderId}
 			</if>
 			<if test="boxNo!=null">
-				and box_no=#{boxNo}
+				and o.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}
+				and o.require_time between #{startTime} and #{endTime}
 			</if>
 		</where>
 	</select>

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

@@ -207,7 +207,7 @@ public class CargoConsignAction {
 	public Map<String, Object> showAllStatus(){
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
-			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.SUPPLIER,Role.CARRIER);//检测当前操作用户权限
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.PLANNER,Role.SUPPLIER,Role.CARRIER);//检测当前操作用户权限
 			List<Status> statusList = statusService.queryAllStatusInformation();
 			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, statusList);
 		} catch (Exception e) {

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

@@ -84,6 +84,7 @@ public class OrdersIssueAction {
 			params.setUserId(Integer.parseInt(userId));
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
 			int rowNum = ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 1);
+			params.setStatusId(ValidationUtil.checkAndAssignNullIntegerIfIsBlank(params.getStatusId()));
 			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
 			Long endTime=ValidationUtil.checkAndAssignDefaultLong(params.getEndTime(), Long.MAX_VALUE);
 			params.setStartTime(startTime);

saicLogistics/src/test/java/com/fuzamei/web/CargoConsignActionTest.java

@@ -10,12 +10,16 @@ import com.alibaba.fastjson.JSON;
 import com.fuzamei.baseTest.BaseJunit4Test;
 import com.fuzamei.entity.Params;
 import com.fuzamei.entity.Status;
+import com.fuzamei.service.CargoConsignService;
 import com.fuzamei.service.StatusService;
+import com.fuzamei.util.PageDTO;
 
 public class CargoConsignActionTest extends BaseJunit4Test{
 	@Autowired
 	private CargoConsignAction cargoConsignAction;
 	@Autowired
+	private CargoConsignService cargoConsignService;
+	@Autowired
 	private StatusService statusService;
 	
 	@Test//测试【供应商】查询订单功能
@@ -28,8 +32,8 @@ public class CargoConsignActionTest extends BaseJunit4Test{
 		params.setStatusId(null);
 		params.setStartTime(null);
 		params.setEndTime(1516955480353L);
-		Map<String, Object> result = cargoConsignAction.queryOrdersBySupplier(params);
-		String jsonString = JSON.toJSONString(result,true);
+		PageDTO queryOrdersBySupplier = cargoConsignService.queryOrdersBySupplier(params);
+		String jsonString = JSON.toJSONString(queryOrdersBySupplier,true);
 		System.out.println(jsonString);
 	}