统计

src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -340,7 +340,9 @@ public class invCardManageAction implements IMINAction {
 		m.put("creatdDtes", creatdDtes);
 		m.put("pickUpDates", pickUpDates);
 		m.put("pickUpState", pickUpState);
-		m.put("branchId", branchId);
+		if(!"88888888".equals(branchId)) {
+			m.put("branchId", branchId);
+		}
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectOrderDetail(m,rows);

src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -22,7 +22,9 @@
 		where o.VOD_PRO_EQU_REL_ID = r.VCI_ID
 		and d.VOI_PERSON_ID = p.VCI_ID
 		and o.VOD_ORDER_ID = d.VOI_ID
-		and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
+		<if test="branchId != null and branchId != ''">
+			and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
+		</if>
     	<if test="pickupNo != null and pickupNo != ''">
 			AND	 d.VOI_PICKUP_NO  = #{pickupNo,jdbcType=VARCHAR}
 		</if>
@@ -46,6 +48,7 @@
 		and VCI_EXEIT_STATE = "00"
 		and VOI_STATE = "00"
 		and VCI_STATUS = "00"
+		and VOI_IS_DRAW = "01"
 		and VOI_PICKUP_STT in ("00", "01")
 	</select>
 	<select id="selectPickupRecord" resultType="hashmap" parameterType="java.util.Map">