From edb540e6444a6e809c66393500bb175a8a4eef44 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 十一月 2025 11:51:48 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index f07627f..851892f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -15,6 +15,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("asr_wrk_detl")
@@ -332,6 +333,10 @@
}
}
+ public String getDeadTimeOther(){
+ return this.deadTime;
+ }
+
public String getInspect$(){
if (null == this.inspect){ return null; }
switch (this.inspect){
@@ -348,9 +353,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
@@ -390,8 +397,8 @@
public String getBrand$(){
BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
- BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
- if (!Cools.isEmpty(basBoxType)){
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
return String.valueOf(basBoxType.getBoxSpecs());
}
return this.brand;
--
Gitblit v1.9.1