From fc429d289d311225fcd8dc288fb882bb7087a726 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 30 四月 2025 15:12:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index 54dae84..77b9ec2 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -1,31 +1,15 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;
+import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
@@ -211,6 +195,9 @@
this.wrkNo = taskWrk.getWrkNo();
this.createTime = taskWrk.getCreateTime();
this.ioType = taskWrk.getIoType();
+ if (Cools.isEmpty(taskWrk.getIoPri())){
+ taskWrk.setIoPri(1);
+ }
this.ioPri = (double)taskWrk.getIoPri();
this.startPoint = taskWrk.getStartPoint();
this.targetPoint = taskWrk.getTargetPoint();
@@ -262,6 +249,8 @@
return "鍙栨秷";
case 5:
return "瀹岀粨";
+ case 7:
+ return "鎵嬪姩瀹岀粨";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1