From e47b30ba51de51df6210910e50d790614a9b30e1 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 27 六月 2024 20:38:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasJarMast.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
index c8ab673..9689a51 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.java
@@ -223,32 +223,52 @@
return null;
/*
- statusList.add(15);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
- case 5://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟 //鍑哄喎鍗存Ы浠诲姟 //寮�鍑烘枡闂ㄤ换鍔�
+ default:
+ 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);//鍐峰嵈瀹屾垚璋冨皬杞︿换鍔�
+
case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
+
case 2://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
statusList.add(0);//鍒濆
+
case 1://寮�杩涙枡闂ㄤ换鍔�
statusList.add(2);//杩涙枡闂ㄦ墦寮�
+
case 0://鍏ョ～鍖栫綈浠诲姟
statusList.add(1);//寮�杩涙枡闂ㄤ腑
statusList.add(3);//鍏ョ～鍖栫綈涓�
+
statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
- if (type!=4){
+
+ if (type!=5){
statusList.add(6);//纭寲瀹屾垚
}
+
statusList.add(7);//寮�鍑烘枡闂ㄤ腑
- statusList.add(8);//鍑烘枡闂ㄦ墦寮�
+
+ if (type!=4){
+ statusList.add(8);//鍑烘枡闂ㄦ墦寮�
+ }
+
statusList.add(9);//鍑虹～鍖栫綈涓��===銆嬪叆鍐峰嵈妲戒腑
+
+ statusList.add(15);//鍑哄喎鍗存Ы涓�
+ statusList.add(16);//鍑哄喎鍗存Ы瀹屾垚
+ if (type!=7){
+ statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
+ }
* */
}
@@ -273,5 +293,9 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public Integer getStatusComplete(){
+ return this.status+1;
+ }
+
}
--
Gitblit v1.9.1