From 4375805e5769179d7684a3af3e9132be68c38321 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 10 九月 2024 09:21:20 +0800
Subject: [PATCH] #fs
---
src/main/java/com/zy/asrs/entity/BasJarMast.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
index cda425b..715cd58 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.java
@@ -1,18 +1,14 @@
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;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasJarMastStatusService;
-import com.zy.asrs.entity.BasJarMastStatus;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -232,13 +228,13 @@
// null // 鏇存柊鏃堕棿
// );
- public String getStatus$(){
- BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
- BasJarMastStatus basJarMastStatus = service.selectById(this.status);
- if (!Cools.isEmpty(basJarMastStatus)){
- return String.valueOf(basJarMastStatus.getId());
- }
- return null;
+// public String getStatus$(){
+// BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
+// BasJarMastStatus basJarMastStatus = service.selectById(this.status);
+// if (!Cools.isEmpty(basJarMastStatus)){
+// return String.valueOf(basJarMastStatus.getId());
+// }
+// return null;
/*
default:
@@ -288,7 +284,7 @@
statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
}
* */
- }
+// }
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -333,7 +329,7 @@
case 6:
return 10;
case 9:
- return 16;
+ return 17;
}
return this.status+1;
}
--
Gitblit v1.9.1