From f9910e017c94694ef8a74b60f66051dfa43ab4e1 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 18 Dec 2025 20:56:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E9=BA=BB=E7=B2=BE=E8=8D=AF=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E9=92=A5=E5=8C=99=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/business/domain/Gyzj.java | 23 +++++++++------------- .../java/com/hxhq/business/domain/GyzjFfjl.java | 20 +++++++++---------- .../main/java/com/hxhq/business/domain/Mjy.java | 21 +++++++------------- .../java/com/hxhq/business/domain/MjyFfjl.java | 16 +++++++-------- .../main/java/com/hxhq/business/domain/MjyTz.java | 1 - .../main/java/com/hxhq/business/domain/Zcg.java | 9 ++++----- 6 files changed, 36 insertions(+), 54 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java index 60e4614..032a5b1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java @@ -4,6 +4,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.TableName; import com.hxhq.common.core.domain.MpBaseEntity; +import io.swagger.v3.oas.models.security.SecurityScheme; /** @@ -36,14 +37,14 @@ public class Gyzj extends MpBaseEntity private String kcdw; /** 失效日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sxrq; /** 制剂状态：1：入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 */ - private Long zt; + private Integer zjzt; - /** 借阅状态：1：未借阅；3：借阅中 */ - private Long jyzt; + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; /** 关联钥匙 */ private Long zcgId; @@ -131,22 +132,16 @@ public class Gyzj extends MpBaseEntity return sxrq; } - public void setZt(Long zt) - { - this.zt = zt; - } + public Integer getZjzt() { return zjzt; } - public Long getZt() - { - return zt; - } + public void setZjzt(Integer zjzt) { this.zjzt = zjzt; } - public void setJyzt(Long jyzt) + public void setJyzt(Integer jyzt) { this.jyzt = jyzt; } - public Long getJyzt() + public Integer getJyzt() { return jyzt; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java index 5faa950..ccad101 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java @@ -27,14 +27,14 @@ public class GyzjFfjl extends MpBaseEntity private String zytj; /** 出库时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date cksj; /** 出库净重 */ private String ckjz; /** 入库时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date rksj; /** 入库净重 */ @@ -58,10 +58,10 @@ public class GyzjFfjl extends MpBaseEntity /** 暂存柜id */ private Long zckId; - /** 状态 */ - private Integer zt; + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ + private Integer jlzt; - /** 借阅状态 */ + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ private Integer jyzt; @@ -195,14 +195,12 @@ public class GyzjFfjl extends MpBaseEntity return zckId; } - public void setZt(Integer zt) - { - this.zt = zt; + public Integer getJlzt() { + return jlzt; } - public Integer getZt() - { - return zt; + public void setJlzt(Integer jlzt) { + this.jlzt = jlzt; } public void setJyzt(Integer jyzt) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java index 29af7e3..b5ec552 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java @@ -40,10 +40,10 @@ public class Mjy extends MpBaseEntity private Date sxrq; /** 制剂状态：1：入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 */ - private Long zt; + private Integer zjzt; - /** 借阅状态：1：未借阅；3：借阅中 */ - private Long jyzt; + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ + private Integer jyzt; /** 关联钥匙 */ private Long zcgId; @@ -60,7 +60,6 @@ public class Mjy extends MpBaseEntity /** 试验id */ private Long syId; - public void setMc(String mc) { this.mc = mc; @@ -131,22 +130,16 @@ public class Mjy extends MpBaseEntity return sxrq; } - public void setZt(Long zt) - { - this.zt = zt; - } + public Integer getZjzt() { return zjzt; } - public Long getZt() - { - return zt; - } + public void setZjzt(Integer zjzt) { this.zjzt = zjzt; } - public void setJyzt(Long jyzt) + public void setJyzt(Integer jyzt) { this.jyzt = jyzt; } - public Long getJyzt() + public Integer getJyzt() { return jyzt; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java index 4b3c34b..726ee75 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java @@ -58,10 +58,10 @@ public class MjyFfjl extends MpBaseEntity /** 暂存柜id */ private Long zckId; - /** 状态 */ - private Integer zt; + /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */ + private Integer jlzt; - /** 借阅状态 */ + /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ private Integer jyzt; @@ -195,14 +195,12 @@ public class MjyFfjl extends MpBaseEntity return zckId; } - public void setZt(Integer zt) - { - this.zt = zt; + public Integer getJlzt() { + return jlzt; } - public Integer getZt() - { - return zt; + public void setJlzt(Integer jlzt) { + this.jlzt = jlzt; } public void setJyzt(Integer jyzt) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyTz.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyTz.java index 8bd8191..d833a21 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyTz.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyTz.java @@ -39,7 +39,6 @@ public class MjyTz extends MpBaseEntity /** 操作量 */ private String cznr; - public void setMjyId(Long mjyId) { this.mjyId = mjyId; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Zcg.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Zcg.java index 4ae927c..1e0f32a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Zcg.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Zcg.java @@ -27,9 +27,8 @@ public class Zcg extends MpBaseEntity /** 钥匙2领取人 */ private Long yslqr2; - /** 状态：1：未借用；5：借用中；10：停用 */ - private Long zt; - + /** 状态：1：未借用；5：借用中 */ + private Integer zt; public void setMc(String mc) { @@ -71,12 +70,12 @@ public class Zcg extends MpBaseEntity return yslqr2; } - public void setZt(Long zt) + public void setZt(Integer zt) { this.zt = zt; } - public Long getZt() + public Integer getZt() { return zt; }