任务 9899

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Equipment.java

@@ -38,12 +38,15 @@ public class Equipment extends BaseEntity {
     @ApiModelProperty(value = "国别")
     private String country;
 
-    @ApiModelProperty(value = "保养周期")
+    @ApiModelProperty(value = "维保周期")
     private Short maintenanceCycle;
 
     @ApiModelProperty(value = "检查周期（天）")
     private Short checkCycle;
 
+    @ApiModelProperty(value = "报废期限")
+    private Short expiryDate;
+
     private String remark;
 
     @ApiModelProperty(value = "管理方式 单件还是批量管理模式，单件S，批量：P")

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -193,4 +193,27 @@
             INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000319', 'address', '地址', 'String', '132828674817', 'eq', b'0', 'r_fireControlRoom', '2581805', '2022-03-01 12:01:04');
         </sql>
     </changeSet>
+    <changeSet author="ltw" id="202210111354-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific" columnName="warranty_info"/>
+            </not>
+        </preConditions>
+        <comment>新增字段 warranty_info,warranty_period</comment>
+        <sql>
+            alter table `wl_equipment_specific` add column `warranty_info` varchar(500) DEFAULT NULL COMMENT '质保信息';
+            alter table `wl_equipment_specific` add column `warranty_period` datetime DEFAULT NULL COMMENT '质保周期';
+        </sql>
+    </changeSet>
+    <changeSet author="ltw" id="202210111354-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment" columnName="expiry_date"/>
+            </not>
+        </preConditions>
+        <comment>新增字段 expiry_date 报废期限</comment>
+        <sql>
+            alter table `wl_equipment` add column `expiry_date` decimal(12,0) DEFAULT NULL COMMENT '报废期限';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file