From 2b4b495c41695a21b10c548599a0af98e984eda5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 19 七月 2024 15:16:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java |   65 ++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 13 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 ee80b66..44b7c7e 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
@@ -39,6 +39,16 @@
     }
 
     @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){
@@ -54,8 +64,10 @@
                 if (type!=6){
                     statusList.add(12);//鍐峰嵈瀹屾垚
                 }
-                statusList.add(13);//鍐峰嵈瀹屾垚璋冨皬杞︿换鍔�
-
+                statusList.add(13);//鍐峰嵈瀹屾垚绛夊緟灏忚溅
+                if (type!=7){
+                    statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
+                }
             case 3://鍏宠繘鏂欓棬浠诲姟  //鐢熸垚鍒濆浠诲姟
                 statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
 
@@ -69,15 +81,16 @@
                 statusList.add(1);//寮�杩涙枡闂ㄤ腑
                 statusList.add(3);//鍏ョ～鍖栫綈涓�
 
-                statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
-
-                if (type!=5){
+                if (type!=6){
+                    statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
+                }
+                if (type!=5  && type!=6){
                     statusList.add(6);//纭寲瀹屾垚
                 }
 
                 statusList.add(7);//寮�鍑烘枡闂ㄤ腑
 
-                if (type!=4){
+                if (type!=4 && type!=6){
                     statusList.add(8);//鍑烘枡闂ㄦ墦寮�
                 }
 
@@ -85,9 +98,7 @@
 
                 statusList.add(15);//鍑哄喎鍗存Ы涓�
                 statusList.add(16);//鍑哄喎鍗存Ы瀹屾垚
-                if (type!=7){
-                    statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
-                }
+
         }
         return this.baseMapper.getJarMastByJarIdAndStatusList(jarId,statusList);
     }
@@ -110,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
      * */
@@ -129,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
@@ -183,15 +216,16 @@
                 statusList.add(1);//寮�杩涙枡闂ㄤ腑
                 statusList.add(3);//鍏ョ～鍖栫綈涓�
 
-                statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
-
-                if (type!=5){
+                if (type!=6){
+                    statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
+                }
+                if (type!=5  && type!=6){
                     statusList.add(6);//纭寲瀹屾垚
                 }
 
                 statusList.add(7);//寮�鍑烘枡闂ㄤ腑
 
-                if (type!=4){
+                if (type!=4 && type!=6){
                     statusList.add(8);//鍑烘枡闂ㄦ墦寮�
                 }
 
@@ -204,4 +238,9 @@
         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