refactor(qms): 将字典相关字段Long改为String类型

- 修改了多个实体类中的检测类型、检测方法、控制类型等字段，将其数据类型从 Long 改为 String
- 更新了相关服务类和控制器中的方法，以适应这些字段类型的变更

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

@@ -49,24 +49,24 @@ public class QcInspectionItem extends TenantEntity {
     private Long categoryId;
 
     /**
-     * 检测类型(关联检测类型表主键)
+     * 注意：检测类型(关联检测类型表主键)
      */
     private Long inspectionType;
 
     /**
      * 检测方法（0目视,1千分尺）
      */
-    private Long method;
+    private String method;
 
     /**
      * 检测方式（0定性,1定量）
      */
-    private Long detectType;
+    private String detectType;
 
     /**
      * 控制类型（0手动输入，1自动输入）
      */
-    private Long controlType;
+    private String controlType;
 
     /**
      * 标准值

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

@@ -73,7 +73,7 @@ public class QcInspectionItemCategory extends TenantEntity {
      * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
      */
     @TableField(exist = false)
-    private Long qcInspectionType;//join
+    private String qcInspectionType;//join
 
 
 }

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

@@ -84,7 +84,7 @@ public class QcInspectionMain extends TenantEntity {
     /**
      * 质检结果（0合格/1不合格）
      */
-    private Long result;
+    private String result;
 
     /**
      * 车间
@@ -94,12 +94,12 @@ public class QcInspectionMain extends TenantEntity {
     /**
      * 检验类别（首检/过程检等等）
      */
-    private Long inspectionType;
+    private String inspectionType;
 
     /**
      * 单据状态（0未处理/1完成）
      */
-    private Long status;
+    private String status;
 
     /**
      * 检测人员

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

@@ -41,7 +41,7 @@ public class QcInspectionResult extends TenantEntity {
     /**
      * 检测结果（0合格，1不合格，2未判定）
      */
-    private Long detectResult;
+    private String detectResult;
 
     /**
      * 定量检测值
@@ -86,12 +86,12 @@ public class QcInspectionResult extends TenantEntity {
     /**
      * 检测方式（0定性,1定量）（快照）
      */
-    private Long detectType;
+    private String detectType;
 
     /**
      * 控制类型(0手动,1自动)（快照）
      */
-    private Long controlType;
+    private String controlType;
 
     /**
      * 标准值（快照）

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

@@ -109,6 +109,6 @@ public class QcInspectionTemplate extends TenantEntity {
      * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
      */
     @TableField(exist = false)
-    private Long qcInspectionType;//JOIN
+    private String qcInspectionType;//JOIN
 
 }

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

@@ -40,12 +40,12 @@ public class QcInspectionType extends TenantEntity {
     /**
      * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
      */
-    private Long qcInspectionType;
+    private String qcInspectionType;
 
     /**
      * 创建方式（1人工创建 2自动创建）
      */
-    private Long createMethod;
+    private String createMethod;
 
     /**
      * 是否删除（0表示存在，2表示删除）

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

@@ -59,19 +59,19 @@ public class QcTemplateItem extends TenantEntity {
     private String categoryName;
 
     /**
-     * 检测类型（根据主表关联的类型表主键查来的字典值自动存入）
+     * 注意：检测类型(关联检测类型表主键)
      */
     private Long inspectionType;
 
     /**
      * 检测方式（0定性,1定量）
      */
-    private Long detectType;
+    private String detectType;
 
     /**
      * 控制类型(0手动,1自动)
      */
-    private Long controlType;
+    private String controlType;
 
     /**
      * 标准值

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

@@ -61,17 +61,17 @@ public class QcUnqualifiedRecord extends TenantEntity {
     /**
      * 检测方法
      */
-    private Long inspectionMethod;
+    private String inspectionMethod;
 
     /**
      * 检测方式
      */
-    private Long detectType;
+    private String detectType;
 
     /**
      * 检测结果
      */
-    private Long detectResult;
+    private String detectResult;
 
     /**
      * 检测值

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

@@ -38,7 +38,7 @@ public class QcUnqualifiedReview extends TenantEntity {
     /**
      * 评审结果
      */
-    private Long reviewResult;
+    private String reviewResult;
 
     /**
      * 质检单号
@@ -48,7 +48,7 @@ public class QcUnqualifiedReview extends TenantEntity {
     /**
      * 检测类型
      */
-    private Long inspectionType;
+    private String inspectionType;
 
     /**
      * 生产日期

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

@@ -44,7 +44,7 @@ public class QcInspectionItemBo extends BaseEntity {
     private String inspectionPosition;
 
     /**
-     * 检测项类别（关联检测项类别表）
+     * 注意：检测类型(关联检测类型表主键)
      */
     private Long categoryId;
 
@@ -56,17 +56,17 @@ public class QcInspectionItemBo extends BaseEntity {
     /**
      * 检测方法（0目视,1千分尺）
      */
-    private Long method;
+    private String method;
 
     /**
      * 检测方式（0定性,1定量）
      */
-    private Long detectType;
+    private String detectType;
 
     /**
      * 控制类型（0手动输入，1自动输入）
      */
-    private Long controlType;
+    private String controlType;
 
     /**
      * 标准值

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

@@ -65,6 +65,6 @@ public class QcInspectionItemCategoryBo extends BaseEntity {
     /**
      * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
      */
-    private Long qcInspectionType;//join
+    private String qcInspectionType;//join
 
 }

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

@@ -11,6 +11,8 @@ import jakarta.validation.constraints.*;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.qms.domain.bo.QcInspectionResultBo;
+import java.util.List;
 
 /**
  * 质检任务业务对象 qc_inspection_main
@@ -88,7 +90,7 @@ public class QcInspectionMainBo extends BaseEntity {
     /**
      * 质检结果（0合格/1不合格）
      */
-    private Long result;
+    private String result;
 
     /**
      * 车间
@@ -98,12 +100,12 @@ public class QcInspectionMainBo extends BaseEntity {
     /**
      * 检验类别（首检/过程检等等）
      */
-    private Long inspectionType;
+    private String inspectionType;
 
     /**
      * 单据状态（0未处理/1完成）
      */
-    private Long status;
+    private String status;
 
     /**
      * 检测人员
@@ -160,5 +162,9 @@ public class QcInspectionMainBo extends BaseEntity {
      */
     private String templateName;//join
 
+    /**
+     * 检测结果列表
+     */
+    private List<QcInspectionResultBo> results;
 
 }

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

@@ -39,7 +39,7 @@ public class QcInspectionResultBo extends BaseEntity {
     /**
      * 检测结果（0合格，1不合格，2未判定）
      */
-    private Long detectResult;
+    private String detectResult;
 
     /**
      * 定量检测值
@@ -84,12 +84,12 @@ public class QcInspectionResultBo extends BaseEntity {
     /**
      * 检测方式（0定性,1定量）（快照）
      */
-    private Long detectType;
+    private String detectType;
 
     /**
      * 控制类型(0手动,1自动)（快照）
      */
-    private Long controlType;
+    private String controlType;
 
     /**
      * 标准值（快照）

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

@@ -102,6 +102,6 @@ public class QcInspectionTemplateBo extends BaseEntity {
     /**
      * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
      */
-    private Long qcInspectionType;//JOIN
+    private String qcInspectionType;//JOIN
 
 }

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

@@ -42,13 +42,13 @@ public class QcInspectionTypeBo extends BaseEntity {
      * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
      */
     // @NotNull(message = "检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long qcInspectionType;
+    private String qcInspectionType;
 
     /**
      * 创建方式（1人工创建 2自动创建）
      */
     // @NotNull(message = "创建方式（1人工创建 2自动创建）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long createMethod;
+    private String createMethod;
 
 
 }

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

@@ -58,19 +58,19 @@ public class QcTemplateItemBo extends BaseEntity {
     private String categoryName;
 
     /**
-     * 检测类型（根据主表关联的类型表主键查来的字典值自动存入）
+     * 注意：检测类型(关联检测类型表主键)
      */
     private Long inspectionType;
 
     /**
      * 检测方式（0定性,1定量）
      */
-    private Long detectType;
+    private String detectType;
 
     /**
      * 控制类型(0手动,1自动)
      */
-    private Long controlType;
+    private String controlType;
 
     /**
      * 标准值

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

@@ -59,17 +59,17 @@ public class QcUnqualifiedRecordBo extends BaseEntity {
     /**
      * 检测方法
      */
-    private Long inspectionMethod;
+    private String inspectionMethod;
 
     /**
      * 检测方式
      */
-    private Long detectType;
+    private String detectType;
 
     /**
      * 检测结果
      */
-    private Long detectResult;
+    private String detectResult;
 
     /**
      * 检测值

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

@@ -37,7 +37,7 @@ public class QcUnqualifiedReviewBo extends BaseEntity {
     /**
      * 评审结果
      */
-    private Long reviewResult;
+    private String reviewResult;
 
     /**
      * 质检单号
@@ -47,7 +47,7 @@ public class QcUnqualifiedReviewBo extends BaseEntity {
     /**
      * 检测类型
      */
-    private Long inspectionType;
+    private String inspectionType;
 
     /**
      * 生产日期

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

@@ -80,6 +80,6 @@ public class QcInspectionItemCategoryVo implements Serializable {
     /**
      * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
      */
-    private Long qcInspectionType;//join
+    private String qcInspectionType;//join
 
 }

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

@@ -61,7 +61,7 @@ public class QcInspectionItemVo implements Serializable {
     private Long categoryId;
 
     /**
-     * 检测类型(关联检测类型表主键)
+     * 注意：检测类型(关联检测类型表主键)
      */
     @ExcelProperty(value = "检测类型")
     private Long inspectionType;
@@ -71,21 +71,21 @@ public class QcInspectionItemVo implements Serializable {
      */
     @ExcelProperty(value = "检测方法", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "qc_methond")
-    private Long method;
+    private String method;
 
     /**
      * 检测方式（0定性,1定量）
      */
     @ExcelProperty(value = "检测方式", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "detect_type")
-    private Long detectType;
+    private String detectType;
 
     /**
      * 控制类型（0手动输入，1自动输入）
      */
     @ExcelProperty(value = "控制类型", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "control_type")
-    private Long controlType;
+    private String controlType;
 
     /**
      * 标准值

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

@@ -107,7 +107,7 @@ public class QcInspectionMainVo implements Serializable {
      */
     @ExcelProperty(value = "质检结果", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "qc_result")
-    private Long result;
+    private String result;
 
     /**
      * 车间
@@ -120,14 +120,14 @@ public class QcInspectionMainVo implements Serializable {
      */
     @ExcelProperty(value = "检验类别", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "qc_inspection_type")
-    private Long inspectionType;
+    private String inspectionType;
 
     /**
      * 单据状态（0未处理/1完成）
      */
     @ExcelProperty(value = "单据状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "qc_status")
-    private Long status;
+    private String status;
 
     /**
      * 检测人员

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

@@ -52,7 +52,7 @@ public class QcInspectionResultVo implements Serializable {
      */
     @ExcelProperty(value = "检测结果", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "qc_result")
-    private Long detectResult;
+    private String detectResult;
 
     /**
      * 定量检测值
@@ -112,14 +112,14 @@ public class QcInspectionResultVo implements Serializable {
      */
     @ExcelProperty(value = "检测方式", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "detect_type")
-    private Long detectType;
+    private String detectType;
 
     /**
      * 控制类型(0手动,1自动)（快照）
      */
     @ExcelProperty(value = "控制类型(0手动,1自动)", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "control_type")
-    private Long controlType;
+    private String controlType;
 
     /**
      * 标准值（快照）

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

@@ -119,6 +119,6 @@ public class QcInspectionTemplateVo implements Serializable {
     /**
      * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
      */
-    private Long qcInspectionType;//JOIN
+    private String qcInspectionType;//JOIN
 
 }

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

@@ -51,14 +51,14 @@ public class QcInspectionTypeVo implements Serializable {
      */
     @ExcelProperty(value = "检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "qc_inspection_type")
-    private Long qcInspectionType;
+    private String qcInspectionType;
 
     /**
      * 创建方式（1人工创建 2自动创建）
      */
     @ExcelProperty(value = "创建方式", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "create_method")
-    private Long createMethod;
+    private String createMethod;
 
 
 }

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

@@ -74,10 +74,9 @@ public class QcTemplateItemVo implements Serializable {
     private String categoryName;
 
     /**
-     * 检测类型（根据主表关联的类型表主键查来的字典值自动存入）
+     * 注意：检测类型(关联检测类型表主键)
      */
-    @ExcelProperty(value = "检测类型", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "检测类型")
-    @ExcelDictFormat(readConverterExp = "根=据主表关联的类型表主键查来的字典值自动存入")
     private Long inspectionType;
 
     /**
@@ -85,14 +84,14 @@ public class QcTemplateItemVo implements Serializable {
      */
     @ExcelProperty(value = "检测方式", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "qc_methond")
-    private Long detectType;
+    private String detectType;
 
     /**
      * 控制类型(0手动,1自动)
      */
     @ExcelProperty(value = "控制类型(0手动,1自动)", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "control_type")
-    private Long controlType;
+    private String controlType;
 
     /**
      * 标准值

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

@@ -76,21 +76,21 @@ public class QcUnqualifiedRecordVo implements Serializable {
      */
     @ExcelProperty(value = "检测方法", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "qc_methond")
-    private Long inspectionMethod;
+    private String inspectionMethod;
 
     /**
      * 检测方式
      */
     @ExcelProperty(value = "检测方式", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "detect_type")
-    private Long detectType;
+    private String detectType;
 
     /**
      * 检测结果
      */
     @ExcelProperty(value = "检测结果", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "qc_result")
-    private Long detectResult;
+    private String detectResult;
 
     /**
      * 检测值

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

@@ -48,7 +48,7 @@ public class QcUnqualifiedReviewVo implements Serializable {
      */
     @ExcelProperty(value = "评审结果", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "review_result")
-    private Long reviewResult;
+    private String reviewResult;
 
     /**
      * 质检单号
@@ -60,7 +60,7 @@ public class QcUnqualifiedReviewVo implements Serializable {
      * 检测类型
      */
     @ExcelProperty(value = "检测类型")
-    private Long inspectionType;
+    private String inspectionType;
 
     /**
      * 生产日期

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

@@ -16,6 +16,7 @@ import org.dromara.qms.domain.QcTemplateItem;
 import org.dromara.qms.domain.bo.QcTemplateItemBo;
 import org.dromara.qms.domain.vo.QcTemplateItemVo;
 import org.dromara.qms.mapper.QcTemplateItemMapper;
+import org.dromara.qms.service.IQcInspectionTypeService;
 import org.dromara.qms.service.IQcTemplateItemService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -47,6 +48,8 @@ public class QcInspectionItemServiceImpl implements IQcInspectionItemService {
     private final QcTemplateItemMapper qcTemplateItemMapper;
     private final IQcTemplateItemService qcTemplateItemService;
 
+    private final IQcInspectionTypeService qcInspectionTypeService;
+
     /**
      * 查询检测项定义
      *
@@ -103,9 +106,12 @@ public class QcInspectionItemServiceImpl implements IQcInspectionItemService {
         .eq(StringUtils.isNotBlank(bo.getInspectionPosition()), QcInspectionItem::getInspectionPosition, bo.getInspectionPosition())
         .eq(bo.getCategoryId() != null, QcInspectionItem::getCategoryId, bo.getCategoryId())
         .eq(bo.getInspectionType() != null, QcInspectionItem::getInspectionType, bo.getInspectionType())
-        .eq(bo.getMethod() != null, QcInspectionItem::getMethod, bo.getMethod())
+//        .eq(bo.getMethod() != null, QcInspectionItem::getMethod, bo.getMethod())
-        .eq(bo.getDetectType() != null, QcInspectionItem::getDetectType, bo.getDetectType())
+//        .eq(bo.getDetectType() != null, QcInspectionItem::getDetectType, bo.getDetectType())
-        .eq(bo.getControlType() != null, QcInspectionItem::getControlType, bo.getControlType())
+//        .eq(bo.getControlType() != null, QcInspectionItem::getControlType, bo.getControlType())
+            .eq(StringUtils.isNotBlank(bo.getMethod()), QcInspectionItem::getMethod, bo.getMethod())
+            .eq(StringUtils.isNotBlank(bo.getDetectType()), QcInspectionItem::getDetectType, bo.getDetectType())
+            .eq(StringUtils.isNotBlank(bo.getControlType()), QcInspectionItem::getControlType, bo.getControlType())
         .eq(bo.getStandardValue() != null, QcInspectionItem::getStandardValue, bo.getStandardValue())
         .eq(bo.getUpperLimit() != null, QcInspectionItem::getUpperLimit, bo.getUpperLimit())
         .eq(bo.getLowerLimit() != null, QcInspectionItem::getLowerLimit, bo.getLowerLimit())
@@ -170,7 +176,10 @@ public class QcInspectionItemServiceImpl implements IQcInspectionItemService {
            oldQcTemplateItem.setInspectionItemName(update.getItemName());
            oldQcTemplateItem.setInspectionPosition(update.getInspectionPosition());
            oldQcTemplateItem.setCategoryName(update.getCategoryName());
+
+          //XXX:注意：检测类型(关联检测类型表主键)
            oldQcTemplateItem.setInspectionType(update.getInspectionType());
+
            oldQcTemplateItem.setDetectType(update.getDetectType());
            oldQcTemplateItem.setControlType(update.getControlType());
            oldQcTemplateItem.setStandardValue(update.getStandardValue());

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

@@ -91,10 +91,13 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService {
         .eq(bo.getInspectionQty() != null, QcInspectionMain::getInspectionQty, bo.getInspectionQty())
         .eq(bo.getQualifiedQty() != null, QcInspectionMain::getQualifiedQty, bo.getQualifiedQty())
         .eq(bo.getUnqualifiedQty() != null, QcInspectionMain::getUnqualifiedQty, bo.getUnqualifiedQty())
-        .eq(bo.getResult() != null, QcInspectionMain::getResult, bo.getResult())
+//        .eq(bo.getResult() != null, QcInspectionMain::getResult, bo.getResult())
+            .eq(StringUtils.isNotBlank(bo.getResult()), QcInspectionMain::getResult, bo.getResult())
         .eq(StringUtils.isNotBlank(bo.getWorkshop()), QcInspectionMain::getWorkshop, bo.getWorkshop())
-        .eq(bo.getInspectionType() != null, QcInspectionMain::getInspectionType, bo.getInspectionType())
+//        .eq(bo.getInspectionType() != null, QcInspectionMain::getInspectionType, bo.getInspectionType())
-        .eq(bo.getStatus() != null, QcInspectionMain::getStatus, bo.getStatus())
+//        .eq(bo.getStatus() != null, QcInspectionMain::getStatus, bo.getStatus())
+            .eq(StringUtils.isNotBlank(bo.getInspectionType()), QcInspectionMain::getInspectionType, bo.getInspectionType())
+            .eq(StringUtils.isNotBlank(bo.getStatus()), QcInspectionMain::getStatus, bo.getStatus())
         .eq(StringUtils.isNotBlank(bo.getInspector()), QcInspectionMain::getInspector, bo.getInspector())
         .eq(StringUtils.isNotBlank(bo.getShift()), QcInspectionMain::getShift, bo.getShift())
         .eq(StringUtils.isNotBlank(bo.getTeam()), QcInspectionMain::getTeam, bo.getTeam())

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

@@ -76,7 +76,8 @@ public class QcInspectionResultServiceImpl implements IQcInspectionResultService
         .eq(bo.getResultId() != null, QcInspectionResult::getResultId, bo.getResultId())
         .eq(bo.getInspectionId() != null, QcInspectionResult::getInspectionId, bo.getInspectionId())
         .eq(bo.getItemId() != null, QcInspectionResult::getItemId, bo.getItemId())
-        .eq(bo.getDetectResult() != null, QcInspectionResult::getDetectResult, bo.getDetectResult())
+//        .eq(bo.getDetectResult() != null, QcInspectionResult::getDetectResult, bo.getDetectResult())
+            .eq(StringUtils.isNotBlank(bo.getDetectResult()), QcInspectionResult::getDetectResult, bo.getDetectResult())
         .eq(bo.getDetectValue() != null, QcInspectionResult::getDetectValue, bo.getDetectValue())
         .eq(StringUtils.isNotBlank(bo.getSpecInspection()), QcInspectionResult::getSpecInspection, bo.getSpecInspection())
         .eq(StringUtils.isNotBlank(bo.getProblemDetail()), QcInspectionResult::getProblemDetail, bo.getProblemDetail())
@@ -85,8 +86,10 @@ public class QcInspectionResultServiceImpl implements IQcInspectionResultService
         .eq(StringUtils.isNotBlank(bo.getInspectionPosition()), QcInspectionResult::getInspectionPosition, bo.getInspectionPosition())
         .like(StringUtils.isNotBlank(bo.getCategoryName()), QcInspectionResult::getCategoryName, bo.getCategoryName())
         .eq(bo.getTypeId() != null, QcInspectionResult::getTypeId, bo.getTypeId())
-        .eq(bo.getDetectType() != null, QcInspectionResult::getDetectType, bo.getDetectType())
+//        .eq(bo.getDetectType() != null, QcInspectionResult::getDetectType, bo.getDetectType())
-        .eq(bo.getControlType() != null, QcInspectionResult::getControlType, bo.getControlType())
+//        .eq(bo.getControlType() != null, QcInspectionResult::getControlType, bo.getControlType())
+            .eq(StringUtils.isNotBlank(bo.getDetectType()), QcInspectionResult::getDetectType, bo.getDetectType())
+            .eq(StringUtils.isNotBlank(bo.getControlType()), QcInspectionResult::getControlType, bo.getControlType())
         .eq(bo.getStandardValue() != null, QcInspectionResult::getStandardValue, bo.getStandardValue())
         .eq(bo.getUpperLimit() != null, QcInspectionResult::getUpperLimit, bo.getUpperLimit())
         .eq(bo.getLowerLimit() != null, QcInspectionResult::getLowerLimit, bo.getLowerLimit())

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

@@ -78,8 +78,10 @@ public class QcInspectionTypeServiceImpl implements IQcInspectionTypeService {
         .eq(bo.getTypeId() != null, QcInspectionType::getTypeId, bo.getTypeId())
         .eq(StringUtils.isNotBlank(bo.getTypeCode()), QcInspectionType::getTypeCode, bo.getTypeCode())
         .like(StringUtils.isNotBlank(bo.getTypeName()), QcInspectionType::getTypeName, bo.getTypeName())
-        .eq(bo.getQcInspectionType() != null, QcInspectionType::getQcInspectionType, bo.getQcInspectionType())
+//        .eq(bo.getQcInspectionType() != null, QcInspectionType::getQcInspectionType, bo.getQcInspectionType())
-        .eq(bo.getCreateMethod() != null, QcInspectionType::getCreateMethod, bo.getCreateMethod())
+//        .eq(bo.getCreateMethod() != null, QcInspectionType::getCreateMethod, bo.getCreateMethod())
+            .eq(StringUtils.isNotBlank(bo.getQcInspectionType()), QcInspectionType::getQcInspectionType, bo.getQcInspectionType())
+            .eq(bo.getCreateMethod() != null, QcInspectionType::getCreateMethod, bo.getCreateMethod())
         .orderByDesc(QcInspectionType::getCreateTime);
         return lqw;
     }

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

@@ -97,8 +97,10 @@ public class QcTemplateItemServiceImpl implements IQcTemplateItemService {
         .eq(StringUtils.isNotBlank(bo.getInspectionPosition()), QcTemplateItem::getInspectionPosition, bo.getInspectionPosition())
         .eq(StringUtils.isNotBlank(bo.getCategoryName()), QcTemplateItem::getCategoryName, bo.getCategoryName())
         .eq(bo.getInspectionType() != null, QcTemplateItem::getInspectionType, bo.getInspectionType())
-        .eq(bo.getDetectType() != null, QcTemplateItem::getDetectType, bo.getDetectType())
+//        .eq(bo.getDetectType() != null, QcTemplateItem::getDetectType, bo.getDetectType())
-        .eq(bo.getControlType() != null, QcTemplateItem::getControlType, bo.getControlType())
+//        .eq(bo.getControlType() != null, QcTemplateItem::getControlType, bo.getControlType())
+            .eq(StringUtils.isNotBlank(bo.getDetectType()), QcTemplateItem::getDetectType, bo.getDetectType())
+            .eq(StringUtils.isNotBlank(bo.getControlType()), QcTemplateItem::getControlType, bo.getControlType())
         .eq(bo.getStandardValue() != null, QcTemplateItem::getStandardValue, bo.getStandardValue())
         .eq(bo.getUpperLimit() != null, QcTemplateItem::getUpperLimit, bo.getUpperLimit())
         .eq(bo.getLowerLimit() != null, QcTemplateItem::getLowerLimit, bo.getLowerLimit())

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

@@ -80,9 +80,12 @@ public class QcUnqualifiedRecordServiceImpl implements IQcUnqualifiedRecordServi
         .eq(StringUtils.isNotBlank(bo.getInspectionPosition()), QcUnqualifiedRecord::getInspectionPosition, bo.getInspectionPosition())
         .like(bo.getCategoryName() != null, QcUnqualifiedRecord::getCategoryName, bo.getCategoryName())
         .eq(bo.getTypeId() != null, QcUnqualifiedRecord::getTypeId, bo.getTypeId())
-        .eq(bo.getInspectionMethod() != null, QcUnqualifiedRecord::getInspectionMethod, bo.getInspectionMethod())
+//        .eq(bo.getInspectionMethod() != null, QcUnqualifiedRecord::getInspectionMethod, bo.getInspectionMethod())
-        .eq(bo.getDetectType() != null, QcUnqualifiedRecord::getDetectType, bo.getDetectType())
+            .eq(StringUtils.isNotBlank(bo.getInspectionMethod()), QcUnqualifiedRecord::getInspectionMethod, bo.getInspectionMethod())
-        .eq(bo.getDetectResult() != null, QcUnqualifiedRecord::getDetectResult, bo.getDetectResult())
+//        .eq(bo.getDetectType() != null, QcUnqualifiedRecord::getDetectType, bo.getDetectType())
+//        .eq(bo.getDetectResult() != null, QcUnqualifiedRecord::getDetectResult, bo.getDetectResult())
+            .eq(StringUtils.isNotBlank(bo.getDetectType()), QcUnqualifiedRecord::getDetectType, bo.getDetectType())
+            .eq(StringUtils.isNotBlank(bo.getDetectResult()), QcUnqualifiedRecord::getDetectResult, bo.getDetectResult())
         .eq(bo.getDetectValue() != null, QcUnqualifiedRecord::getDetectValue, bo.getDetectValue())
         .eq(bo.getUpperLimit() != null, QcUnqualifiedRecord::getUpperLimit, bo.getUpperLimit())
         .eq(bo.getLowerLimit() != null, QcUnqualifiedRecord::getLowerLimit, bo.getLowerLimit())

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

@@ -75,9 +75,11 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi
         .selectAll(QcUnqualifiedReview.class)
         .eq(bo.getReviewId() != null, QcUnqualifiedReview::getReviewId, bo.getReviewId())
         .eq(bo.getUnqualifiedReviewNo() != null, QcUnqualifiedReview::getUnqualifiedReviewNo, bo.getUnqualifiedReviewNo())
-        .eq(bo.getReviewResult() != null, QcUnqualifiedReview::getReviewResult, bo.getReviewResult())
+//        .eq(bo.getReviewResult() != null, QcUnqualifiedReview::getReviewResult, bo.getReviewResult())
+            .eq(StringUtils.isNotBlank(bo.getReviewResult()), QcUnqualifiedReview::getReviewResult, bo.getReviewResult())
         .eq(StringUtils.isNotBlank(bo.getInspectionNo()), QcUnqualifiedReview::getInspectionNo, bo.getInspectionNo())
-        .eq(bo.getInspectionType() != null, QcUnqualifiedReview::getInspectionType, bo.getInspectionType())
+//        .eq(bo.getInspectionType() != null, QcUnqualifiedReview::getInspectionType, bo.getInspectionType())
+            .eq(StringUtils.isNotBlank(bo.getInspectionType()), QcUnqualifiedReview::getInspectionType, bo.getInspectionType())
         .eq(bo.getProductionDate() != null, QcUnqualifiedReview::getProductionDate, bo.getProductionDate())
         .eq(StringUtils.isNotBlank(bo.getWorkOrderNo()), QcUnqualifiedReview::getWorkOrderNo, bo.getWorkOrderNo())
         .like(StringUtils.isNotBlank(bo.getProcessName()), QcUnqualifiedReview::getProcessName, bo.getProcessName())