diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItem.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItem.java index 277721c..503cb33 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItem.java +++ b/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; /** * 检测项说明 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionResult.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionResult.java index 214bba1..2a20a9b 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionResult.java +++ b/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; /** * 检测项说明(快照) diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcTemplateItem.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcTemplateItem.java index fba2174..629c83c 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcTemplateItem.java +++ b/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; /** * 检测项说明 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcUnqualifiedRecord.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcUnqualifiedRecord.java index 8bd00ea..f7cef9d 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcUnqualifiedRecord.java +++ b/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; /** * 检查项说明 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java index 2e8e0e9..ad397cd 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java +++ b/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; /** * 检测项说明 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java index f982b37..b54927c 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java +++ b/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; /** * 检测项说明(快照) diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java index 6a931ea..5ad6ba8 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java +++ b/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; /** * 检测项说明 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcUnqualifiedRecordBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcUnqualifiedRecordBo.java index 3b5dc06..c79416c 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcUnqualifiedRecordBo.java +++ b/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; /** * 检查项说明 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemDetailVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemDetailVo.java index d99ca56..fb9a488 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemDetailVo.java +++ b/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; -} \ No newline at end of file +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemVo.java index 10eed11..1b7476d 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemVo.java +++ b/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; /** * 检测项说明 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionResultVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionResultVo.java index 75cd60c..02778e6 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionResultVo.java +++ b/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; /** * 检测项说明(快照) diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcTemplateItemVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcTemplateItemVo.java index e1c5a0d..ff3e836 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcTemplateItemVo.java +++ b/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; /** * 检测项说明 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcUnqualifiedRecordVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcUnqualifiedRecordVo.java index 3923399..893d462 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcUnqualifiedRecordVo.java +++ b/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; /** * 检查项说明 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java index a4b5cc9..52ee0ea 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java +++ b/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()) diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java index cc6047d..964e77f 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java +++ b/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; diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcTemplateItemServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcTemplateItemServiceImpl.java index 8d932e0..0361840 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcTemplateItemServiceImpl.java +++ b/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; diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedRecordServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedRecordServiceImpl.java index aeef9f0..06d4eb1 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedRecordServiceImpl.java +++ b/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;