From 3b604eb218a3b167144cc6e5d9c86cd95e16157c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 10 五月 2025 08:08:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java | 211 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 197 insertions(+), 14 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 23a310d..c9294b6 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service("basJarMastService")
@@ -24,20 +25,143 @@
return this.baseMapper.getJarMastByJarId(jarId);
}
+ @Override
+ public List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,Integer statusStart,Integer statusEnd) {
+ ArrayList<Integer> statusList = new ArrayList<>();
+ for (Integer i = statusStart;i<=statusEnd;i++){
+ statusList.add(i);
+ }
+ return this.baseMapper.getJarMastByJarIdAndStatusList(jarId,statusList);
+ }
+ @Override
+ public List<BasJarMast> getJarMastByJarIdAndStatusList(Integer jarId,List<Integer> statusList) {
+ return this.baseMapper.getJarMastByJarIdAndStatusList(jarId,statusList);
+ }
+
+ @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(17);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
+ case 7://鍑哄喎鍗存Ы浠诲姟
+ case 6://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟
+ case 5://寮�鍑烘枡闂ㄤ换鍔�
+ statusList.add(10);//鍏ュ喎鍗存Ы瀹屾垚
+ case 4://鍑虹～鍖栫綈浠诲姟
+ statusList.add(11);//鍐峰嵈涓�
+
+ if (type!=6){
+ statusList.add(12);//鍐峰嵈瀹屾垚
+ }
+ statusList.add(13);//鍐峰嵈瀹屾垚绛夊緟灏忚溅
+ if (type!=7){
+ statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
+ }
+ case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
+ statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
+
+ case 2://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
+ statusList.add(0);//鍒濆
+
+ case 1://寮�杩涙枡闂ㄤ换鍔�
+ statusList.add(2);//杩涙枡闂ㄦ墦寮�
+
+ case 0://鍏ョ～鍖栫綈浠诲姟
+ statusList.add(1);//寮�杩涙枡闂ㄤ腑
+ statusList.add(3);//鍏ョ～鍖栫綈涓�
+
+ if (type!=6){
+ statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
+ }
+ if (type!=5 && type!=6){
+ statusList.add(6);//纭寲瀹屾垚
+ }
+
+ statusList.add(7);//寮�鍑烘枡闂ㄤ腑
+
+ if (type!=4 && type!=6){
+ statusList.add(8);//鍑烘枡闂ㄦ墦寮�
+ }
+
+ statusList.add(9);//鍑虹～鍖栫綈涓��===銆嬪叆鍐峰嵈妲戒腑
+
+ statusList.add(15);//鍑哄喎鍗存Ы涓�
+ statusList.add(16);//鍑哄喎鍗存Ы瀹屾垚
+
+ }
+ return this.baseMapper.getJarMastByJarIdAndStatusList(jarId,statusList);
+ }
+
/*
* 鑾峰彇jarLocDigit鏈�澶х殑BasJarMast
* */
@Override
public BasJarMast getJarMastByJarIdMax(Integer jarId) {
- return this.baseMapper.getJarMastByJarIdMax(jarId);
+ List<Integer> statusList = new ArrayList<Integer>(){{add(0);add(1);add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);add(11);add(12);add(13);add(14);add(15);}};
+ return this.baseMapper.getJarMastByJarIdMax(jarId,statusList);
}
+
+ @Override
+ public BasJarMast getJarMastByJarIdMax(Integer jarId,Integer statusStart,Integer statusEnd) {
+ ArrayList<Integer> statusList = new ArrayList<>();
+ for (Integer i = statusStart;i<=statusEnd;i++){
+ statusList.add(i);
+ }
+ 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
* */
@Override
public BasJarMast getJarMastByJarIdMin(Integer jarId) {
- return this.baseMapper.getJarMastByJarIdMin(jarId);
+ List<Integer> statusList = new ArrayList<Integer>(){{add(0);add(1);add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);add(11);add(12);add(13);add(14);add(15);}};
+ return this.baseMapper.getJarMastByJarIdMin(jarId,statusList);
+ }
+
+ /*
+ * 鑾峰彇jarLocDigit鏈�灏忕殑BasJarMast
+ * */
+ @Override
+ public BasJarMast getJarMastByJarIdMin(Integer jarId,Integer statusStart,Integer statusEnd) {
+ List<Integer> statusList = new ArrayList<>();
+ for (Integer i = statusStart;i<=statusEnd;i++){
+ 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
@@ -46,19 +170,78 @@
}
@Override
- public Integer selectJarMastOperation(Integer jarId,Integer type) {
- switch (type){
- case 1:
- return this.baseMapper.selectJarMastOperation1(jarId);
- case 2:
- return this.baseMapper.selectJarMastOperation2(jarId);
- case 3:
- return this.baseMapper.selectJarMastOperation3(jarId);
- case 4:
- return this.baseMapper.selectJarMastOperation4(jarId);
- default:
- return 99;
+ public Integer selectJarMastOperation(Integer jarId,Integer statusStart,Integer statusEnd) {
+ ArrayList<Integer> statusList = new ArrayList<>();
+ for (Integer i = statusStart;i<=statusEnd;i++){
+ statusList.add(i);
}
+ return this.baseMapper.selectJarMastOperationByStatusList(jarId,statusList);
+ }
+
+ @Override
+ public Integer selectJarMastOperation(Integer jarId,List<Integer> statusList) {
+ return this.baseMapper.selectJarMastOperationByStatusList(jarId,statusList);
+ }
+
+ @Override
+ public Integer selectJarMastOperation(Integer jarId,Integer type) {
+ ArrayList<Integer> statusList = new ArrayList<>();
+ switch (type){
+ default:
+ statusList.add(17);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
+ case 7://鍑哄喎鍗存Ы浠诲姟
+ case 6://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟
+ case 5://寮�鍑烘枡闂ㄤ换鍔�
+ statusList.add(10);//鍏ュ喎鍗存Ы瀹屾垚
+ case 4://鍑虹～鍖栫綈浠诲姟
+ statusList.add(11);//鍐峰嵈涓�
+
+ if (type!=6){
+ statusList.add(12);//鍐峰嵈瀹屾垚
+ }
+ statusList.add(13);//鍐峰嵈瀹屾垚绛夊緟灏忚溅
+ if (type!=7){
+ statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
+ }
+ case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
+ if (type!=6){
+ statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
+ }
+ case 2://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
+ statusList.add(0);//鍒濆
+
+ case 1://寮�杩涙枡闂ㄤ换鍔�
+ statusList.add(2);//杩涙枡闂ㄦ墦寮�
+
+ case 0://鍏ョ～鍖栫綈浠诲姟
+ statusList.add(1);//寮�杩涙枡闂ㄤ腑
+ statusList.add(3);//鍏ョ～鍖栫綈涓�
+
+ if (type!=6 && type!=3){
+ statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
+ }
+ if (type!=5 && type!=6){
+ statusList.add(6);//纭寲瀹屾垚
+ }
+
+ statusList.add(7);//寮�鍑烘枡闂ㄤ腑
+
+ 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