From 13b31b2ca2a5f8600002a042b536c9d5529842e3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 19:21:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasDualCrnp.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnp.java b/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
index c4feaf8..5652c84 100644
--- a/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
@@ -2,11 +2,11 @@
import com.core.common.Cools;
import com.zy.core.model.StationObjModel;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -16,7 +16,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -30,7 +30,6 @@
*/
@ApiModelProperty(value= "缂栧彿")
@TableId(value = "crn_no", type = IdType.INPUT)
- @TableField("crn_no")
private Integer crnNo;
/**
@@ -138,9 +137,23 @@
@TableField("max_out_task")
private Integer maxOutTask;
+ /**
+ * 宸ヤ綅1绂佹鎵ц鍒�
+ */
+ @ApiModelProperty(value= "宸ヤ綅1绂佹鎵ц鍒�")
+ @TableField("disable_station_one_bays")
+ private String disableStationOneBays;
+
+ /**
+ * 宸ヤ綅2绂佹鎵ц鍒�
+ */
+ @ApiModelProperty(value= "宸ヤ綅2绂佹鎵ц鍒�")
+ @TableField("disable_station_two_bays")
+ private String disableStationTwoBays;
+
public BasDualCrnp() {}
- public BasDualCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String controlRows,String deepRows,String inStationList,String outStationList,Integer maxInTask,Integer maxOutTask) {
+ public BasDualCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String controlRows,String deepRows,String inStationList,String outStationList,Integer maxInTask,Integer maxOutTask,String disableStationOneBays,String disableStationTwoBays) {
this.status = status;
this.wrkNo = wrkNo;
this.inEnable = inEnable;
@@ -241,4 +254,26 @@
return rowList;
}
+ public List<Integer> getDisableStationOneBays$(){
+ List<Integer> list = new ArrayList<>();
+ if (Cools.isEmpty(this.disableStationOneBays)){
+ return list;
+ }
+
+ List<Integer> jsonList = JSON.parseArray(this.disableStationOneBays, Integer.class);
+ list.addAll(jsonList);
+ return list;
+ }
+
+ public List<Integer> getDisableStationTwoBays$(){
+ List<Integer> list = new ArrayList<>();
+ if (Cools.isEmpty(this.disableStationTwoBays)){
+ return list;
+ }
+
+ List<Integer> jsonList = JSON.parseArray(this.disableStationTwoBays, Integer.class);
+ list.addAll(jsonList);
+ return list;
+ }
+
}
--
Gitblit v1.9.1