From 7e8edd4b59fb22146b90d01ca38f75148f3fd774 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 20 四月 2026 17:57:18 +0800
Subject: [PATCH] feat(bom): 添加BOM管理功能模块,工序 管理,基础 - 新增CustomerPrivatePoolMapper.xml实现客户私池映射 - 添加SysLoginController支持登录验证和用户信息获取 - 创建TechnologyBomController提供BOM的增删改查接口 - 定义TechnologyBomDto数据传输对象 - 实现TechnologyBomMapper和相关XML映射文件 - 开发TechnologyBomService业务逻辑层 - 添加TechnologyBomStructure结构管理功能 - 集成Excel导入导出BOM数据功能 - 实现BOM结构树形展示和维护功能

---
 src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
index ee11f8e..f01f315 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
@@ -1,13 +1,10 @@
 package com.ruoyi.quality.service.impl;
 
+import com.ruoyi.basic.service.IProductModelService;
+import com.ruoyi.basic.service.IProductService;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.quality.dto.QualityPassRateDto;
-import com.ruoyi.quality.dto.QualityInspectStatDto;
-import com.ruoyi.quality.dto.QualityMonthlyPassRateDto;
-import com.ruoyi.quality.dto.QualityMonthlyDetailDto;
-import com.ruoyi.quality.dto.QualityParameterStatDto;
-import com.ruoyi.quality.dto.QualityMonthlyPassRateWrapperDto;
-import com.ruoyi.quality.dto.QualityTopParameterDto;
+import com.ruoyi.production.service.ProductOrderService;
+import com.ruoyi.quality.dto.*;
 import com.ruoyi.quality.mapper.QualityInspectMapper;
 import com.ruoyi.quality.service.QualityReportService;
 import org.springframework.beans.BeanUtils;
@@ -59,11 +56,11 @@
                 QualityPassRateDto passRateDto = new QualityPassRateDto();
                 BeanUtils.copyProperties(dto, passRateDto);
 
-                if (dto.getInspectType() == 0) {
+                if (dto.getModelType() == 0) {
                     wrapper.setRawMaterial(passRateDto);
-                } else if (dto.getInspectType() == 1) {
+                } else if (dto.getModelType() == 1) {
                     wrapper.setProcess(passRateDto);
-                } else if (dto.getInspectType() == 2) {
+                } else if (dto.getModelType() == 2) {
                     wrapper.setOutgoing(passRateDto);
                 }
             }
@@ -90,11 +87,11 @@
     }
 
     @Override
-    public QualityTopParameterDto getTopParameters(Integer inspectType) {
-        if (inspectType == null) {
+    public QualityTopParameterDto getTopParameters(Integer modelType) {
+        if (modelType == null) {
             return new QualityTopParameterDto();
         }
-        List<QualityParameterStatDto> list = qualityInspectMapper.getTopParameters(inspectType);
+        List<QualityParameterStatDto> list = qualityInspectMapper.getTopParameters(modelType);
 
         BigDecimal total = list.stream()
                 .map(QualityParameterStatDto::getCount)

--
Gitblit v1.9.3