BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 91120504f7895fb4497c3b9dccd223f5acbec05d

Authored by YunaiV
1 parent 5c5f007e

✨ feat(mes): 修改检测项类型为整数类型

Inline Side-by-side
Showing 9 changed files with 18 additions and 18 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorPageReqVO.java
  View file @9112050
@@ -18,8 +18,8 @@ public class MesQcIndicatorPageReqVO extends PageParam { @@ -18,8 +18,8 @@ public class MesQcIndicatorPageReqVO extends PageParam {
18 @Schema(description = "检测项名称", example = "长度") 18 @Schema(description = "检测项名称", example = "长度")
19 private String name; 19 private String name;
20 20
21 - @Schema(description = "检测项类型", example = "SIZE")  
22 - private String type; 21 + @Schema(description = "检测项类型", example = "1")
  22 + private Integer type;
23 23
24 @Schema(description = "结果值类型", example = "1") 24 @Schema(description = "结果值类型", example = "1")
25 private Integer resultType; 25 private Integer resultType;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorRespVO.java
  View file @9112050
@@ -27,10 +27,10 @@ public class MesQcIndicatorRespVO { @@ -27,10 +27,10 @@ public class MesQcIndicatorRespVO {
27 @ExcelProperty("检测项名称") 27 @ExcelProperty("检测项名称")
28 private String name; 28 private String name;
29 29
30 - @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "SIZE") 30 + @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
31 @ExcelProperty(value = "检测项类型", converter = DictConvert.class) 31 @ExcelProperty(value = "检测项类型", converter = DictConvert.class)
32 @DictFormat(DictTypeConstants.MES_INDICATOR_TYPE) 32 @DictFormat(DictTypeConstants.MES_INDICATOR_TYPE)
33 - private String type; 33 + private Integer type;
34 34
35 @Schema(description = "检测工具", example = "卡尺") 35 @Schema(description = "检测工具", example = "卡尺")
36 @ExcelProperty("检测工具") 36 @ExcelProperty("检测工具")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicator/vo/MesQcIndicatorSaveReqVO.java
  View file @9112050
@@ -20,9 +20,9 @@ public class MesQcIndicatorSaveReqVO { @@ -20,9 +20,9 @@ public class MesQcIndicatorSaveReqVO {
20 @NotEmpty(message = "检测项名称不能为空") 20 @NotEmpty(message = "检测项名称不能为空")
21 private String name; 21 private String name;
22 22
23 - @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "SIZE")  
24 - @NotEmpty(message = "检测项类型不能为空")  
25 - private String type; 23 + @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  24 + @NotNull(message = "检测项类型不能为空")
  25 + private Integer type;
26 26
27 @Schema(description = "检测工具", example = "卡尺") 27 @Schema(description = "检测工具", example = "卡尺")
28 private String tool; 28 private String tool;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java
  View file @9112050
@@ -27,8 +27,8 @@ public class MesQcIpqcLineRespVO { @@ -27,8 +27,8 @@ public class MesQcIpqcLineRespVO {
27 @Schema(description = "检测指标名称", example = "外观") 27 @Schema(description = "检测指标名称", example = "外观")
28 private String indicatorName; 28 private String indicatorName;
29 29
30 - @Schema(description = "检测指标类型", example = "QUANTITATIVE")  
31 - private String indicatorType; 30 + @Schema(description = "检测指标类型", example = "1")
  31 + private Integer indicatorType;
32 32
33 @Schema(description = "检测工具", example = "卡尺") 33 @Schema(description = "检测工具", example = "卡尺")
34 private String tool; 34 private String tool;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLineRespVO.java
  View file @9112050
@@ -27,8 +27,8 @@ public class MesQcIqcLineRespVO { @@ -27,8 +27,8 @@ public class MesQcIqcLineRespVO {
27 @Schema(description = "检测指标名称", example = "外观") 27 @Schema(description = "检测指标名称", example = "外观")
28 private String indicatorName; 28 private String indicatorName;
29 29
30 - @Schema(description = "检测指标类型", example = "QUANTITATIVE")  
31 - private String indicatorType; 30 + @Schema(description = "检测指标类型", example = "1")
  31 + private Integer indicatorType;
32 32
33 @Schema(description = "检测工具", example = "卡尺") 33 @Schema(description = "检测工具", example = "卡尺")
34 private String tool; 34 private String tool;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/line/MesQcOqcLineRespVO.java
  View file @9112050
@@ -27,8 +27,8 @@ public class MesQcOqcLineRespVO { @@ -27,8 +27,8 @@ public class MesQcOqcLineRespVO {
27 @Schema(description = "检测指标名称", example = "外观") 27 @Schema(description = "检测指标名称", example = "外观")
28 private String indicatorName; 28 private String indicatorName;
29 29
30 - @Schema(description = "检测指标类型", example = "QUANTITATIVE")  
31 - private String indicatorType; 30 + @Schema(description = "检测指标类型", example = "1")
  31 + private Integer indicatorType;
32 32
33 @Schema(description = "检测工具", example = "卡尺") 33 @Schema(description = "检测工具", example = "卡尺")
34 private String tool; 34 private String tool;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLineRespVO.java
  View file @9112050
@@ -27,8 +27,8 @@ public class MesQcRqcLineRespVO { @@ -27,8 +27,8 @@ public class MesQcRqcLineRespVO {
27 @Schema(description = "检测指标名称", example = "外观") 27 @Schema(description = "检测指标名称", example = "外观")
28 private String indicatorName; 28 private String indicatorName;
29 29
30 - @Schema(description = "检测指标类型", example = "QUANTITATIVE")  
31 - private String indicatorType; 30 + @Schema(description = "检测指标类型", example = "1")
  31 + private Integer indicatorType;
32 32
33 @Schema(description = "检测工具", example = "卡尺") 33 @Schema(description = "检测工具", example = "卡尺")
34 private String tool; 34 private String tool;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/vo/indicator/MesQcTemplateIndicatorRespVO.java
  View file @9112050
@@ -63,9 +63,9 @@ public class MesQcTemplateIndicatorRespVO { @@ -63,9 +63,9 @@ public class MesQcTemplateIndicatorRespVO {
63 @ExcelProperty("检测项名称") 63 @ExcelProperty("检测项名称")
64 private String indicatorName; 64 private String indicatorName;
65 65
66 - @Schema(description = "检测项类型（字典 mes_index_type）", example = "SIZE") 66 + @Schema(description = "检测项类型", example = "1")
67 @ExcelProperty("检测项类型") 67 @ExcelProperty("检测项类型")
68 - private String indicatorType; 68 + private Integer indicatorType;
69 69
70 @Schema(description = "检测工具", example = "卡尺") 70 @Schema(description = "检测工具", example = "卡尺")
71 @ExcelProperty("检测工具") 71 @ExcelProperty("检测工具")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/indicator/MesQcIndicatorDO.java
  View file @9112050
@@ -39,7 +39,7 @@ public class MesQcIndicatorDO extends BaseDO { @@ -39,7 +39,7 @@ public class MesQcIndicatorDO extends BaseDO {
39 * 39 *
40 * 枚举 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_INDICATOR_TYPE} 40 * 枚举 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_INDICATOR_TYPE}
41 */ 41 */
42 - private String type; 42 + private Integer type;
43 /** 43 /**
44 * 检测工具 44 * 检测工具
45 */ 45 */