refactor(qms): 将规格上下限字段类型从 BigDecimal 改为 String

- 修改了多个实体类、BO、VO 中的 specUpper 和 specLower 字段类型
- 更新了相关服务实现类中的查询条件

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItem.java

@@ -91,12 +91,12 @@ public class QcInspectionItem extends TenantEntity {
     /**
      * 规格上限
      */
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限
      */
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检测项说明

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionResult.java

@@ -116,12 +116,12 @@ public class QcInspectionResult extends TenantEntity {
     /**
      * 规格上限（快照）
      */
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限（快照）
      */
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检测项说明（快照）

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcTemplateItem.java

@@ -96,12 +96,12 @@ public class QcTemplateItem extends TenantEntity {
     /**
      * 规格上限
      */
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限
      */
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检测项说明

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcUnqualifiedRecord.java

@@ -96,12 +96,12 @@ public class QcUnqualifiedRecord extends TenantEntity {
     /**
      * 规格上限
      */
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限
      */
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检查项说明

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java

@@ -91,12 +91,12 @@ public class QcInspectionItemBo extends BaseEntity {
     /**
      * 规格上限
      */
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限
      */
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检测项说明

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java

@@ -114,12 +114,12 @@ public class QcInspectionResultBo extends BaseEntity {
     /**
      * 规格上限（快照）
      */
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限（快照）
      */
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检测项说明（快照）

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java

@@ -95,12 +95,12 @@ public class QcTemplateItemBo extends BaseEntity {
     /**
      * 规格上限
      */
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限
      */
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检测项说明

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcUnqualifiedRecordBo.java

@@ -94,12 +94,12 @@ public class QcUnqualifiedRecordBo extends BaseEntity {
     /**
      * 规格上限
      */
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限
      */
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检查项说明

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemDetailVo.java

@@ -71,7 +71,7 @@ public class QcInspectionItemDetailVo implements Serializable {
      */
     @ExcelProperty(value = "检测方式", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "detect_type")
-    private Long detectType;
+    private String detectType;
 
     /**
      * 检测方式文本（定性/定量）
@@ -192,4 +192,4 @@ public class QcInspectionItemDetailVo implements Serializable {
      */
     private String remark;
 
-}
+}

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemVo.java

@@ -115,13 +115,13 @@ public class QcInspectionItemVo implements Serializable {
      * 规格上限
      */
     @ExcelProperty(value = "规格上限")
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限
      */
     @ExcelProperty(value = "规格下限")
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检测项说明

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionResultVo.java

@@ -154,14 +154,14 @@ public class QcInspectionResultVo implements Serializable {
      */
     @ExcelProperty(value = "规格上限", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "快=照")
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限（快照）
      */
     @ExcelProperty(value = "规格下限", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "快=照")
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检测项说明（快照）

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcTemplateItemVo.java

@@ -121,13 +121,13 @@ public class QcTemplateItemVo implements Serializable {
      * 规格上限
      */
     @ExcelProperty(value = "规格上限")
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限
      */
     @ExcelProperty(value = "规格下限")
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检测项说明

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcUnqualifiedRecordVo.java

@@ -120,13 +120,13 @@ public class QcUnqualifiedRecordVo implements Serializable {
      * 规格上限
      */
     @ExcelProperty(value = "规格上限")
-    private BigDecimal specUpper;
+    private String specUpper;
 
     /**
      * 规格下限
      */
     @ExcelProperty(value = "规格下限")
-    private BigDecimal specLower;
+    private String specLower;
 
     /**
      * 检查项说明

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java

@@ -116,8 +116,10 @@ public class QcInspectionItemServiceImpl implements IQcInspectionItemService {
         .eq(bo.getUpperLimit() != null, QcInspectionItem::getUpperLimit, bo.getUpperLimit())
         .eq(bo.getLowerLimit() != null, QcInspectionItem::getLowerLimit, bo.getLowerLimit())
         .like(StringUtils.isNotBlank(bo.getSpecName()), QcInspectionItem::getSpecName, bo.getSpecName())
-        .eq(bo.getSpecUpper() != null, QcInspectionItem::getSpecUpper, bo.getSpecUpper())
-        .eq(bo.getSpecLower() != null, QcInspectionItem::getSpecLower, bo.getSpecLower())
+//        .eq(bo.getSpecUpper() != null, QcInspectionItem::getSpecUpper, bo.getSpecUpper())
+//        .eq(bo.getSpecLower() != null, QcInspectionItem::getSpecLower, bo.getSpecLower())
+            .eq(StringUtils.isNotBlank(bo.getSpecUpper()), QcInspectionItem::getSpecUpper, bo.getSpecUpper())
+            .eq(StringUtils.isNotBlank(bo.getSpecLower()), QcInspectionItem::getSpecLower, bo.getSpecLower())
         .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionItem::getDescription, bo.getDescription())
         .eq(StringUtils.isNotBlank(bo.getOptionCode()), QcInspectionItem::getOptionCode, bo.getOptionCode())
         .like(StringUtils.isNotBlank(bo.getOptionName()), QcInspectionItem::getOptionName, bo.getOptionName())

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java

@@ -94,8 +94,10 @@ public class QcInspectionResultServiceImpl implements IQcInspectionResultService
         .eq(bo.getUpperLimit() != null, QcInspectionResult::getUpperLimit, bo.getUpperLimit())
         .eq(bo.getLowerLimit() != null, QcInspectionResult::getLowerLimit, bo.getLowerLimit())
         .like(StringUtils.isNotBlank(bo.getSpecName()), QcInspectionResult::getSpecName, bo.getSpecName())
-        .eq(bo.getSpecUpper() != null, QcInspectionResult::getSpecUpper, bo.getSpecUpper())
-        .eq(bo.getSpecLower() != null, QcInspectionResult::getSpecLower, bo.getSpecLower())
+//        .eq(bo.getSpecUpper() != null, QcInspectionResult::getSpecUpper, bo.getSpecUpper())
+//        .eq(bo.getSpecLower() != null, QcInspectionResult::getSpecLower, bo.getSpecLower())
+            .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionResult::getDescription, bo.getDescription())
+            .eq(StringUtils.isNotBlank(bo.getDetectType()), QcInspectionResult::getDetectType, bo.getDetectType())
         .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionResult::getDescription, bo.getDescription())
         .orderByDesc(QcInspectionResult::getCreateTime);
         return lqw;

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcTemplateItemServiceImpl.java

@@ -105,8 +105,10 @@ public class QcTemplateItemServiceImpl implements IQcTemplateItemService {
         .eq(bo.getUpperLimit() != null, QcTemplateItem::getUpperLimit, bo.getUpperLimit())
         .eq(bo.getLowerLimit() != null, QcTemplateItem::getLowerLimit, bo.getLowerLimit())
         .eq(StringUtils.isNotBlank(bo.getSpecName()), QcTemplateItem::getSpecName, bo.getSpecName())
-        .eq(bo.getSpecUpper() != null, QcTemplateItem::getSpecUpper, bo.getSpecUpper())
-        .eq(bo.getSpecLower() != null, QcTemplateItem::getSpecLower, bo.getSpecLower())
+//        .eq(bo.getSpecUpper() != null, QcTemplateItem::getSpecUpper, bo.getSpecUpper())
+//        .eq(bo.getSpecLower() != null, QcTemplateItem::getSpecLower, bo.getSpecLower())
+            .eq(StringUtils.isNotBlank(bo.getSpecUpper()), QcTemplateItem::getSpecUpper, bo.getSpecUpper())
+            .eq(StringUtils.isNotBlank(bo.getSpecLower()), QcTemplateItem::getSpecLower, bo.getSpecLower())
         .eq(StringUtils.isNotBlank(bo.getDescription()), QcTemplateItem::getDescription, bo.getDescription())
         .orderByDesc(QcTemplateItem::getCreateTime);
         return lqw;

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedRecordServiceImpl.java

@@ -90,8 +90,10 @@ public class QcUnqualifiedRecordServiceImpl implements IQcUnqualifiedRecordServi
         .eq(bo.getUpperLimit() != null, QcUnqualifiedRecord::getUpperLimit, bo.getUpperLimit())
         .eq(bo.getLowerLimit() != null, QcUnqualifiedRecord::getLowerLimit, bo.getLowerLimit())
         .eq(StringUtils.isNotBlank(bo.getSpecInspectionValue()), QcUnqualifiedRecord::getSpecInspectionValue, bo.getSpecInspectionValue())
-        .eq(bo.getSpecUpper() != null, QcUnqualifiedRecord::getSpecUpper, bo.getSpecUpper())
-        .eq(bo.getSpecLower() != null, QcUnqualifiedRecord::getSpecLower, bo.getSpecLower())
+//        .eq(bo.getSpecUpper() != null, QcUnqualifiedRecord::getSpecUpper, bo.getSpecUpper())
+//        .eq(bo.getSpecLower() != null, QcUnqualifiedRecord::getSpecLower, bo.getSpecLower())
+            .eq(StringUtils.isNotBlank(bo.getSpecUpper()), QcUnqualifiedRecord::getSpecUpper, bo.getSpecUpper())
+            .eq(StringUtils.isNotBlank(bo.getSpecLower()), QcUnqualifiedRecord::getSpecLower, bo.getSpecLower())
         .eq(StringUtils.isNotBlank(bo.getDescription()), QcUnqualifiedRecord::getDescription, bo.getDescription())
         .orderByDesc(QcUnqualifiedRecord::getCreateTime);
         return lqw;