Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectPageReqVO.java

@@ -49,4 +49,16 @@ public class DvSubjectPageReqVO extends PageParam {
 
     @Schema(description = "id集合导出用")
     private String ids;
+
+    /**
+     * 上限值
+     */
+    @Schema(description = "上限值")
+    private Double upperVal;
+
+    /**
+     * 下限值
+     */
+    @Schema(description = "下限值")
+    private Double lowerVal;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectRespVO.java

@@ -72,4 +72,18 @@ public class DvSubjectRespVO{
     @ExcelProperty("创建人名字")
     private String creatorName;
 
+    /**
+     * 上限值
+     */
+    @Schema(description = "上限值")
+    @ExcelProperty("上限值")
+    private Double upperVal;
+
+    /**
+     * 下限值
+     */
+    @Schema(description = "下限值")
+    @ExcelProperty("下限值")
+    private Double lowerVal;
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/vo/DvSubjectSaveReqVO.java

@@ -43,8 +43,20 @@ public class DvSubjectSaveReqVO {
     @NotEmpty(message = "值类型")
     private String valueType;
 
-    @Schema(description = "判定基准", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "判定基准")
+    @Schema(description = "判定基准")
+//    @NotEmpty(message = "判定基准")
     private String judgmentCriteria;
 
+    /**
+     * 上限值
+     */
+    @Schema(description = "上限值")
+    private Double upperVal;
+
+    /**
+     * 下限值
+     */
+    @Schema(description = "下限值")
+    private Double lowerVal;
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvsubject/DvSubjectDO.java

@@ -67,4 +67,13 @@ public class DvSubjectDO extends BaseDO {
      */
     private String judgmentCriteria;
 
+    /**
+     * 上限值
+     */
+    private Double upperVal;
+
+    /**
+     * 下限值
+     */
+    private Double lowerVal;
 }