From 62c2d68e28ab066e0091154a5d31b8e95a2f5959 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 14 十一月 2022 08:20:50 +0800
Subject: [PATCH] Merge branch 'ynwcs' of http://47.97.1.152:5880/r/zy-wcs into ynwcs
---
src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java
index fd56583..b56ed1b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java
@@ -14,10 +14,15 @@
public WrkCharge selectWorking(Integer steNo, WrkChargeType type) {
switch (type) {
case charge:
- return this.baseMapper.selectWorkingOfCharge(steNo);
+ return this.baseMapper.selectWorkingOfCharge(steNo, null);
case reset:
return this.baseMapper.selectWorkingOfReset(steNo);
}
return null;
}
+
+ @Override
+ public WrkCharge selectWorkingOfCharge(Integer charge) {
+ return this.baseMapper.selectWorkingOfCharge(null, charge);
+ }
}
--
Gitblit v1.9.1