yunpeng/EQC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix]设备耗材管理

Browse Source
This commit is contained in:
yunpeng 2024-01-02 22:16:58 +08:00
parent 85f75a0adf
commit 3f4f7531c5
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.run/eqc-monitor-admin.run.xml
View File

@ -2,7 +2,7 @@
<configuration default="false" name="eqc-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <configuration default="false" name="eqc-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile"> <deployment type="dockerfile">
<settings> <settings>
<option name="imageTag" value="eqc/eqc-monitor-admin:4.8.1" /> <option name="imageTag" value="eqc/eqc-monitor-admin:1.0.0" />
<option name="buildOnly" value="true" /> <option name="buildOnly" value="true" />
<option name="sourceFilePath" value="eqc-extend/eqc-monitor-admin/Dockerfile" /> <option name="sourceFilePath" value="eqc-extend/eqc-monitor-admin/Dockerfile" />
</settings> </settings>

2
.run/eqc-server.run.xml
View File

@ -2,7 +2,7 @@
<configuration default="false" name="eqc-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <configuration default="false" name="eqc-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile"> <deployment type="dockerfile">
<settings> <settings>
<option name="imageTag" value="eqc/eqc-server:4.8.1" /> <option name="imageTag" value="eqc/eqc-server:1.0.0" />
<option name="buildOnly" value="true" /> <option name="buildOnly" value="true" />
<option name="sourceFilePath" value="eqc-admin/Dockerfile" /> <option name="sourceFilePath" value="eqc-admin/Dockerfile" />
</settings> </settings>

2
.run/eqc-xxl-job-admin.run.xml
View File

@ -2,7 +2,7 @@
<configuration default="false" name="eqc-xxl-job-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <configuration default="false" name="eqc-xxl-job-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile"> <deployment type="dockerfile">
<settings> <settings>
<option name="imageTag" value="eqc/eqc-xxl-job-admin:4.8.1" /> <option name="imageTag" value="eqc/eqc-xxl-job-admin:1.0.0" />
<option name="buildOnly" value="true" /> <option name="buildOnly" value="true" />
<option name="sourceFilePath" value="eqc-extend/eqc-xxl-job-admin/Dockerfile" /> <option name="sourceFilePath" value="eqc-extend/eqc-xxl-job-admin/Dockerfile" />
</settings> </settings>

2
script/sql/eqcs.sql
View File

@ -29,7 +29,7 @@ CREATE TABLE `equipment_consumables` (
`validity` int DEFAULT NULL COMMENT '使用期效', `validity` int DEFAULT NULL COMMENT '使用期效',
`validity_uint` varchar(16) DEFAULT '' COMMENT '使用期效单位', `validity_uint` varchar(16) DEFAULT '' COMMENT '使用期效单位',
`charge_user` bigint DEFAULT NULL COMMENT '负责人，到期后通知其更换', `charge_user` bigint DEFAULT NULL COMMENT '负责人，到期后通知其更换',
`status` int DEFAULT NULL COMMENT '状态 0正在使用，1已报废 2未使用过', `status` varchar(16) DEFAULT '' COMMENT '状态 0正在使用，1已报废 2未使用过',
`create_by` varchar(64) DEFAULT '' COMMENT '创建者', `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT '' COMMENT '更新者', `update_by` varchar(64) DEFAULT '' COMMENT '更新者',

2
system/src/main/java/com/eqc/system/domain/EquipmentConsumables.java
View File

@ -60,7 +60,7 @@ public class EquipmentConsumables extends BaseEntity {
/** /**
* 状态 0正在使用，1已报废 2未使用过 * 状态 0正在使用，1已报废 2未使用过
*/ */
private Long status; private String status;
/** /**
* 备注 * 备注
*/ */

2
system/src/main/java/com/eqc/system/domain/bo/EquipmentConsumablesBo.java
View File

@ -75,7 +75,7 @@ public class EquipmentConsumablesBo extends BaseEntity {
* 状态 0正在使用，1已报废 2未使用过 * 状态 0正在使用，1已报废 2未使用过
*/ */
@NotNull(message = "状态 0正在使用，1已报废 2未使用过不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "状态 0正在使用，1已报废 2未使用过不能为空", groups = { AddGroup.class, EditGroup.class })
private Long status; private String status;
/** /**
* 备注 * 备注

2
system/src/main/java/com/eqc/system/domain/vo/EquipmentConsumablesVo.java
View File

@ -75,7 +75,7 @@ public class EquipmentConsumablesVo implements Serializable {
* 状态 0正在使用，1已报废 2未使用过 * 状态 0正在使用，1已报废 2未使用过
*/ */
@ExcelProperty(value = "状态 0正在使用，1已报废 2未使用过") @ExcelProperty(value = "状态 0正在使用，1已报废 2未使用过")
private Long status; private String status;
/** /**
* 备注 * 备注