Skip to content

A
amos-boot-biz
Commit 0db6da1a authored by suhuiguang's avatar suhuiguang
Browse files
Options

fix(jyjc): 报检规则4.0开发

1.技术参数调整
parent 3382009b
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ElevatorTechParamDefine.java
View file @ 0db6da1a
......@@ -60,9 +60,9 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
@TechnicalParameter(key = "explosionproofGrade", label = "区域防爆等级", equCategory = {"3400"}, equDefine = {"3410"}, type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
private String explosionproofGrade;
// 附件上传类型的参数，无法参与查询，暂时注释掉
// @TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", equCategory = {"3400"}, equDefine = {"3410"}, type = TechnicalParameter.ParamType.STRING)
// private String explosionproofSignComplete;
@TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", equCategory = {"3400"}, equDefine = {"3410"}, type = TechnicalParameter.ParamType.STRING)
private String explosionproofSignComplete;
@TechnicalParameter(key = "nominalSpeed", label = "名义速度", equCategory = {"3300"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m/s")
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/LiftingTechParamDefine.java
View file @ 0db6da1a
......@@ -18,7 +18,7 @@ import java.math.BigDecimal;
public class LiftingTechParamDefine implements ITechParamDefine {
@TechnicalParameter(key = "ratedLoadCapacity", label = "额定载重量", equCategory = {"4800", "4D00"}, equDefine = {"4860"}, ignoreCategoryConf = {"4800"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "Kg")
@TechnicalParameter(key = "ratedLoadCapacity", label = "额定载重量(适停汽车质量)", equCategory = {"4800", "4D00"}, equDefine = {"4860"}, ignoreCategoryConf = {"4800"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "Kg")
private BigDecimal ratedLoadCapacity;
@TechnicalParameter(key = "ratedLiftingCapacity", label = "额定起重量", equCategory = {"4100", "4200", "4400", "4800", "4900", "4A00", "4300"}, equDefine = {"4110", "4130", "4140", "4150", "4190", "4210", "4220", "4230", "4240", "4250", "4260", "4270", "4280", "4290", "4310", "4320", "4410", "4420", "4440", "4450", "4870", "4170"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "t")
......@@ -33,7 +33,7 @@ public class LiftingTechParamDefine implements ITechParamDefine {
private BigDecimal maxLiftingTorque;
@TechnicalParameter(key = "spanWorkingRange", label = "跨度（工作幅度）", equCategory = {"4100", "4200", "4400", "4800", "4900", "4A00", "4300", "4700"}, equDefine = {"4110", "4130", "4140", "4150", "4190", "4210", "4220", "4230", "4240", "4250", "4260", "4270", "4280", "4290", "4310", "4320", "4410", "4420", "4440", "4450", "4710", "4760", "4870", "4170"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
@TechnicalParameter(key = "spanWorkingRange", label = "跨度（工作幅度）", equCategory = {"4200", "4400", "4100", "4900"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
private BigDecimal spanWorkingRange;
......@@ -115,9 +115,9 @@ public class LiftingTechParamDefine implements ITechParamDefine {
@TechnicalParameter(key = "explosiveSubstance", label = "燃爆物质", equCategory = {"4100", "4200", "4400", "4800", "4900", "4A00"}, equDefine = {"4110", "4130", "4140", "4150", "4190", "4210", "4220", "4230", "4240", "4250", "4260", "4270", "4280", "4290", "4410", "4420", "4440", "4450", "4870", "4170"}, type = TechnicalParameter.ParamType.STRING)
private String explosiveSubstance;
// 附件上传类型的参数，无法参与查询，暂时注释掉
// @TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", equCategory = {"4100", "4200", "4400", "4800", "4900", "4A00"}, equDefine = {"4110", "4130", "4140", "4150", "4190", "4210", "4220", "4230", "4240", "4250", "4260", "4270", "4280", "4290", "4410", "4420", "4440", "4450", "4870", "4170"}, type = TechnicalParameter.ParamType.STRING)
// private String explosionproofSignComplete;
@TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", equCategory = {"4100", "4200", "4400", "4800", "4900", "4A00"}, equDefine = {"4110", "4130", "4140", "4150", "4190", "4210", "4220", "4230", "4240", "4250", "4260", "4270", "4280", "4290", "4410", "4420", "4440", "4450", "4870", "4170"}, type = TechnicalParameter.ParamType.STRING)
private String explosionproofSignComplete;
@TechnicalParameter(key = "checkFinishedHeight", label = "监检结束高度", equCategory = {"4300", "4800"}, ignoreCategoryConf = {"4800"}, equDefine = {"4310", "4320", "4860"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TechParamsLiftingChangeFieldDto.java
View file @ 0db6da1a
......@@ -104,7 +104,7 @@ public class TechParamsLiftingChangeFieldDto extends BaseTechParamsFieldDto {
@FieldDisplayDefine(value = "燃爆物质")
private String explosiveSubstance;
@FieldDisplayDefine(value = "整机防爆标志", type = JSON.class)
@FieldDisplayDefine(value = "整机防爆标志")
private String explosionproofSignComplete;
@FieldDisplayDefine(value = "监检结束高度")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment