统计

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

@@ -218,6 +218,7 @@ public class invCardManageAction implements IMINAction {
 			MINSession session) throws Exception {
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
+		String branchId = user.getBranchId();
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		//获取当前时间
 		Date currentTime = new Date();
@@ -226,6 +227,9 @@ public class invCardManageAction implements IMINAction {
 		m.put("equNum", equNum);
 		m.put("datesTime", datesTime);
 		m.put("nowDate", nowDate);
+		if(!"88888888".equals(branchId)) {
+			m.put("branchId", branchId);
+		}
 		List<Map<String, String>> detailList = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectIncomeDetail(rows, m);
 

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

@@ -109,6 +109,9 @@
 			AND VOI_EQUIPMENT_ID = VEQ_ID
 			AND PIF_PAYTYPE IN ('91')
 			AND VOI_ORDER_AMT != '0.00'
+			<if test="branchId != null and branchId != ''">
+				AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
+			</if>
 			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 			UNION ALL
 			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
@@ -122,6 +125,9 @@
 			AND VOI_EQUIPMENT_ID = VEQ_ID
 			AND PIF_PAYTYPE IN ('92')
 			AND VOI_ORDER_AMT != '0.00'
+			<if test="branchId != null and branchId != ''">
+				AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
+			</if>
 			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 			UNION ALL
 			SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,VEQ_MACHINE_NO,
@@ -135,6 +141,9 @@
 			AND VOI_EQUIPMENT_ID = VEQ_ID
 			AND PIF_PAYTYPE IN ('91', '92')
 			AND VOI_ORDER_AMT = '0.00'
+			<if test="branchId != null and branchId != ''">
+				AND	VEQ_BRANCHID  = #{branchId,jdbcType=VARCHAR}
+			</if>
 			GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VEQ_MACHINE_NO
 		) b
 		where 1=1