修改 质检类型查询

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

@@ -104,7 +104,7 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService {
 //        .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(StringUtils.isNotBlank(bo.getQcInspectionType()), QcInspectionType::getQcInspectionType, bo.getQcInspectionType())
             .eq(StringUtils.isNotBlank(bo.getStatus()), QcInspectionMain::getStatus, bo.getStatus())

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

@@ -1,27 +1,25 @@
 package org.dromara.qms.service.impl;
 
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.qms.domain.QcInspectionMain;
-import org.dromara.qms.domain.QcInspectionTemplate;
 import org.dromara.qms.domain.QcInspectionType;
-import org.springframework.stereotype.Service;
+import org.dromara.qms.domain.QcUnqualifiedReview;
 import org.dromara.qms.domain.bo.QcUnqualifiedReviewBo;
 import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo;
-import org.dromara.qms.domain.QcUnqualifiedReview;
 import org.dromara.qms.mapper.QcUnqualifiedReviewMapper;
 import org.dromara.qms.service.IQcUnqualifiedReviewService;
+import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 不合格品待评审Service业务层处理
@@ -83,7 +81,7 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi
 //        .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())