v3项目-仪器维护功能新增字段

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsInstrumentMaintenance.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.ruoyi.common.core.domain.AbstractEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,12 +26,12 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("js_instrument_maintenance")
 @ApiModel(value="JsInstrumentMaintenance对象", description="v2.0检验仪器维护登记")
-public class JsInstrumentMaintenance implements Serializable {
+public class JsInstrumentMaintenance extends AbstractEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Integer id;
 
     @ApiModelProperty(value = "维护时间")
     private String maintenanceTime;
@@ -51,4 +53,13 @@ public class JsInstrumentMaintenance implements Serializable {
 
     @ApiModelProperty(value = "维护人")
     private String maintenanceUser;
+
+    @ApiModelProperty(value = "规格型号")
+    private String specificationNoGroup;
+
+    @ApiModelProperty(value = "故障描述")
+    private String faultDetail;
+
+    @ApiModelProperty(value = "维修结果")
+    private String repairDetail;
 }

sql/v3_biz_20250814.sql

@@ -480,4 +480,15 @@ ALTER TABLE `js_device_maintenance`  ADD COLUMN `specification_no_group` VARCHAR
     ADD COLUMN `create_by` VARCHAR(255) DEFAULT NULL COMMENT '创建者',
     ADD COLUMN `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     ADD COLUMN `update_by` VARCHAR(255) DEFAULT NULL COMMENT '更新者',
+    ADD COLUMN `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间';
+
+-- 仪器维护保养
+ALTER TABLE `js_instrument_maintenance` MODIFY COLUMN id BIGINT AUTO_INCREMENT  ;
+ALTER TABLE `js_instrument_maintenance`  ADD COLUMN `specification_no_group` VARCHAR(90) COMMENT '规格型号',
+    ADD COLUMN `fault_detail` VARCHAR(255) DEFAULT NULL COMMENT '故障描述',
+    ADD COLUMN `repair_detail` VARCHAR(255) DEFAULT NULL COMMENT '维修结果',
+    ADD COLUMN `is_deleted` TINYINT(1) DEFAULT 0 COMMENT '是否删除标志，0否1是',
+    ADD COLUMN `create_by` VARCHAR(255) DEFAULT NULL COMMENT '创建者',
+    ADD COLUMN `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    ADD COLUMN `update_by` VARCHAR(255) DEFAULT NULL COMMENT '更新者',
     ADD COLUMN `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间';