From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java | 98 +++++++++++++++++++++++++++++++++---------------
1 files changed, 67 insertions(+), 31 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
index d677b37..edbfab0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
@@ -1,15 +1,19 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
+import io.swagger.annotations.Api;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -17,6 +21,8 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
+import java.util.Map;
+import java.util.Objects;
@Data
@Accessors(chain = true)
@@ -31,46 +37,44 @@
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
-
/**
* 涓诲崟ID
*/
@ApiModelProperty(value= "涓诲崟ID")
private Long ispectId;
+ @ApiModelProperty("璐ㄦ鍗曠姸鎬�")
+ private String isptStatus;
@ApiModelProperty("鍗曟嵁鏄庣粏ID")
private Long asnItemId;
+ @ApiModelProperty("鏀惰揣鏄庣粏ID")
+ private Long rcptId;
/**
* 缂栧彿
*/
@ApiModelProperty(value= "缂栧彿")
private String matnrCode;
-
/**
* 鐗╂枡鍚嶇О
*/
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
private String maktx;
-
/**
* 鏍囩
*/
@ApiModelProperty(value= "鏍囩")
private String label;
-
/**鈭�
* 渚涘簲鍟嗗悕绉�
*/
@ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
private String splrName;
-
/**
* 渚涘簲鍟嗘壒娆�
*/
@ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
private String splrBatch;
-
/**
* 搴撳瓨鎵规
*/
@@ -83,22 +87,49 @@
@ApiModelProperty(value= "鏀惰揣鏁伴噺")
private Double rcptQty;
+ @ApiModelProperty("璐ㄦ鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 骞冲彴鏍囪瘑锛堣鍙凤級
+ */
+ @ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級")
+ private String platItemId;
+
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
+
/**
* 閫佽揣鏁伴噺
*/
@ApiModelProperty(value= "閫佽揣鏁伴噺")
private Double dlyQty;
+ @ApiModelProperty("鎵╁睍瀛楁")
+ private String fieldsIndex;
+
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
+
/**
* 涓嶅悎鏁伴噺
*/
@ApiModelProperty(value= "涓嶅悎鏁伴噺")
+ @TableField(exist = false)
private Double disQty;
/**
* 鍚堟牸鏁伴噺
*/
@ApiModelProperty(value= "鍚堟牸鏁伴噺")
+ @TableField(exist = false)
private Double safeQty;
/**
@@ -108,7 +139,7 @@
private String picPath;
@ApiModelProperty("璐ㄦ缁撹")
- private String isptResult;
+ private Short isptResult;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -135,11 +166,15 @@
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+ @TableField(exist = false)
+ private String createBy$;
+
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -148,11 +183,15 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -160,6 +199,13 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @TableField(exist = false)
+ private String isptStatus$;
+
+ @TableField(exist = false)
+ private String isptResult$;
+
+
public QlyIsptItem() {}
@@ -173,8 +219,8 @@
this.stockBatch = stockBatch;
this.rcptQty = rcptQty;
this.dlyQty = dlyQty;
- this.disQty = disQty;
- this.safeQty = safeQty;
+// this.disQty = disQty;
+// this.safeQty = safeQty;
this.picPath = picPath;
this.status = status;
this.deleted = deleted;
@@ -209,6 +255,14 @@
// null // 澶囨敞
// );
+ public String getIsptStatus$() {
+ return this.isptStatus$;
+ }
+
+ public String getIsptResult$() {
+ return this.isptResult$;
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
@@ -221,29 +275,11 @@
}
}
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
}
public String getUpdateTime$(){
--
Gitblit v1.9.1