From 0011e0e5e859569525a0c1fbfc198bf5ab752e21 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 24 三月 2025 17:31:05 +0800
Subject: [PATCH] fix: 修改计划实体类，增加最大号表
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandTotal.java | 13 ++-
platformx-device-api/src/main/java/com/by4cloud/platformx/device/constant/MaxSizeContant.java | 25 ++++++++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java | 3 +
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java | 14 ++--
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/MaxSizeMapper.java | 11 +++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/MaxSize.java | 57 +++++++++++++++++++
6 files changed, 112 insertions(+), 11 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/constant/MaxSizeContant.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/constant/MaxSizeContant.java
new file mode 100644
index 0000000..b5ec30b
--- /dev/null
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/constant/MaxSizeContant.java
@@ -0,0 +1,25 @@
+package com.by4cloud.platformx.device.constant;
+
+
+public interface MaxSizeContant {
+ /**
+ * 璁惧鍒嗙被缂栧彿
+ */
+ String DEVICE_CLASS_NUM = "DEVICE_CLASS_NUM";
+ /**
+ * 璁惧缂栧彿
+ */
+ String DEVICE_NUM = "DEVICE_NUM";
+ /**
+ * 璁″垝缂栧彿
+ */
+ String PLAN_NUM = "PLAN_NUM";
+ /**
+ * 鍚堝悓缂栧彿
+ */
+ String CONTRACT_NUM = "CONTRACT_NUM";
+
+
+
+
+}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java
index 0f8736b..55c75fd 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java
@@ -22,8 +22,8 @@
@Entity
@Table(appliesTo = "device_demand_plan", comment = "璁惧闇�姹傝鍒掍富琛�")
public class DeviceDemandPlan extends BaseModel<DeviceDemandPlan> {
- @Schema(description = "璁惧缂栫爜")
- @Column(columnDefinition="VARCHAR(64) comment '璁惧缂栫爜'")
+ @Schema(description = "缂栫爜")
+ @Column(columnDefinition="VARCHAR(64) comment '缂栫爜'")
private String number;
@Schema(description = "骞村害")
@Column(columnDefinition="int comment '骞村害'")
@@ -38,20 +38,22 @@
@Column(columnDefinition="int comment '鐢虫姤绫诲瀷'")
private Integer type;
@Schema(description = "鐢虫姤鍏徃id")
- @Column(columnDefinition="int comment '鐢虫姤鍏徃id'")
- private Integer declareCompId;
+ @Column(columnDefinition="long comment '鐢虫姤鍏徃id'")
+ private Long declareCompId;
@Schema(description = "鐢虫姤鍏徃")
@Column(columnDefinition="VARCHAR(64) comment '鐢虫姤鍏徃'")
private String declareCompName;
@Schema(description = "濉姤鍏徃id")
- @Column(columnDefinition="int comment '濉姤鍏徃id'")
- private Integer releaseCompId;
+ @Column(columnDefinition="long comment '濉姤鍏徃id'")
+ private Long releaseCompId;
@Schema(description = "濉姤鍏徃")
@Column(columnDefinition="VARCHAR(64) comment '濉姤鍏徃'")
private String releaseCompName;
@Schema(description = "濉姤浜�")
@Column(columnDefinition="VARCHAR(64) comment '濉姤浜�'")
private String releasePerson;
+ @Column(columnDefinition = "double(10,2) comment '璁″垝鎬婚'")
+ private Double amount;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "濉姤鏃堕棿")
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandTotal.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandTotal.java
index 4803e0a..9c066b8 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandTotal.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandTotal.java
@@ -1,6 +1,7 @@
package com.by4cloud.platformx.device.entity;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.annotations.Table;
@@ -20,22 +21,24 @@
@Data
@Entity
@Table(appliesTo = "device_demand_total", comment = "璁惧闇�姹傝鍒掗」鐩瓙琛�")
-public class DeviceDemandTotal extends DeviceBaseModel<DeviceDemandTotal>{
+public class DeviceDemandTotal extends BaseModel<DeviceDemandTotal> {
@Schema(description = "闇�姹傝鍒抜d")
- @Column(columnDefinition="int comment '闇�姹傝鍒抜d'")
- private Integer planId;
+ @Column(columnDefinition="long comment '闇�姹傝鍒抜d'")
+ private Long planId;
@Schema(description = "鎷熶娇鐢ㄥ湴鐐�")
@Column(columnDefinition="VARCHAR(64) comment '鎷熶娇鐢ㄥ湴鐐�'")
private String place;
@Schema(description = "鐢宠閮ㄩ棬")
- @Column(columnDefinition="int comment '鐢宠閮ㄩ棬'")
- private Integer deptId;
+ @Column(columnDefinition="long comment '鐢宠閮ㄩ棬'")
+ private Long deptId;
@Schema(description = "寤鸿鍘傚")
@Column(columnDefinition="VARCHAR(64) comment '寤鸿鍘傚'")
private String manu;
@Schema(description = "鎶曡祫蹇呰鎬�")
@Column(columnDefinition="VARCHAR(64) comment '鎶曡祫蹇呰鎬�'")
private String necessity;
+ @Column(columnDefinition = "double(10,2) comment '璁″垝鎬婚'")
+ private Double amount;
@Transient
@TableField(exist = false)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/MaxSize.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/MaxSize.java
new file mode 100644
index 0000000..9a0b8d7
--- /dev/null
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/MaxSize.java
@@ -0,0 +1,57 @@
+package com.by4cloud.platformx.device.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import lombok.Data;
+import org.hibernate.annotations.Table;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+@Data
+@TableName("jc_max_size")
+@Entity
+@javax.persistence.Table(name = "jc_max_size")
+@Table(appliesTo ="jc_max_size", comment = "鏈�澶у彿琛�")
+public class MaxSize extends BaseModel<MaxSize> {
+
+ @Column(columnDefinition="VARCHAR(32) comment'涓婚敭鏍囪瘑'")
+ private String sign;
+
+ @Column(columnDefinition="int comment'褰撳墠缂栧彿'")
+ private Integer currentNumber;
+
+ @Column(columnDefinition="VARCHAR(32) comment'涓氬姟鍚嶇О'")
+ private String businessName;
+
+ @Column(columnDefinition="int comment'缂撳瓨澶у皬'")
+ private Integer cacheSize;
+
+ @Column(columnDefinition="int comment '鏄惁浣跨敤鍓嶇紑,0-涓嶄娇鐢紝1-浣跨敤'")
+ private Integer usePrefix;
+
+ @Column(columnDefinition="VARCHAR(32) comment'鍓嶇紑'")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private String prefixName;
+
+ @Column(columnDefinition="int comment'鏄惁浣跨敤鍓嶇紑,0-涓嶄娇鐢紝1-浣跨敤'")
+ private Integer useSuffix;
+
+ @Column(columnDefinition="VARCHAR(32) comment '鍚庣紑'")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private String suffixName;
+
+ @Column(columnDefinition="int comment'鏄槸鍚﹀叏灞�娴佹按,0-鍚︼紝1-鏄�'")
+ private Integer isAll;
+
+
+ @Column(columnDefinition="VARCHAR(32) comment'缁勭粐鍐呯紪鐮�'")
+ private String innerCode;
+
+ @Column(columnDefinition="int comment'缂栧彿闀垮害'")
+ private Integer length;
+
+
+}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
index 8f16af1..864f549 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
@@ -47,6 +47,9 @@
@GetMapping("/page" )
public R getDeviceDemandPlanPage(@ParameterObject Page page, @ParameterObject DeviceDemandPlan deviceDemandPlan) {
LambdaQueryWrapper<DeviceDemandPlan> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(deviceDemandPlan.getDeclareCompId() !=null,DeviceDemandPlan::getDeclareCompId,deviceDemandPlan.getDeclareCompId());
+ wrapper.eq(deviceDemandPlan.getReleasePerson() !=null,DeviceDemandPlan::getReleasePerson,deviceDemandPlan.getReleasePerson());
+ wrapper.eq(deviceDemandPlan.getYear() !=null,DeviceDemandPlan::getYear,deviceDemandPlan.getYear());
return R.ok(deviceDemandPlanService.pageByScope(page, wrapper));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/MaxSizeMapper.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/MaxSizeMapper.java
new file mode 100644
index 0000000..8a34170
--- /dev/null
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/MaxSizeMapper.java
@@ -0,0 +1,11 @@
+package com.by4cloud.platformx.device.mapper;
+
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import com.by4cloud.platformx.device.entity.MaxSize;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MaxSizeMapper extends PlatformxBaseMapper<MaxSize> {
+
+
+}
--
Gitblit v1.9.1