From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 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..d59b610 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
@@ -1,17 +1,11 @@
package com.ruoyi.quality.service.impl;
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.quality.dto.*;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.service.QualityReportService;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -23,10 +17,10 @@
@Service
+@RequiredArgsConstructor
public class QualityReportServiceImpl implements QualityReportService {
- @Autowired
- private QualityInspectMapper qualityInspectMapper;
+ private final QualityInspectMapper qualityInspectMapper;
@Override
public List<QualityInspectStatDto> getInspectStatistics() {
@@ -59,11 +53,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 +84,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