From 7e6949ec52f2969d22b01881f1deecd183520169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 15 Dec 2025 16:36:02 +0800 Subject: [PATCH] =?UTF-8?q?refactor(entity):=20=E8=B0=83=E6=95=B4=E4=BF=A1?= =?UTF-8?q?=E7=94=A8=E7=94=A8=E6=88=B7=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 id 类型从 Long 改为 Integer - 更新字段描述信息，如将“客户名称”改为“项目名称” - 删除 expirationTime 字段及相关逻辑 - 修改“招采单位名称”为“招采单位” - 修改“中标单位名称”为“中标单位” - 修改“中标单位名称”为“中标金额”以匹配实际用途 --- .../credit/controller/CreditUserController.java | 9 --------- .../com/gxwebsoft/credit/entity/CreditUser.java | 14 +++++--------- .../credit/param/CreditUserImportParam.java | 4 ++-- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java index c718e6a..465534f 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java @@ -245,7 +245,6 @@ public class CreditUserController extends BaseController { example.setWinningPrice("100000"); example.setComments("这是示例数据，请删除后填入真实数据"); example.setRecommend(0); - example.setExpirationTime("2025-12-31 23:59:59"); example.setSortNumber(1); example.setStatus(0); example.setUserId(1); @@ -299,14 +298,6 @@ public class CreditUserController extends BaseController { entity.setUserId(param.getUserId()); entity.setTenantId(param.getTenantId()); - if (param.getExpirationTime() != null && !param.getExpirationTime().trim().isEmpty()) { - try { - entity.setExpirationTime(LocalDateTime.parse(param.getExpirationTime().trim(), DATE_TIME_FORMATTER)); - } catch (Exception e) { - throw new RuntimeException("到期时间格式错误，应为yyyy-MM-dd HH:mm:ss"); - } - } - return entity; } diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java b/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java index 8ccbb2b..f55547a 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditUser.java @@ -24,9 +24,9 @@ public class CreditUser implements Serializable { @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) - private Long id; + private Integer id; - @Schema(description = "客户名称") + @Schema(description = "项目名称") private String name; @Schema(description = "唯一标识") @@ -59,13 +59,13 @@ public class CreditUser implements Serializable { @Schema(description = "街道地址") private String address; - @Schema(description = "招采单位名称") + @Schema(description = "招采单位") private String procurementName; - @Schema(description = "中标单位名称") + @Schema(description = "中标单位") private String winningName; - @Schema(description = "中标单位名称") + @Schema(description = "中标金额") private String winningPrice; @Schema(description = "备注") @@ -74,10 +74,6 @@ public class CreditUser implements Serializable { @Schema(description = "是否推荐") private Integer recommend; - @Schema(description = "到期时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime expirationTime; - @Schema(description = "排序(数字越小越靠前)") private Integer sortNumber; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditUserImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditUserImportParam.java index 8acce7a..2a8fc1b 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditUserImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditUserImportParam.java @@ -48,10 +48,10 @@ public class CreditUserImportParam implements Serializable { @Excel(name = "街道地址") private String address; - @Excel(name = "招采单位名称") + @Excel(name = "招采单位") private String procurementName; - @Excel(name = "中标单位名称") + @Excel(name = "中标单位") private String winningName; @Excel(name = "中标金额")