fix: 返回结果移除List集合

gongchunyi

2 天以前 704404a23faa4e9d952fc42f5c4c91321569903c

fix: 返回结果移除List集合

 src/main/java/com/ruoyi/home/dto/NonComplianceWarningDto.java

@@ -41,6 +41,11 @@
    @Data
    public static class Item {
        /**
         * 父类产品标题
         */
        private String parentProductTitle;

        /**
         * 产品标题
         */
        private String productTitle;

 src/main/java/com/ruoyi/home/service/HomeService.java

@@ -31,6 +31,7 @@
    Long noticesCount();

    ProductionProgressDto productionProgress();

    ProductionTurnoverDto workInProcessTurnover();

    DeptStaffDistributionDto deptStaffDistribution();
@@ -75,11 +76,11 @@

    List<MapDto> orderCount();

    List<QualityQualifiedAnalysisDto> rawMaterialDetection(Integer type);
    QualityQualifiedAnalysisDto rawMaterialDetection(Integer type);

    List<QualityQualifiedAnalysisDto> processDetection(Integer type);
    QualityQualifiedAnalysisDto processDetection(Integer type);

    List<QualityQualifiedAnalysisDto> factoryDetection(Integer type);
    QualityQualifiedAnalysisDto factoryDetection(Integer type);

    QualityInspectionCountDto qualityInspectionCount();


 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java

@@ -1894,21 +1894,21 @@


    @Override
    public List<QualityQualifiedAnalysisDto> rawMaterialDetection(Integer type) {
    public QualityQualifiedAnalysisDto rawMaterialDetection(Integer type) {
        return commonDetection(type, 0);
    }

    @Override
    public List<QualityQualifiedAnalysisDto> processDetection(Integer type) {
    public QualityQualifiedAnalysisDto processDetection(Integer type) {
        return commonDetection(type, 1);
    }

    @Override
    public List<QualityQualifiedAnalysisDto> factoryDetection(Integer type) {
    public QualityQualifiedAnalysisDto factoryDetection(Integer type) {
        return commonDetection(type, 2);
    }

    private List<QualityQualifiedAnalysisDto> commonDetection(Integer type, Integer inspectType) {
    private QualityQualifiedAnalysisDto commonDetection(Integer type, Integer inspectType) {

        LocalDate[] range = calcDateRange(type);
        LocalDate startDate = range[0];
@@ -1958,7 +1958,7 @@
        return new LocalDate[]{startDate, endDate};
    }

    private List<QualityQualifiedAnalysisDto> buildQualifiedAnalysis(List<QualityInspect> list) {
    private QualityQualifiedAnalysisDto buildQualifiedAnalysis(List<QualityInspect> list) {
        List<QualityQualifiedAnalysisDto> result = new ArrayList<>();
        QualityQualifiedAnalysisDto dto = new QualityQualifiedAnalysisDto();

@@ -1967,8 +1967,7 @@
            dto.setUnqualifiedCount(0);
            dto.setQualifiedRate(BigDecimal.ZERO.setScale(2));
            dto.setUnqualifiedRate(BigDecimal.ZERO.setScale(2));
            result.add(dto);
            return result;
            return dto;
        }

        BigDecimal qualifiedCount = BigDecimal.ZERO;
@@ -1990,8 +1989,7 @@
        if (totalCount.compareTo(BigDecimal.ZERO) == 0) {
            dto.setQualifiedRate(BigDecimal.ZERO.setScale(2));
            dto.setUnqualifiedRate(BigDecimal.ZERO.setScale(2));
            result.add(dto);
            return result;
            return dto;
        }

        BigDecimal hundred = BigDecimal.valueOf(100);
@@ -2004,8 +2002,7 @@
                .multiply(hundred)
                .setScale(2, RoundingMode.HALF_UP));

        result.add(dto);
        return result;
        return dto;
    }

    @Override
@@ -2173,7 +2170,8 @@
            // 组装明细
            NonComplianceWarningDto.Item child = new NonComplianceWarningDto.Item();
            // child.setProductTitle(item.getProductName());
            child.setProductTitle(parent.getProductName());
            child.setParentProductTitle(parent.getProductName());
            child.setProductTitle(item.getProductName());
            child.setDescription(item.getDefectivePhenomena());
            child.setDate(formatDate(item.getCheckTime()));
            children.add(child);