diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectPageReqVO.java index 99258fd51..4f2cc8a79 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectPageReqVO.java @@ -6,6 +6,8 @@ import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotEmpty; import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -44,6 +46,9 @@ public class DvSubjectPageReqVO extends PageParam { @Schema(description = "值类型") private String valueType; + @Schema(description = "作业类型") + private Integer jobType; + @Schema(description = "判定基准") private String judgmentCriteria; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectRespVO.java index e725ac408..7d0bb1504 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectRespVO.java @@ -61,6 +61,11 @@ public class DvSubjectRespVO{ @DictFormat("value_types") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 private String valueType; + @Schema(description = "作业类型") + @ExcelProperty(value = "作业类型", converter = DictConvert.class) + @DictFormat("mes_job_type") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 + private Integer jobType; + @Schema(description = "判定基准") @ExcelProperty("判定基准") private String judgmentCriteria; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectSaveReqVO.java index b8abfe375..3a805e569 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectSaveReqVO.java @@ -42,6 +42,9 @@ public class DvSubjectSaveReqVO { @Schema(description = "值类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "值类型") private String valueType; + @Schema(description = "作业类型", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "作业类型") + private Integer jobType; @Schema(description = "判定基准") // @NotEmpty(message = "判定基准") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvsubject/DvSubjectDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvsubject/DvSubjectDO.java index e39a483d4..6e012df06 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvsubject/DvSubjectDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvsubject/DvSubjectDO.java @@ -62,6 +62,10 @@ public class DvSubjectDO extends BaseDO { * 值类型 */ private String valueType; + /** + * 作业类型 + */ + private Integer jobType; /** * 判定基准 */