From 4149d11f06c462eed17c0b26094f35547aad58cd Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 28 十一月 2024 22:52:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java | 110 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 84 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
index 1783f39..c9294b6 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
@@ -39,24 +39,35 @@
}
@Override
+ public List<BasJarMast> getJarMastByJarIdAndStatusListB(Integer jarId,List<Integer> statusList) {
+ return this.baseMapper.getJarMastByJarIdAndStatusListB(jarId,statusList);
+ }
+
+ @Override
+ public List<BasJarMast> getJarMastByJarIdAndStatusListCharge(Integer jarId,List<Integer> statusList) {
+ return this.baseMapper.getJarMastByJarIdAndStatusListCharge(jarId,statusList);
+ }
+
+ @Override
public List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,Integer type) {
ArrayList<Integer> statusList = new ArrayList<>();
switch (type){
default:
- statusList.add(15);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
- case 5://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟 //鍑哄喎鍗存Ы浠诲姟 //寮�鍑烘枡闂ㄤ换鍔�
+ statusList.add(17);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
+ case 7://鍑哄喎鍗存Ы浠诲姟
+ case 6://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟
+ case 5://寮�鍑烘枡闂ㄤ换鍔�
statusList.add(10);//鍏ュ喎鍗存Ы瀹屾垚
-
case 4://鍑虹～鍖栫綈浠诲姟
statusList.add(11);//鍐峰嵈涓�
- if (type!=5){
+ if (type!=6){
statusList.add(12);//鍐峰嵈瀹屾垚
}
-
- statusList.add(13);//鍑哄喎鍗存Ы涓�
- statusList.add(14);//鍑哄喎鍗存Ы瀹屾垚
-
+ statusList.add(13);//鍐峰嵈瀹屾垚绛夊緟灏忚溅
+ if (type!=7){
+ statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
+ }
case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
@@ -70,15 +81,24 @@
statusList.add(1);//寮�杩涙枡闂ㄤ腑
statusList.add(3);//鍏ョ～鍖栫綈涓�
- statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
-
- if (type!=4){
+ if (type!=6){
+ statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
+ }
+ if (type!=5 && type!=6){
statusList.add(6);//纭寲瀹屾垚
}
statusList.add(7);//寮�鍑烘枡闂ㄤ腑
- statusList.add(8);//鍑烘枡闂ㄦ墦寮�
+
+ if (type!=4 && type!=6){
+ statusList.add(8);//鍑烘枡闂ㄦ墦寮�
+ }
+
statusList.add(9);//鍑虹～鍖栫綈涓��===銆嬪叆鍐峰嵈妲戒腑
+
+ statusList.add(15);//鍑哄喎鍗存Ы涓�
+ statusList.add(16);//鍑哄喎鍗存Ы瀹屾垚
+
}
return this.baseMapper.getJarMastByJarIdAndStatusList(jarId,statusList);
}
@@ -101,6 +121,16 @@
return this.baseMapper.getJarMastByJarIdMax(jarId,statusList);
}
+ @Override
+ public BasJarMast getJarMastByJarIdMaxB(Integer jarId,Integer statusStart,Integer statusEnd) {
+ ArrayList<Integer> statusList = new ArrayList<>();
+ for (Integer i = statusStart;i<=statusEnd;i++){
+ statusList.add(i);
+ }
+ return this.baseMapper.getJarMastByJarIdMaxB(jarId,statusList);
+ }
+
+
/*
* 鑾峰彇jarLocDigit鏈�灏忕殑BasJarMast
* */
@@ -120,6 +150,18 @@
statusList.add(i);
}
return this.baseMapper.getJarMastByJarIdMin(jarId,statusList);
+ }
+
+ /*
+ * 鑾峰彇jarLocDigit鏈�灏忕殑BasJarMast
+ * */
+ @Override
+ public BasJarMast getJarMastByJarIdMinB(Integer jarId,Integer statusStart,Integer statusEnd) {
+ List<Integer> statusList = new ArrayList<>();
+ for (Integer i = statusStart;i<=statusEnd;i++){
+ statusList.add(i);
+ }
+ return this.baseMapper.getJarMastByJarIdMinB(jarId,statusList);
}
@Override
@@ -146,23 +188,25 @@
ArrayList<Integer> statusList = new ArrayList<>();
switch (type){
default:
- statusList.add(15);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
- case 5://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟 //鍑哄喎鍗存Ы浠诲姟 //寮�鍑烘枡闂ㄤ换鍔�
+ statusList.add(17);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
+ case 7://鍑哄喎鍗存Ы浠诲姟
+ case 6://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟
+ case 5://寮�鍑烘枡闂ㄤ换鍔�
statusList.add(10);//鍏ュ喎鍗存Ы瀹屾垚
-
case 4://鍑虹～鍖栫綈浠诲姟
statusList.add(11);//鍐峰嵈涓�
- if (type!=5){
+ if (type!=6){
statusList.add(12);//鍐峰嵈瀹屾垚
}
-
- statusList.add(13);//鍑哄喎鍗存Ы涓�
- statusList.add(14);//鍑哄喎鍗存Ы瀹屾垚
-
+ statusList.add(13);//鍐峰嵈瀹屾垚绛夊緟灏忚溅
+ if (type!=7){
+ statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
+ }
case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
- statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
-
+ if (type!=6){
+ statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
+ }
case 2://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
statusList.add(0);//鍒濆
@@ -173,17 +217,31 @@
statusList.add(1);//寮�杩涙枡闂ㄤ腑
statusList.add(3);//鍏ョ～鍖栫綈涓�
- statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
-
- if (type!=4){
+ if (type!=6 && type!=3){
+ statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
+ }
+ if (type!=5 && type!=6){
statusList.add(6);//纭寲瀹屾垚
}
statusList.add(7);//寮�鍑烘枡闂ㄤ腑
- statusList.add(8);//鍑烘枡闂ㄦ墦寮�
+
+ if (type!=4 && type!=6){
+ statusList.add(8);//鍑烘枡闂ㄦ墦寮�
+ }
+
statusList.add(9);//鍑虹～鍖栫綈涓��===銆嬪叆鍐峰嵈妲戒腑
+
+ statusList.add(15);//鍑哄喎鍗存Ы涓�
+ statusList.add(16);//鍑哄喎鍗存Ы瀹屾垚
+
}
return this.baseMapper.selectJarMastOperationByStatusList(jarId,statusList);
}
+ @Override
+ public Integer updateStatus(Integer jarId,Integer status,Integer statusUpdate) {
+ return this.baseMapper.updateStatus(jarId,status,statusUpdate);
+ }
+
}
--
Gitblit v1.9.1