From dc3f9cc91759823ce59486f19b138be4b296a0f1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 四月 2026 09:43:28 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkMastLog.java |   50 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 4212cba..9100d93 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -1,13 +1,14 @@
 package com.zy.asrs.entity;
 
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.mapper.BasWrkIotypeMapper;
 import com.zy.asrs.mapper.BasWrkStatusMapper;
+import com.zy.asrs.service.BasCrnpService;
 import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.common.utils.Synchro;
@@ -15,6 +16,7 @@
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
@@ -97,6 +99,7 @@
      */
     @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
     @TableField("io_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date ioTime;
 
     /**
@@ -111,6 +114,7 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @TableField("modi_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date modiTime;
 
     /**
@@ -125,10 +129,12 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @TableField("appe_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date appeTime;
 
     @ApiModelProperty(value= "")
     @TableField("error_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date errorTime;
 
     @ApiModelProperty(value= "")
@@ -181,6 +187,13 @@
     private String systemMsg;
 
     /**
+     * 涓嬪彂澶辫触娆℃暟
+     */
+    @ApiModelProperty(value= "涓嬪彂澶辫触娆℃暟")
+    @TableField(value = "send_fail_count")
+    private Integer sendFailCount;
+
+    /**
      * 鎵规鍙�
      */
     @ApiModelProperty(value= "鎵规鍙�")
@@ -202,6 +215,9 @@
         if (entity != null) {
             return entity.getWrkDesc();
         }
+        try {
+            return com.zy.core.enums.WrkStsType.query(this.wrkSts).desc;
+        } catch (Exception ignore) {}
         return null;
     }
 
@@ -216,7 +232,7 @@
 
     public String getWrkNo$(){
         WrkMastService service = SpringUtils.getBean(WrkMastService.class);
-        WrkMast wrkMast = service.selectById(this.wrkNo);
+        WrkMast wrkMast = service.getById(this.wrkNo);
         if (!Cools.isEmpty(wrkMast)){
             return String.valueOf(wrkMast.getWrkNo());
         }
@@ -225,20 +241,32 @@
 
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
-        LocMast locMast = service.selectById(this.locNo);
+        LocMast locMast = service.getById(this.locNo);
         if (!Cools.isEmpty(locMast)){
-            return String.valueOf(locMast.getLocNo());
+            return formatMappedLocNo(String.valueOf(locMast.getLocNo()));
         }
         return null;
     }
 
     public String getSourceLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
-        LocMast locMast = service.selectById(this.sourceLocNo);
+        LocMast locMast = service.getById(this.sourceLocNo);
         if (!Cools.isEmpty(locMast)){
-            return String.valueOf(locMast.getLocNo());
+            return formatMappedLocNo(String.valueOf(locMast.getLocNo()));
         }
         return null;
+    }
+
+    private String formatMappedLocNo(String locNo){
+        if (Cools.isEmpty(this.crnNo)){
+            return locNo;
+        }
+        BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+        BasCrnp basCrnp = basCrnpService.getById(this.crnNo);
+        if (Cools.isEmpty(basCrnp)){
+            return locNo;
+        }
+        return basCrnp.formatMappedLocNo(locNo);
     }
 
     public String getIoTime$(){
@@ -250,7 +278,7 @@
 
     public String getModiUser$(){
         UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.selectById(this.modiUser);
+        User user = service.getById(this.modiUser);
         if (!Cools.isEmpty(user)){
             return String.valueOf(user.getUsername());
         }
@@ -266,7 +294,7 @@
 
     public String getAppeUser$(){
         UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.selectById(this.appeUser);
+        User user = service.getById(this.appeUser);
         if (!Cools.isEmpty(user)){
             return String.valueOf(user.getUsername());
         }

--
Gitblit v1.9.1