From e9d5cf17813a52fe58a5924999655d01532a6b2b Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 26 七月 2025 13:22:24 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkMastExecute.java |  160 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 141 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
index 8ab10a7..b12e7b4 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.entity;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.annotations.TableField;
@@ -29,13 +30,13 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 宸ヤ綔鍙�
      */
     @ApiModelProperty(value= "宸ヤ綔鍙�")
-    @TableId(value = "wrk_no", type = IdType.INPUT)
     @TableField("wrk_no")
     private Long wrkNo;
 
@@ -134,16 +135,24 @@
 
     /**
      * 宸ヤ綔鐘舵��
+     * 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   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= "宸ヤ綔鐘舵��")
     @TableField("wrk_sts")
     private Integer wrkSts;
 
     /**
-     * 浠诲姟绫诲瀷 0: 鏈煡  1: 寮�闂�  2: 鍏抽棬  3: 鍏ョ~鍖栫綈  4: 鍏ュ喎鍗存Ы  5: 绌挎杞﹁繘鍐峰嵈妲�  6: 绌挎杞︾寮�鍐峰嵈妲�  7: 鍑哄喎鍗存Ы  
+     * 浠诲姟绫诲瀷 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: 鍑哄喎鍗存Ы  ")
-    @TableId(value = "io_type", type = IdType.INPUT)
+    @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡  1: 寮�杩涙枡闂�  2: 鍏宠繘鏂欓棬  3: 寮�鍑烘枡闂�  4: 鍏冲嚭鏂欓棬  5: 鍏ョ~鍖栫綈  6: 鍏ュ喎鍗存Ы  7: 绌挎杞﹁繘鍐峰嵈妲�  B=>C  8: 绌挎杞︾寮�鍐峰嵈妲� C=>B  9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A ")
     @TableField("io_type")
     private Integer ioType;
 
@@ -238,35 +247,148 @@
                 return String.valueOf(this.wrkType);
         }
     }
-
+    /**
+     * 宸ヤ綔鐘舵��
+     * 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   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
+     */
     public String getWrkSts$(){
-        BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
-        BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
-        if (!Cools.isEmpty(basJarMastStatus)){
-            return String.valueOf(basJarMastStatus.getId());
+        try{
+            if (Cools.isEmpty(this.wrkSts)){
+                return this.wrkSts+"锛氭湭鐭�";
+            }
+            if (Cools.isEmpty(this.ioType)){
+                return this.wrkSts.toString();
+            } else if (this.ioType == 100){
+                switch (this.wrkSts){
+                    case 0:
+                        return this.wrkSts+"銆佸垵濮�";
+                    case 99:
+                        return this.wrkSts+"銆佸厖鐢典腑";
+                    case 100:
+                        return this.wrkSts+"銆佸厖鐢靛畬鎴�";
+                }
+            } else {
+                switch (this.wrkSts){
+                    case 1:
+                        switch (this.ioType){
+                            case 9:
+                                return this.wrkSts+"銆丼te绌挎鐗堝彇鏀捐揣涓�";
+                            default:
+                                return this.wrkSts+"銆丷GV骞宠 杞︾Щ鍔�";
+                        }
+                    case 2:
+                        switch (this.ioType){
+                            case 9:
+                                return this.wrkSts+"銆丼te绌挎鐗堟斁璐у畬鎴愮瓑寰呬笅涓�姝�";
+                            default:
+                                return this.wrkSts+"銆丷GV骞宠 杞﹀埌浣�";
+                        }
+                    case 3:
+                        switch (this.ioType){
+                            case 1:
+                            case 3:
+                                return this.wrkSts+"銆佺~鍖栫綈寮�闂ㄤ腑";
+                            case 2:
+                            case 4:
+                                return this.wrkSts+"銆佺~鍖栫綈鍏抽棬涓�";
+                            case 5:
+                                return this.wrkSts+"銆丷GV骞宠 杞﹀彇璐�";
+                            case 6:
+                                return this.wrkSts+"銆丼te绌挎鐗堝彇璐�";
+                            case 9:
+                                return this.wrkSts+"銆佽緭閫佺嚎浠诲姟涓嬪彂瀹屾垚";
+                            default:
+                                return this.wrkSts+"銆丼te绌挎鐗堢Щ鍔ㄤ腑";
+                        }
+                    case 4:
+                        switch (this.ioType){
+                            case 1:
+                            case 3:
+                                return this.wrkSts+"銆佺~鍖栫綈寮�闂ㄥ畬鎴�";
+                            case 2:
+                            case 4:
+                                return this.wrkSts+"銆佺~鍖栫綈鍏抽棬瀹屾垚";
+                            case 5:
+                                return this.wrkSts+"銆丷GV骞宠 杞﹀彇璐у畬鎴�";
+                            case 6:
+                                return this.wrkSts+"銆丼te绌挎鐗堝彇璐у畬鎴�";
+                            case 9:
+                                return this.wrkSts+"銆佹洿鏂板畬鎴�";
+                            default:
+                                return this.wrkSts+"銆丼te绌挎鐗堢Щ鍔ㄥ畬鎴�";
+                        }
+                    case 5:
+                        switch (this.ioType){
+                            case 5:
+                                return this.wrkSts+"銆丼te绌挎鐗堝叆纭寲缃�";
+                            case 6:
+                                return this.wrkSts+"銆丼te绌挎鐗堟斁璐ц嚦鍐峰嵈姹�";
+                            default:
+                                return this.wrkSts+"銆佹洿鏂板畬鎴�";
+                        }
+                    case 6:
+                        switch (this.ioType){
+                            case 5:
+                                return this.wrkSts+"銆丼te绌挎鐗堝叆纭寲缃愬畬鎴�";
+                            case 6:
+                                return this.wrkSts+"銆丼te绌挎鐗堟斁璐у畬鎴�";
+                            default:
+                                return this.wrkSts+"銆佹洿鏂板畬鎴�";
+                        }
+                    case 7:
+                        switch (this.ioType){
+                            default:
+                                return this.wrkSts+"銆佹洿鏂板畬鎴�";
+                        }
+                    default:
+                        return this.wrkSts.toString();
+                }
+            }
+        } catch (Exception e){
+            return this.wrkSts+"锛氭湭鐭�==>寮傚父锛�"+e.getMessage();
         }
-        return null;
+        return this.wrkSts+"锛氭湭鐭�";
     }
 
+    //浠诲姟绫诲瀷 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; }
+        if (null == this.ioType){ return "鏈煡"; }
         switch (this.ioType){
             case 0:
-                return "鏈煡";
+                return "0.鏈煡";
             case 1:
-                return "寮�闂�";
+                return "1.寮�杩涙枡闂�";
             case 2:
-                return "鍏抽棬";
+                return "2.鍏宠繘鏂欓棬";
             case 3:
-                return "鍏ョ~鍖栫綈";
+                return "3.寮�鍑烘枡闂�";
             case 4:
-                return "鍏ュ喎鍗存Ы";
+                return "4.鍏冲嚭鏂欓棬";
             case 5:
-                return "绌挎杞﹁繘鍐峰嵈妲�";
+                return "5.鍏ョ~鍖栫綈";
             case 6:
-                return "绌挎杞︾寮�鍐峰嵈妲�";
+                return "6.鍏ュ喎鍗存Ы";
             case 7:
-                return "鍑哄喎鍗存Ы";
+                return "7.B=>C";
+            case 8:
+                return "8.C=>B";
+            case 9:
+                return "9.鍑哄喎鍗存Ы";
+            case 10:
+                return "10.A=>B";
+            case 11:
+                return "11.B=>A";
+            case 100:
+                return "100.鍏呯數浠诲姟";
             default:
                 return String.valueOf(this.ioType);
         }

--
Gitblit v1.9.1