From c7feb49880a74b18149efec5fb515fdab3b8ccd5 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 18 七月 2024 10:52:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkMastExecute.java |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
index 895f5bf..b71ecda 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -141,13 +141,14 @@
 
     /**
      * 宸ヤ綔鐘舵��
-     * 0:鍒濆  wrk_type
+     * 0:鍒濆  wrk_sts
      * 1锛歊GV灏忚溅閬胯銆�2锛氶伩璁╁畬鎴愩��3锛氬紑闂ㄤ腑銆�4锛氬紑闂ㄥ畬鎴愩��5锛氭洿鏂板畬鎴�    //io_type = 1銆�3
      * 1锛歊GV灏忚溅閬胯銆�2锛氶伩璁╁畬鎴愩��3锛氬叧闂ㄤ腑銆�4锛氬叧闂ㄥ畬鎴愩��5锛氭洿鏂板畬鎴�    //io_type = 2銆�4
-     * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歳gv鍙栬揣銆�4锛歳gv鍙栬揣瀹屾垚銆�5锛歋te绌挎鐗堝叆纭寲缃愩��6锛氬叆缃愬畬鎴愩��7锛氭洿鏂板畬鎴�   //io_type = 5
-     * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴�   //io_type = 6
-     * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴�   //io_type = 7銆�8
-     * 1锛歋te绌挎鐗堝彇鏀捐揣涓��2锛氭斁璐у畬鎴愮瓑寰呬笅涓�姝ャ��3锛氳緭閫佺嚎浠诲姟涓嬪彂瀹屾垚銆�4锛氭洿鏂板畬鎴�   //io_type = 9
+     * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歳gv鍙栬揣銆�4锛歳gv鍙栬揣瀹屾垚銆�5锛歋te绌挎鐗堝叆纭寲缃愩��6锛氬叆缃愬畬鎴愩��7锛氭洿鏂板畬鎴�   //io_type = 5   STE  A闈㈢┛姊溅
+     * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴�   //io_type = 6  STE  B闈㈢┛姊溅
+     * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴�   //io_type = 7  B=>C   銆�8 C=>B
+     * 1锛歋te绌挎鐗堝彇鏀捐揣涓��2锛氭斁璐у畬鎴愮瓑寰呬笅涓�姝ャ��3锛氳緭閫佺嚎浠诲姟涓嬪彂瀹屾垚銆�4锛氭洿鏂板畬鎴�   //io_type = 9   STE   鏈杈撻�佺嚎
+     * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴�   //io_type = 10銆�11
      * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴�   //io_type = 10銆�11
      */
     @ApiModelProperty(value= "宸ヤ綔鐘舵��")
@@ -155,7 +156,7 @@
     private Integer wrkSts;
 
     /**
-     * 浠诲姟绫诲瀷 0: 鏈煡  1: 寮�杩涙枡闂�  2: 鍏宠繘鏂欓棬  3: 寮�鍑烘枡闂�  4: 鍏冲嚭鏂欓棬  5: 鍏ョ~鍖栫綈  6: 鍏ュ喎鍗存Ы  7: 绌挎杞﹁繘鍐峰嵈妲�  8: 绌挎杞︾寮�鍐峰嵈妲�  9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
+     * 浠诲姟绫诲瀷 0: 鏈煡  1: 寮�杩涙枡闂�  2: 鍏宠繘鏂欓棬  3: 寮�鍑烘枡闂�  4: 鍏冲嚭鏂欓棬  5: 鍏ョ~鍖栫綈  6: 鍏ュ喎鍗存Ы  7: 绌挎杞﹁繘鍐峰嵈妲�  B=>C  8: 绌挎杞︾寮�鍐峰嵈妲� C=>B  9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
      */
     @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡  1: 寮�杩涙枡闂�  2: 鍏宠繘鏂欓棬  3: 寮�鍑烘枡闂�  4: 鍏冲嚭鏂欓棬  5: 鍏ョ~鍖栫綈  6: 鍏ュ喎鍗存Ы  7: 绌挎杞﹁繘鍐峰嵈妲�  8: 绌挎杞︾寮�鍐峰嵈妲�  9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A ")
     @TableField("io_type")
@@ -275,25 +276,36 @@
         return null;
     }
 
+    /**
+     * 浠诲姟绫诲瀷 0: 鏈煡  1: 寮�杩涙枡闂�  2: 鍏宠繘鏂欓棬  3: 寮�鍑烘枡闂�  4: 鍏冲嚭鏂欓棬  5: 鍏ョ~鍖栫綈  6: 鍏ュ喎鍗存Ы  7: 绌挎杞﹁繘鍐峰嵈妲�  B=>C  8: 绌挎杞︾寮�鍐峰嵈妲� C=>B  9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
+     */
     public String getIoType$(){
         if (null == this.ioType){ return null; }
         switch (this.ioType){
             case 0:
                 return this.ioType+":鏈煡";
             case 1:
-                return this.ioType+":寮�闂�";
+                return this.ioType+":寮�杩涙枡闂�";
             case 2:
-                return this.ioType+":鍏抽棬";
+                return this.ioType+":鍏宠繘鏂欓棬";
             case 3:
-                return this.ioType+":鍏ョ~鍖栫綈";
+                return this.ioType+":寮�鍑烘枡闂�";
             case 4:
-                return this.ioType+":鍏ュ喎鍗存Ы";
+                return this.ioType+":鍏冲嚭鏂欓棬";
             case 5:
-                return this.ioType+":绌挎杞﹁繘鍐峰嵈妲�";
+                return this.ioType+":鍏ョ~鍖栫綈";
             case 6:
-                return this.ioType+":绌挎杞︾寮�鍐峰嵈妲�";
+                return this.ioType+":鍏ュ喎鍗存Ы";
             case 7:
+                return this.ioType+":绌挎杞﹁繘鍐峰嵈妲�:B=>C";
+            case 8:
+                return this.ioType+":绌挎杞︾寮�鍐峰嵈妲�:C=>B";
+            case 9:
                 return this.ioType+":鍑哄喎鍗存Ы";
+            case 10:
+                return this.ioType+":A=>B";
+            case 11:
+                return this.ioType+":B=>A";
             default:
                 return String.valueOf(this.ioType);
         }
@@ -313,5 +325,9 @@
         }
     }
 
+    public Integer getWrkStsComplete(){
+        return this.wrkSts+1;
+    }
+
 
 }

--
Gitblit v1.9.1