统计优化

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

@@ -302,7 +302,9 @@ public class invCardManageAction implements IMINAction {
 		m.put("equrelId", equrelId);
 		m.put("vciId", vciId);
 		m.put("pickupNo", pickupNo);
-		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).selectPickupRecord(m,rows);

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

@@ -77,7 +77,9 @@
 		and oi.VOI_PERSON_ID = p.VCI_ID
 		and od.VOD_PRO_EQU_REL_ID = r.VCI_ID
 		and r.VCI_EQUIPMENT_ID = e.VEQ_ID
-		and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
+		<if test="branchId != null and branchId != ''">
+			and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
+		</if>
 		<if test="machineNo != null and machineNo != ''">
 			AND	e.VEQ_IMEI_ADDR  = #{machineNo,jdbcType=VARCHAR}
 		</if>
@@ -97,6 +99,7 @@
 			and substr(VOD_PICKUP_TIME,1,8) between substr((#{pickUpDates, jdbcType=VARCHAR}),1,8)
 			and substr((#{pickUpDates, jdbcType=VARCHAR}),12,19)
 		</if>
+		order by oi.VOI_MODIFY_TIME desc
 	</select>
 
 	<select id="selectIncomeDetail" resultType="hashmap" parameterType="java.util.Map">