Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

7 天以前 04dce61c02c10832665cdaf1aabf5b7e9b31da47

Merge remote-tracking branch 'origin/dev_New' into dev_New

 src/main/java/com/ruoyi/common/enums/StaffLeaveReason.java

@@ -25,4 +25,18 @@
    public String getInfo() {
        return info;
    }

    /**
     * æ ¹æ®code获取枚举实例
     * @param code ç¦»èŒåŽŸå› ç¼–码
     * @return å¯¹åº”的枚举实例，若未找到则返回null
     */
    public static StaffLeaveReason getByCode(String code) {
        for (StaffLeaveReason reason : StaffLeaveReason.values()) {
            if (reason.getCode().equals(code)) {
                return reason;
            }
        }
        return null;
    }
}

 src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.pojo.ProductionProductMain;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,11 @@
     * æ ¹æ®å·¥å•ID批量删除生产主表数据
     */
    int deleteByWorkOrderIds(@Param("workOrderIds") List<Long> workOrderIds);

    /**
     * æ ¹æ®æŠ¥å·¥id查询生产订单
     * @param productMainId
     * @return
     */
    ProductOrder getOrderByMainId(@Param("productMainId") Long productMainId);
}

 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java

@@ -75,6 +75,7 @@

    private QualityTestStandardParamMapper qualityTestStandardParamMapper;
    private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
    private QualityTestStandardMapper qualityTestStandardMapper;

    private QualityInspectParamMapper qualityInspectParamMapper;

@@ -189,12 +190,15 @@
        productionProductOutput.setProductModelId(productProcessRouteItem.getProductModelId());
        productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
        productionProductOutputMapper.insert(productionProductOutput);
        /*新增质检*/
        //对应的过程检或者出厂检
        List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().eq(ProductProcessRouteItem::getProductRouteId, productProcessRouteItem.getProductRouteId()));
        int inspectType = 1;
        String process = productProcess.getName();//工序
        if (productProcessRouteItem.getDragSort()==productProcessRouteItems.size()){
            //最后一道工序生成出厂检
            inspectType = 2;
            process = null;
        }
        Product product = productMapper.selectById(productModel.getProductId());
        QualityInspect qualityInspect = new QualityInspect();
@@ -209,12 +213,12 @@
        qualityInspect.setProductMainId(productionProductMain.getId());
        qualityInspect.setProductModelId(productModel.getId());
        qualityInspectMapper.insert(qualityInspect);
        List<QualityTestStandardBinding> qualityTestStandardBindings = qualityTestStandardBindingMapper.selectList(
                new LambdaQueryWrapper<QualityTestStandardBinding>()
                        .eq(QualityTestStandardBinding::getProductId, product.getId()));
        if (qualityTestStandardBindings.size()>0){
        List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType,process);
        if (qualityTestStandard.size()>0){
            qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
            qualityInspectMapper.updateById(qualityInspect);
            qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
                    .eq(QualityTestStandardParam::getTestStandardId,qualityTestStandardBindings.get(0).getTestStandardId()))
                    .eq(QualityTestStandardParam::getTestStandardId,qualityTestStandard.get(0).getId()))//默认获取最新的
                    .forEach(qualityTestStandardParam -> {
                QualityInspectParam param = new QualityInspectParam();
                BeanUtils.copyProperties(qualityTestStandardParam, param);

 src/main/java/com/ruoyi/project/system/domain/SysDept.java

@@ -55,6 +55,9 @@
    /** éƒ¨é—¨ç¼–号 */

    private String deptNick;

    

    /** å‘˜å·¥æ•°é‡ */

    private Integer staffCount;

    
    /** å­éƒ¨é—¨ */

    private List<SysDept> children = new ArrayList<SysDept>();



@@ -192,6 +195,14 @@
        this.deptNick = deptNick;

    }



    public Integer getStaffCount() {

        return staffCount;

    }



    public void setStaffCount(Integer staffCount) {

        this.staffCount = staffCount;

    }



    @Override

    public String toString() {

        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@@ -199,6 +210,7 @@
            .append("parentId", getParentId())

            .append("ancestors", getAncestors())

            .append("deptName", getDeptName())

            .append("staffCount", getStaffCount())

            .append("orderNum", getOrderNum())

            .append("leader", getLeader())

            .append("phone", getPhone())


 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java

@@ -108,6 +108,7 @@
    private final QualityInspectMapper qualityInspectMapper;
    private final QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
    private final QualityTestStandardParamMapper qualityTestStandardParamMapper;
    private final QualityTestStandardMapper qualityTestStandardMapper;
    private final QualityInspectParamMapper qualityInspectParamMapper;

    private final ProcurementRecordMapper procurementRecordStorageMapper;
@@ -229,12 +230,12 @@
        qualityInspect.setUnit(saleProduct.getUnit());
        qualityInspect.setQuantity(saleProduct.getQuantity());
        qualityInspectMapper.insert(qualityInspect);
        List<QualityTestStandardBinding> qualityTestStandardBindings = qualityTestStandardBindingMapper.selectList(
                new LambdaQueryWrapper<QualityTestStandardBinding>()
                        .eq(QualityTestStandardBinding::getProductId, saleProduct.getProductId()));
        if (qualityTestStandardBindings.size()>0){
        List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(saleProduct.getProductId(), 0,null);
        if (qualityTestStandard.size()>0){
            qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
            qualityInspectMapper.updateById(qualityInspect);
            qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
                    .eq(QualityTestStandardParam::getTestStandardId,qualityTestStandardBindings.get(0).getTestStandardId()))
                    .eq(QualityTestStandardParam::getTestStandardId,qualityTestStandard.get(0).getId()))
                    .forEach(qualityTestStandardParam -> {
                        QualityInspectParam param = new QualityInspectParam();
                        com.ruoyi.common.utils.bean.BeanUtils.copyProperties(qualityTestStandardParam, param);

 src/main/java/com/ruoyi/quality/controller/QualityReportController.java

@@ -1,15 +1,12 @@
package com.ruoyi.quality.controller;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityReportService;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
@@ -19,6 +16,7 @@
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-01-14 03:39:49
 */
@Api(tags = "质量管理")
@RestController
@RequestMapping("/qualityReport")
public class QualityReportController {
@@ -26,6 +24,58 @@
    @Autowired
    private QualityReportService qualityReportService;

    /**
     * èŽ·å–检验统计数据
     */
    @ApiOperation("获取检验统计数据")
    @GetMapping("/getInspectStatistics")
    public AjaxResult getInspectStatistics() {
        return AjaxResult.success(qualityReportService.getInspectStatistics());
    }

    /**
     * èŽ·å–合格率统计数据
     */
    @ApiOperation("获取合格率统计数据")
    @GetMapping("/getPassRateStatistics")
    public AjaxResult getPassRateStatistics() {
        return AjaxResult.success(qualityReportService.getPassRateStatistics());
    }

    /**
     * èŽ·å–月度合格率统计数据
     */
    @ApiOperation("获取月度合格率统计数据")
    @GetMapping("/getMonthlyPassRateStatistics")
    public AjaxResult getMonthlyPassRateStatistics(@RequestParam("year") String year) {
        return AjaxResult.success(qualityReportService.getMonthlyPassRateStatistics(year));
    }

    /**
     * èŽ·å–年度总合格率统计数据
     */
    @ApiOperation("获取年度总合格率统计数据")
    @GetMapping("/getYearlyPassRateStatistics")
    public AjaxResult getYearlyPassRateStatistics(@RequestParam("year") String year) {
        return AjaxResult.success(qualityReportService.getYearlyPassRateStatistics(year));
    }

    /**
     * èŽ·å–月度完成明细数据
     */
    @ApiOperation("获取月度完成明细数据")
    @GetMapping("/getMonthlyCompletionDetails")
    public AjaxResult getMonthlyCompletionDetails(@RequestParam("year") String year) {
        return AjaxResult.success(qualityReportService.getMonthlyCompletionDetails(year));
    }

    /**
     * èŽ·å–热点检测指标统计
     */
    @ApiOperation("获取热点检测指标统计")
    @GetMapping("/getTopParameters")
    public AjaxResult getTopParameters(@RequestParam("inspectType") Integer inspectType) {
        return AjaxResult.success(qualityReportService.getTopParameters(inspectType));
    }

}

 src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java

@@ -86,5 +86,15 @@
        qualityUnqualifiedService.qualityUnqualifiedExport(response, qualityUnqualified);
    }

    /**
     * ä¸åˆæ ¼ç®¡ç†å¤„理
     * @param qualityUnqualified
     * @return
     */
    @PostMapping("/deal")
    public AjaxResult deal(@RequestBody QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.deal(qualityUnqualified));
    }


}

 src/main/java/com/ruoyi/quality/dto/QualityInspectStatDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.quality.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.io.Serializable;

@Data
@ApiModel(value = "QualityInspectStatDto", description = "质量检验统计DTO")
public class QualityInspectStatDto implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "类别(0:原材料检验;1:过程检验;2:出厂检验)")
    private Integer inspectType;

    @ApiModelProperty(value = "总数量")
    private BigDecimal totalCount;

    @ApiModelProperty(value = "已完成数量")
    private BigDecimal completedCount;
}

 src/main/java/com/ruoyi/quality/dto/QualityMonthlyDetailDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
package com.ruoyi.quality.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * è´¨é‡æœˆåº¦å®Œæˆæ˜Žç»†DTO
 */
@Data
@ApiModel(value = "QualityMonthlyDetailDto", description = "质量月度完成明细DTO")
public class QualityMonthlyDetailDto implements Serializable {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "月份")
    private String month;

    @ApiModelProperty(value = "原材料检验完成数")
    private BigDecimal rawMaterialCount;

    @ApiModelProperty(value = "过程检验完成数")
    private BigDecimal processCount;

    @ApiModelProperty(value = "出厂检验完成数")
    private BigDecimal outgoingCount;
}

 src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.ruoyi.quality.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * è´¨é‡æœˆåº¦åˆæ ¼çŽ‡ç»Ÿè®¡DTO
 */
@Data
@ApiModel(value = "QualityMonthlyPassRateDto", description = "质量月度合格率统计DTO")
public class QualityMonthlyPassRateDto implements Serializable {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "月份(一月, äºŒæœˆ...)")
    private String month;

    @ApiModelProperty(value = "类别(0:原材料检验;1:过程检验;2:出厂检验)")
    private Integer inspectType;

    @ApiModelProperty(value = "总数量")
    private BigDecimal totalCount;

    @ApiModelProperty(value = "已完成数量")
    private BigDecimal completedCount;

    @ApiModelProperty(value = "合格数量")
    private BigDecimal qualifiedCount;

    @ApiModelProperty(value = "不合格数量")
    private BigDecimal unqualifiedCount;

    @ApiModelProperty(value = "完成占比")
    private BigDecimal completionRate;

    @ApiModelProperty(value = "合格率占比")
    private BigDecimal passRate;
}

 src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateWrapperDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ruoyi.quality.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

/**
 * è´¨é‡æœˆåº¦åˆæ ¼çŽ‡åŒ…装DTO（按月分组）
 */
@Data
@ApiModel(value = "QualityMonthlyPassRateWrapperDto", description = "质量月度合格率包装DTO（按月分组）")
public class QualityMonthlyPassRateWrapperDto implements Serializable {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "月份")
    private String month;

    @ApiModelProperty(value = "原材料检验数据")
    private QualityPassRateDto rawMaterial;

    @ApiModelProperty(value = "过程检验数据")
    private QualityPassRateDto process;

    @ApiModelProperty(value = "出厂检验数据")
    private QualityPassRateDto outgoing;
}

 src/main/java/com/ruoyi/quality/dto/QualityParameterStatDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.ruoyi.quality.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * æ£€éªŒæŒ‡æ ‡ç»Ÿè®¡DTO
 */
@Data
@ApiModel(value = "QualityParameterStatDto", description = "检验指标统计DTO")
public class QualityParameterStatDto implements Serializable {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "指标名称")
    private String name;

    @ApiModelProperty(value = "数量")
    private BigDecimal count;

    @ApiModelProperty(value = "百分比")
    private BigDecimal percentage;
}

 src/main/java/com/ruoyi/quality/dto/QualityPassRateDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package com.ruoyi.quality.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * è´¨é‡åˆæ ¼çŽ‡ç»Ÿè®¡DTO
 */
@Data
@ApiModel(value = "QualityPassRateDto", description = "质量合格率统计DTO")
public class QualityPassRateDto implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "类别(0:原材料检验;1:过程检验;2:出厂检验)")
    private Integer inspectType;

    @ApiModelProperty(value = "总数量")
    private BigDecimal totalCount;

    @ApiModelProperty(value = "已完成数量")
    private BigDecimal completedCount;

    @ApiModelProperty(value = "合格数量")
    private BigDecimal qualifiedCount;

    @ApiModelProperty(value = "不合格数量")
    private BigDecimal unqualifiedCount;

    @ApiModelProperty(value = "完成占比")
    private BigDecimal completionRate;

    @ApiModelProperty(value = "合格率占比")
    private BigDecimal passRate;
}

 src/main/java/com/ruoyi/quality/dto/QualityTopParameterDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.quality.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;

/**
 * è´¨æ£€çƒ­ç‚¹æŒ‡æ ‡ç»Ÿè®¡ç»“æžœDTO (单类型)
 */
@Data
@ApiModel(value = "QualityTopParameterDto", description = "质检热点指标统计结果DTO (单类型)")
public class QualityTopParameterDto implements Serializable {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "总检测项次数量")
    private BigDecimal totalCount;

    @ApiModelProperty(value = "指标统计列表 (Top 4 + å…¶ä»–)")
    private List<QualityParameterStatDto> list;
}

 src/main/java/com/ruoyi/quality/mapper/QualityInspectMapper.java

@@ -4,9 +4,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityTestStandard;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import com.ruoyi.quality.dto.QualityInspectStatDto;
import com.ruoyi.quality.dto.QualityPassRateDto;
import com.ruoyi.quality.dto.QualityMonthlyPassRateDto;
import com.ruoyi.quality.dto.QualityMonthlyDetailDto;
import com.ruoyi.quality.dto.QualityParameterStatDto;

import java.util.List;

@@ -22,4 +27,34 @@
     * æ ¹æ®ç”Ÿäº§ä¸»è¡¨ID批量删除过程检验
     */
    int deleteByProductMainIds(@Param("productMainIds") List<Long> productMainIds);

    /**
     * èŽ·å–检验统计数据
     */
    List<QualityInspectStatDto> getInspectStatistics();

    /**
     * èŽ·å–合格率统计数据
     */
    List<QualityPassRateDto> getPassRateStatistics();

    /**
     * èŽ·å–月度合格率统计数据
     */
    List<QualityMonthlyPassRateDto> getMonthlyPassRateStatistics(@Param("year") String year);

    /**
     * èŽ·å–年度合格率统计数据
     */
    List<QualityPassRateDto> getYearlyPassRateStatistics(@Param("year") String year);

    /**
     * èŽ·å–月度完成明细数据
     */
    List<QualityMonthlyDetailDto> getMonthlyCompletionDetails(@Param("year") String year);

    /**
     * èŽ·å–热点检测指标 Top 4 + å…¶ä»–
     */
    List<QualityParameterStatDto> getTopParameters(@Param("inspectType") Integer inspectType);
}

 src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java

@@ -133,5 +133,6 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;


    @ApiModelProperty("关联检测id")
    private Long inspectId;
}

 src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java

@@ -14,4 +14,7 @@
    IPage<QualityUnqualified> qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified);

    void qualityUnqualifiedExport(HttpServletResponse response, QualityUnqualified qualityUnqualified);

    int deal(QualityUnqualified qualityUnqualified);

}

 src/main/java/com/ruoyi/quality/service/QualityReportService.java

@@ -1,7 +1,13 @@
package com.ruoyi.quality.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.dto.QualityInspectStatDto;
import com.ruoyi.quality.dto.QualityPassRateDto;
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 java.util.List;

/**
 * <p>
@@ -13,4 +19,15 @@
 */
public interface QualityReportService  {

    List<QualityInspectStatDto> getInspectStatistics();

    List<QualityPassRateDto> getPassRateStatistics();

    List<QualityMonthlyPassRateWrapperDto> getMonthlyPassRateStatistics(String year);

    List<QualityPassRateDto> getYearlyPassRateStatistics(String year);

    List<QualityMonthlyDetailDto> getMonthlyCompletionDetails(String year);

    QualityTopParameterDto getTopParameters(Integer inspectType);
}

 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java

@@ -96,6 +96,7 @@
            List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
            String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
            qualityUnqualified.setDefectivePhenomena(text+"这些指标中存在不合格");//不合格现象
            qualityUnqualified.setInspectId(qualityInspect.getId());
            qualityUnqualifiedMapper.insert(qualityUnqualified);
        }

@@ -158,6 +159,9 @@

        }else if (qualityInspect.getInspectType() == 2) {
            //查询UnitPrice/TotalPrice
            if (ObjectUtils.isNull(qualityInspect.getProductMainId())){
                //如果是手动新增的出厂检
            }else {
            SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectSalesLedgerProductByMainId(qualityInspect.getProductMainId());
            ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
            procurementRecordOutAdd.setType(2);
@@ -175,6 +179,7 @@
            procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
            procurementRecordService.add(procurementRecordOutAdd);
        }
        }
        qualityInspect.setInspectState(1);//已提交
        return qualityInspectMapper.updateById(qualityInspect);
    }

 src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java

@@ -1,9 +1,109 @@
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.mapper.QualityInspectMapper;
import com.ruoyi.quality.service.QualityReportService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;


@Service
public class QualityReportServiceImpl implements QualityReportService {

    @Autowired
    private QualityInspectMapper qualityInspectMapper;

    @Override
    public List<QualityInspectStatDto> getInspectStatistics() {
        return qualityInspectMapper.getInspectStatistics();
    }

    @Override
    public List<QualityPassRateDto> getPassRateStatistics() {
        return qualityInspectMapper.getPassRateStatistics();
    }

    @Override
    public List<QualityMonthlyPassRateWrapperDto> getMonthlyPassRateStatistics(String year) {
        if (StringUtils.isEmpty(year)) {
            return new ArrayList<>();
        }
        List<QualityMonthlyPassRateDto> flatData = qualityInspectMapper.getMonthlyPassRateStatistics(year);

        // æŒ‰æœˆä»½åˆ†ç»„，并保持顺序
        Map<String, List<QualityMonthlyPassRateDto>> groupedByMonth = flatData.stream()
                .collect(Collectors.groupingBy(QualityMonthlyPassRateDto::getMonth, LinkedHashMap::new, Collectors.toList()));

        List<QualityMonthlyPassRateWrapperDto> result = new ArrayList<>();

        groupedByMonth.forEach((month, dtos) -> {
            QualityMonthlyPassRateWrapperDto wrapper = new QualityMonthlyPassRateWrapperDto();
            wrapper.setMonth(month);

            for (QualityMonthlyPassRateDto dto : dtos) {
                QualityPassRateDto passRateDto = new QualityPassRateDto();
                BeanUtils.copyProperties(dto, passRateDto);

                if (dto.getInspectType() == 0) {
                    wrapper.setRawMaterial(passRateDto);
                } else if (dto.getInspectType() == 1) {
                    wrapper.setProcess(passRateDto);
                } else if (dto.getInspectType() == 2) {
                    wrapper.setOutgoing(passRateDto);
                }
            }
            result.add(wrapper);
        });

        return result;
    }

    @Override
    public List<QualityPassRateDto> getYearlyPassRateStatistics(String year) {
        if (StringUtils.isEmpty(year)) {
            return new ArrayList<>();
        }
        return qualityInspectMapper.getYearlyPassRateStatistics(year);
    }

    @Override
    public List<QualityMonthlyDetailDto> getMonthlyCompletionDetails(String year) {
        if (StringUtils.isEmpty(year)) {
            return new ArrayList<>();
        }
        return qualityInspectMapper.getMonthlyCompletionDetails(year);
    }

    @Override
    public QualityTopParameterDto getTopParameters(Integer inspectType) {
        if (inspectType == null) {
            return new QualityTopParameterDto();
        }
        List<QualityParameterStatDto> list = qualityInspectMapper.getTopParameters(inspectType);

        BigDecimal total = list.stream()
                .map(QualityParameterStatDto::getCount)
                .reduce(BigDecimal.ZERO, BigDecimal::add);

        QualityTopParameterDto result = new QualityTopParameterDto();
        result.setTotalCount(total);
        result.setList(list);

        return result;
    }
}

 src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java

@@ -1,10 +1,20 @@
package com.ruoyi.quality.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.production.mapper.ProductProcessRouteItemMapper;
import com.ruoyi.production.mapper.ProductProcessRouteMapper;
import com.ruoyi.production.mapper.ProductWorkOrderMapper;
import com.ruoyi.production.mapper.ProductionProductMainMapper;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;
import com.ruoyi.quality.pojo.QualityInspect;
@@ -16,6 +26,9 @@
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;

@AllArgsConstructor
@@ -23,6 +36,13 @@
public class QualityUnqualifiedServiceImpl extends ServiceImpl<QualityUnqualifiedMapper, QualityUnqualified>  implements IQualityUnqualifiedService {

    private QualityUnqualifiedMapper qualityUnqualifiedMapper;
    private IQualityInspectService qualityInspectService;
    private ProductOrderService productOrderService;
    private ProductionProductMainMapper productionProductMainMapper;
    private ProductProcessRouteMapper productProcessRouteMapper;
    private ProductProcessRouteItemMapper productProcessRouteItemMapper;
    private ProductWorkOrderMapper productWorkOrderMapper;


    @Override
    public IPage<QualityUnqualified> qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified) {
@@ -35,4 +55,86 @@
        ExcelUtil<QualityUnqualified> util = new ExcelUtil<QualityUnqualified>(QualityUnqualified.class);
        util.exportExcel(response, qualityUnqualifieds, "不合格管理导出");
    }

    @Override
    public int deal(QualityUnqualified qualityUnqualified) {
        QualityUnqualified unqualified = qualityUnqualifiedMapper.selectById(qualityUnqualified.getId());
        QualityInspect qualityInspect = qualityInspectService.getById(unqualified.getInspectId());
        switch (qualityUnqualified.getDealResult()) {
            case "返修":
            case "返工":
                //判断质检表是否有相关的报工id,如果有报工id,那么返工需要重新创建生产订单重新生产
                if (ObjectUtils.isNotNull(qualityInspect.getProductMainId())){
                    //返工需要重新创建生产订单重新生产
                    ProductOrder productOrder = productionProductMainMapper.getOrderByMainId(qualityInspect.getProductMainId());
                    ProductOrder order = new ProductOrder();
                    BeanUtils.copyProperties(productOrder, order);
                    order.setId(null);
                    order.setQuantity(unqualified.getQuantity());
                    order.setCompleteQuantity(BigDecimal.ZERO);
                    order.setStartTime(null);
                    order.setEndTime(null);
                    productOrderService.save(order);
                    //新增生产订单下的工艺路线主表
                    ProductProcessRoute productProcessRoute = productProcessRouteMapper.selectList(Wrappers.<ProductProcessRoute>lambdaQuery().eq(ProductProcessRoute::getProductOrderId,productOrder.getId()).orderByDesc(ProductProcessRoute::getId)).get(0);
                    ProductProcessRoute newProcessRoute = new ProductProcessRoute();
                    BeanUtils.copyProperties(productProcessRoute, newProcessRoute);
                    newProcessRoute.setId(null);
                    newProcessRoute.setProductOrderId(order.getId());
                    productProcessRouteMapper.insert(newProcessRoute);
                    //新增生产订单下的工艺路线子表
                    List<ProductProcessRouteItem> processRouteItems = productProcessRouteItemMapper.selectList(new QueryWrapper<ProductProcessRouteItem>().lambda().eq(ProductProcessRouteItem::getProductRouteId, productProcessRoute.getId()));
                    // ç”Ÿæˆå½“前日期的前缀：年月日
                    String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
                    for (ProductProcessRouteItem processRouteItem : processRouteItems) {
                        ProductProcessRouteItem productProcessRouteItem = new ProductProcessRouteItem();
                        BeanUtils.copyProperties(processRouteItem, productProcessRouteItem);
                        productProcessRouteItem.setId(null);
                        productProcessRouteItem.setProductRouteId(newProcessRoute.getId());
                        int insert = productProcessRouteItemMapper.insert(productProcessRouteItem);
                        if (insert > 0) {
                            // æŸ¥è¯¢ä»Šæ—¥å·²å­˜åœ¨çš„最大工单号
                            QueryWrapper<ProductWorkOrder> queryWrapper = new QueryWrapper<>();
                            queryWrapper.likeRight("work_order_no", datePrefix)
                                    .orderByDesc("work_order_no")
                                    .last("LIMIT 1");
                            ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectOne(queryWrapper);
                            int sequenceNumber = 1; // é»˜è®¤åºå·
                            if (lastWorkOrder != null && lastWorkOrder.getWorkOrderNo() != null) {
                                String lastNo = lastWorkOrder.getWorkOrderNo().toString();
                                if (lastNo.startsWith(datePrefix)) {
                                    String seqStr = lastNo.substring(datePrefix.length());
                                    try {
                                        sequenceNumber = Integer.parseInt(seqStr) + 1;
                                    } catch (NumberFormatException e) {
                                        sequenceNumber = 1;
                                    }
                                }
                            }
                            // ç”Ÿæˆå®Œæ•´çš„工单号
                            String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
                            ProductWorkOrder productWorkOrder = new ProductWorkOrder();
                            productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
                            productWorkOrder.setProductOrderId(order.getId());
                            productWorkOrder.setPlanQuantity(order.getQuantity());
                            productWorkOrder.setWorkOrderNo(workOrderNoStr);
                            productWorkOrder.setStatus(1);
                            productWorkOrderMapper.insert(productWorkOrder);
                        }
                    }
                }
                break;
            case "报废":
                break;
            case "让步放行":
                //调用提交合格的接口
                qualityInspect.setCheckResult("合格");
                qualityInspectService.submit(qualityInspect);
                break;
            default:
                break;
        }
        qualityUnqualified.setInspectState(1);//已处理
        return qualityUnqualifiedMapper.updateById(qualityUnqualified);
    }
}

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java

@@ -146,45 +146,7 @@
        // 2. æ‰§è¡Œåˆ é™¤æ“ä½œ
        int result = salesLedgerProductMapper.deleteBatchIds(Arrays.asList(ids));
        //删除对应的生产订单
        //批量查询productOrder
        List<ProductOrder> productOrders = productOrderMapper.selectList(
                new LambdaQueryWrapper<ProductOrder>()
                        .in(ProductOrder::getProductModelId, ids)
        );

        if (!CollectionUtils.isEmpty(productOrders)) {
            List<Long> orderIds = productOrders.stream()
                    .map(ProductOrder::getId)
                    .collect(Collectors.toList());

            // æ‰¹é‡æŸ¥è¯¢processRouteItems
            List<ProductProcessRouteItem> allRouteItems = productProcessRouteItemMapper.selectList(
                    new LambdaQueryWrapper<ProductProcessRouteItem>()
                            .in(ProductProcessRouteItem::getProductOrderId, orderIds)
            );

            if (!CollectionUtils.isEmpty(allRouteItems)) {
                List<Long> routeItemIds = allRouteItems.stream()
                        .map(ProductProcessRouteItem::getId)
                        .collect(Collectors.toList());

                // æ‰¹é‡åˆ é™¤workOrder
                productWorkOrderMapper.delete(new LambdaQueryWrapper<ProductWorkOrder>()
                                .in(ProductWorkOrder::getProductProcessRouteItemId, routeItemIds));
            }

            // æ‰¹é‡åˆ é™¤productProcessRouteItem
            productProcessRouteItemMapper.delete(new LambdaQueryWrapper<ProductProcessRouteItem>()
                            .in(ProductProcessRouteItem::getProductOrderId, orderIds));

            // æ‰¹é‡åˆ é™¤productProcessRoute
            productProcessRouteMapper.delete(new LambdaQueryWrapper<ProductProcessRoute>()
                    .in(ProductProcessRoute::getProductOrderId, orderIds));

            // æ‰¹é‡åˆ é™¤productOrder
            productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
                    .in(ProductOrder::getProductModelId, ids));
        }
        deleteProductionData(Arrays.asList(ids));

        // 3. å¯¹æ¯ä¸ªä¸»è¡¨ID进行金额更新
        for (Long salesLedgerId : mainIds) {

 src/main/java/com/ruoyi/staff/controller/AnalyticsController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.ruoyi.staff.controller;

import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.service.AnalyticsService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

@RestController
@RequestMapping("/staff/analytics")
public class AnalyticsController {

    @Resource
    private AnalyticsService analyticsService;

    @GetMapping("/reason")
    public AjaxResult staffLeaveReasonAnalytics() {
        return AjaxResult.success(analyticsService.staffLeaveReasonAnalytics());
    }

    @GetMapping("/monthly_turnover_rate")
    public AjaxResult getMonthlyTurnoverRateFor12Months() {
        return AjaxResult.success(analyticsService.getMonthlyTurnoverRateFor12Months());
    }

    @GetMapping("/total_statistic")
    public AjaxResult getTotalStatistic() {
        return AjaxResult.success(analyticsService.getTotalStatistic());
    }
}

 src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java

@@ -1,11 +1,8 @@
package com.ruoyi.staff.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.staff.pojo.StaffLeave;
import lombok.Data;

import java.util.Date;

@Data
public class StaffLeaveDto extends StaffLeave {
@@ -95,4 +92,11 @@
     */
    @Excel(name = "紧急联系人电话", sort = 15)
    private String emergencyContactPhone;

    private int count;

    /**
     * ç¦»èŒåŽŸå› æ–‡æœ¬
     */
    private String reasonText;
}

 src/main/java/com/ruoyi/staff/mapper/StaffLeaveMapper.java

@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.time.LocalDate;
import java.util.List;


@@ -18,4 +19,8 @@
    IPage<StaffLeaveDto> staffLeaveListPage(Page page, @Param("c") StaffLeaveDto staffLeaveDto);

    List<StaffLeaveDto> staffLeaveList(@Param("c") StaffLeaveDto staffLeaveDto);

    List<StaffLeaveDto> staffLeaveReasonAnalytics();

    Integer countLeaveByMonth(@Param("monthStart") LocalDate monthStart, @Param("monthEnd") LocalDate monthEnd);
}

 src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java

@@ -8,6 +8,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.time.LocalDate;
import java.util.List;

@Mapper
@@ -16,4 +17,19 @@
    IPage<StaffOnJobDto> staffOnJobListPage(Page page, @Param("staffOnJob") StaffOnJob staffOnJob);

    List<StaffOnJobDto> staffOnJobList(@Param("staffOnJob") StaffOnJob staffOnJob);

    /**
     * ç»Ÿè®¡æŒ‡å®šæ—¥æœŸçš„在职员工数
     * @param date æ—¥æœŸ
     * @return åœ¨èŒå‘˜å·¥æ•°
     */
    Integer countOnJobStaffByDate(@Param("date") LocalDate date);

    /**
     * ç»Ÿè®¡æŒ‡å®šæœˆä»½çš„新入职员工数
     * @param monthStart æœˆä»½å¼€å§‹æ—¥æœŸ
     * @param monthEnd æœˆä»½ç»“束日期
     * @return æ–°å…¥èŒå‘˜å·¥æ•°
     */
    Integer countNewHireByMonth(@Param("monthStart") LocalDate monthStart, @Param("monthEnd") LocalDate monthEnd);
}

 src/main/java/com/ruoyi/staff/service/AnalyticsService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.staff.service;

import com.ruoyi.staff.dto.StaffLeaveDto;
import com.ruoyi.staff.vo.MonthlyTurnoverRateVo;
import com.ruoyi.staff.vo.TotalTurnoverRateVo;

import java.util.List;

public interface AnalyticsService {

    List<StaffLeaveDto> staffLeaveReasonAnalytics();

    List<MonthlyTurnoverRateVo> getMonthlyTurnoverRateFor12Months();

    /**
     * æŸ¥è¯¢æ€»æµåŠ¨çŽ‡ã€æµå¤±çŽ‡ä»¥åŠåœ¨èŒå‘˜å·¥æ•°
     * @return æ€»ç»Ÿè®¡ç»“æžœ
     */
    TotalTurnoverRateVo getTotalStatistic();
}

 src/main/java/com/ruoyi/staff/service/impl/AnalyticsServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,145 @@
package com.ruoyi.staff.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.enums.StaffLeaveReason;
import com.ruoyi.staff.dto.StaffLeaveDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffLeave;
import com.ruoyi.staff.service.AnalyticsService;
import com.ruoyi.staff.vo.MonthlyTurnoverRateVo;
import com.ruoyi.staff.vo.TotalTurnoverRateVo;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;

@AllArgsConstructor
@Service
public class AnalyticsServiceImpl extends ServiceImpl<StaffLeaveMapper, StaffLeave> implements AnalyticsService {
    @Autowired
    private StaffLeaveMapper staffLeaveMapper;

    @Autowired
    private StaffOnJobMapper staffOnJobMapper;

    @Override
    public List<StaffLeaveDto> staffLeaveReasonAnalytics() {
        List<StaffLeaveDto> result = staffLeaveMapper.staffLeaveReasonAnalytics();
        result.forEach(dto -> {
            String reasonCode = dto.getReason();
            StaffLeaveReason reasonEnum = StaffLeaveReason.getByCode(reasonCode);
            if (reasonEnum != null) {
                dto.setReasonText(reasonEnum.getInfo());
            } else {
                dto.setReasonText("未知原因");
            }
        });
        return result;
    }

    @Override
    public List<MonthlyTurnoverRateVo> getMonthlyTurnoverRateFor12Months() {
        List<MonthlyTurnoverRateVo> result = new ArrayList<>();
        LocalDate now = LocalDate.now();
        DateTimeFormatter monthFormatter = DateTimeFormatter.ofPattern("yyyy-MM");

        // è®¡ç®—è¿‘12个月的数据
        for (int i = 11; i >= 0; i--) {
            LocalDate currentMonth = now.minusMonths(i);
            LocalDate monthStart = currentMonth.withDayOfMonth(1);
            LocalDate monthEnd = currentMonth.withDayOfMonth(currentMonth.lengthOfMonth());

            MonthlyTurnoverRateVo vo = new MonthlyTurnoverRateVo();
            vo.setMonth(currentMonth.format(monthFormatter));
            vo.setMonthStartDate(monthStart);
            vo.setMonthEndDate(monthEnd);

            // æœˆåˆå‘˜å·¥æ•°ï¼ˆä¸Šæœˆæœ«åœ¨èŒå‘˜å·¥æ•°ï¼‰
            LocalDate lastMonthEnd = monthStart.minusDays(1);
            Integer beginMonthStaffCount = staffOnJobMapper.countOnJobStaffByDate(lastMonthEnd);
            vo.setBeginMonthStaffCount(beginMonthStaffCount != null ? beginMonthStaffCount : 0);

            // æœˆæœ«å‘˜å·¥æ•°
            Integer endMonthStaffCount = staffOnJobMapper.countOnJobStaffByDate(monthEnd);
            vo.setEndMonthStaffCount(endMonthStaffCount != null ? endMonthStaffCount : 0);

            // æœˆåº¦å…¥èŒå‘˜å·¥æ•°
            Integer newHireCount = staffOnJobMapper.countNewHireByMonth(monthStart, monthEnd);
            vo.setNewHireCount(newHireCount != null ? newHireCount : 0);

            // æœˆåº¦ç¦»èŒå‘˜å·¥æ•°
            Integer leaveCount = staffLeaveMapper.countLeaveByMonth(monthStart, monthEnd);
            vo.setLeaveCount(leaveCount != null ? leaveCount : 0);

            // è®¡ç®—流失率：流失率 = æœˆåº¦ç¦»èŒå‘˜å·¥æ•° / æœˆåˆå‘˜å·¥æ•° * 100%
            Double turnoverRate = 0.0;
            if (vo.getBeginMonthStaffCount() > 0) {
                turnoverRate = (double) vo.getLeaveCount() / vo.getBeginMonthStaffCount() * 100;
                // ä¿ç•™ä¸¤ä½å°æ•°
                turnoverRate = Math.round(turnoverRate * 100.0) / 100.0;
            }
            vo.setTurnoverRate(turnoverRate);

            // è®¡ç®—流动率：流动率 = (月度入职员工数 + æœˆåº¦ç¦»èŒå‘˜å·¥æ•°) / æœˆåˆå‘˜å·¥æ•° * 100%
            Double flowRate = 0.0;
            if (vo.getBeginMonthStaffCount() > 0) {
                flowRate = (double) (vo.getNewHireCount() + vo.getLeaveCount()) / vo.getBeginMonthStaffCount() * 100;
                // ä¿ç•™ä¸¤ä½å°æ•°
                flowRate = Math.round(flowRate * 100.0) / 100.0;
            }
            vo.setFlowRate(flowRate);

            result.add(vo);
        }

        return result;
    }

    @Override
    public TotalTurnoverRateVo getTotalStatistic() {
        TotalTurnoverRateVo result = new TotalTurnoverRateVo();
        LocalDate now = LocalDate.now();

        // èŽ·å–当前在职员工数
        Integer currentOnJobCount = staffOnJobMapper.countOnJobStaffByDate(now);
        result.setCurrentOnJobCount(currentOnJobCount);

        // èŽ·å–本月的开始和结束日期
        LocalDate monthStartDate = now.withDayOfMonth(1);
        LocalDate monthEndDate = now.withDayOfMonth(now.lengthOfMonth());

        // èŽ·å–月初员工数（即上月末员工数）
        Integer beginMonthStaffCount = staffOnJobMapper.countOnJobStaffByDate(monthStartDate.minusDays(1));

        // èŽ·å–本月新入职员工数
        Integer newHireCount = staffOnJobMapper.countNewHireByMonth(monthStartDate, monthEndDate);

        // èŽ·å–本月离职员工数
        Integer leaveCount = staffLeaveMapper.countLeaveByMonth(monthStartDate, monthEndDate);

        // è®¡ç®—总流动率 = (入职人数 + ç¦»èŒäººæ•°) / æœˆåˆå‘˜å·¥æ•° * 100%
        Double totalFlowRate = 0.0;
        if (beginMonthStaffCount > 0) {
            totalFlowRate = (double) (newHireCount + leaveCount) / beginMonthStaffCount * 100;
            // ä¿ç•™ä¸¤ä½å°æ•°
            totalFlowRate = Math.round(totalFlowRate * 100.0) / 100.0;
        }
        result.setTotalFlowRate(totalFlowRate);

        // è®¡ç®—总流失率 = ç¦»èŒäººæ•° / æœˆåˆå‘˜å·¥æ•° * 100%
        Double totalTurnoverRate = 0.0;
        if (beginMonthStaffCount > 0) {
            totalTurnoverRate = (double) leaveCount / beginMonthStaffCount * 100;
            // ä¿ç•™ä¸¤ä½å°æ•°
            totalTurnoverRate = Math.round(totalTurnoverRate * 100.0) / 100.0;
        }
        result.setTotalTurnoverRate(totalTurnoverRate);

        return result;
    }
}

 src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java

@@ -11,6 +11,7 @@
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.StaffLeaveService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.staff.pojo.StaffLeave;
import org.springframework.transaction.annotation.Transactional;
@@ -23,8 +24,10 @@
@AllArgsConstructor
@Service
public class StaffLeaveServiceImpl extends ServiceImpl<StaffLeaveMapper, StaffLeave> implements StaffLeaveService {
    @Autowired
    private StaffLeaveMapper staffLeaveMapper;

    @Autowired
    private StaffOnJobMapper staffOnJobMapper;

    //新增离职列表分页查询
@@ -97,6 +100,5 @@
        ExcelUtil<StaffLeaveDto> util = new ExcelUtil<StaffLeaveDto>(StaffLeaveDto.class);
        util.exportExcel(response, staffLeaves, "员工离职导出");
    }

}


 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java

@@ -23,6 +23,7 @@
import lombok.AllArgsConstructor;

import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -39,12 +40,14 @@
@Service
public class StaffOnJobServiceImpl extends ServiceImpl<StaffOnJobMapper, StaffOnJob>  implements IStaffOnJobService {


    @Autowired
    private StaffOnJobMapper staffOnJobMapper;

    @Autowired
    private SysPostMapper sysPostMapper;

    @Autowired
    private StaffContractMapper staffContractMapper;
    @Autowired
    private StaffLeaveMapper staffLeaveMapper;



 src/main/java/com/ruoyi/staff/vo/MonthlyTurnoverRateVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package com.ruoyi.staff.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDate;

/**
 * æœˆåº¦å‘˜å·¥æµåŠ¨çŽ‡å’Œæµå¤±çŽ‡ç»Ÿè®¡VO
 */
@Data
public class MonthlyTurnoverRateVo {
    @ApiModelProperty("月份")
    private String month;

    @ApiModelProperty("月初员工数")
    private Integer beginMonthStaffCount;

    @ApiModelProperty("月末员工数")
    private Integer endMonthStaffCount;

    @ApiModelProperty("月度入职员工数")
    private Integer newHireCount;

    @ApiModelProperty("月度离职员工数")
    private Integer leaveCount;

    @ApiModelProperty("流失率(%)")
    private Double turnoverRate;

    @ApiModelProperty("流动率(%)")
    private Double flowRate;

    @ApiModelProperty("月份开始日期")
    private LocalDate monthStartDate;

    @ApiModelProperty("月份结束日期")
    private LocalDate monthEndDate;
}

 src/main/java/com/ruoyi/staff/vo/TotalTurnoverRateVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.staff.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * å‘˜å·¥æ€»æµåŠ¨çŽ‡ã€æµå¤±çŽ‡åŠåœ¨èŒå‘˜å·¥æ•°ç»Ÿè®¡VO
 */
@Data
public class TotalTurnoverRateVo {
    @ApiModelProperty("总流动率(%)")
    private Double totalFlowRate;

    @ApiModelProperty("总流失率(%)")
    private Double totalTurnoverRate;

    @ApiModelProperty("当前在职员工数")
    private Integer currentOnJobCount;
}

 src/main/resources/mapper/production/ProductionProductMainMapper.xml

@@ -48,6 +48,13 @@
        order by ppm.id

    </select>
    <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
        select po.*
        from product_order po
        left join  product_work_order pwo on po.id = pwo.product_order_id
        left join production_product_main pm on work_order_id=pwo.id
        where pm.id=#{productMainId}
    </select>

    <delete id="deleteByWorkOrderIds" parameterType="java.util.List">
        DELETE FROM production_product_main

 src/main/resources/mapper/quality/QualityInspectMapper.xml

@@ -54,5 +54,293 @@
            #{id}
        </foreach>
    </delete>

    <select id="getInspectStatistics" resultType="com.ruoyi.quality.dto.QualityInspectStatDto">
        SELECT 0                                                                                   AS inspectType,
               COALESCE((SELECT SUM(inbound_num) FROM procurement_record_storage WHERE type = 1), 0) +
               COALESCE((SELECT SUM(quantity) FROM quality_unqualified WHERE inspect_type = 0), 0) AS totalCount,
               COALESCE((SELECT SUM(inbound_num)
                         FROM procurement_record_storage
                         WHERE type = 1
                           AND quality_inspect_id != 0
                           AND quality_inspect_id IS NOT NULL), 0) +
               COALESCE((SELECT SUM(quantity) FROM quality_unqualified WHERE inspect_type = 0), 0) AS completedCount
        UNION ALL
        SELECT 1                                                   AS inspectType,
               COALESCE((SELECT SUM(inbound_num)
                         FROM procurement_record_storage
                         WHERE type = 2
                           AND sales_ledger_product_id = 0), 0)    AS totalCount,
               COALESCE((SELECT SUM(inbound_num)
                         FROM procurement_record_storage
                         WHERE type = 2
                           AND sales_ledger_product_id = 0
                           AND quality_inspect_id != 0
                           AND quality_inspect_id IS NOT NULL), 0) AS completedCount
        UNION ALL
        SELECT 2                                                   AS inspectType,
               COALESCE((SELECT SUM(inbound_num)
                         FROM procurement_record_storage
                         WHERE type = 2
                           AND sales_ledger_product_id != 0), 0)   AS totalCount,
               COALESCE((SELECT SUM(inbound_num)
                         FROM procurement_record_storage
                         WHERE type = 2
                           AND sales_ledger_product_id != 0
                           AND quality_inspect_id != 0
                           AND quality_inspect_id IS NOT NULL), 0) AS completedCount
    </select>

    <select id="getPassRateStatistics" resultType="com.ruoyi.quality.dto.QualityPassRateDto">
        SELECT t.inspectType,
               COALESCE(prs.totalCount, 0)                                            AS totalCount,
               COALESCE(qi.completedCount, 0)                                         AS completedCount,
               COALESCE(qi.qualifiedCount, 0)                                         AS qualifiedCount,
               COALESCE(qi.unqualifiedCount, 0)                                       AS unqualifiedCount,
               IF(COALESCE(prs.totalCount, 0) = 0, 0,
                  ROUND(COALESCE(qi.completedCount, 0) / prs.totalCount * 100, 2))    AS completionRate,
               IF(COALESCE(qi.completedCount, 0) = 0, 0,
                  ROUND(COALESCE(qi.qualifiedCount, 0) / qi.completedCount * 100, 2)) AS passRate
        FROM (SELECT 0 AS inspectType
              UNION ALL
              SELECT 1
              UNION ALL
              SELECT 2) t
                 LEFT JOIN (SELECT inspect_type,
                                   SUM(quantity)                                 AS completedCount,
                                   SUM(IF(check_result = '合格', quantity, 0))   AS qualifiedCount,
                                   SUM(IF(check_result = '不合格', quantity, 0)) AS unqualifiedCount
                            FROM quality_inspect
                            WHERE inspect_state = 1
                            GROUP BY inspect_type) qi
                           ON t.inspectType = qi.inspect_type
                 LEFT JOIN (SELECT 0           AS inspectType,
                                   COALESCE((SELECT SUM(inbound_num) FROM procurement_record_storage WHERE type = 1),
                                            0) +
                                   COALESCE((SELECT SUM(quantity) FROM quality_unqualified WHERE inspect_type = 0),
                                            0) AS totalCount
                            UNION ALL
                            SELECT 1                                                AS inspectType,
                                   COALESCE((SELECT SUM(inbound_num)
                                             FROM procurement_record_storage
                                             WHERE type = 2
                                               AND sales_ledger_product_id = 0), 0) AS totalCount
                            UNION ALL
                            SELECT 2                                                 AS inspectType,
                                   COALESCE((SELECT SUM(inbound_num)
                                             FROM procurement_record_storage
                                             WHERE type = 2
                                               AND sales_ledger_product_id != 0), 0) AS totalCount) prs
                           ON t.inspectType = prs.inspectType
        ORDER BY t.inspectType;
    </select>

    <select id="getMonthlyPassRateStatistics" resultType="com.ruoyi.quality.dto.QualityMonthlyPassRateDto">
        WITH RECURSIVE
            months AS (SELECT 1 AS month_num
                       UNION ALL
                       SELECT month_num + 1
                       FROM months
                       WHERE month_num &lt; 12),
            types AS (SELECT 0 AS inspectType
                      UNION ALL
                      SELECT 1
                      UNION ALL
                      SELECT 2),
            base AS (SELECT m.month_num, t.inspectType
                     FROM months m,
                          types t),
            qi_data AS (SELECT MONTH(check_time)                                               AS month_num,
                               inspect_type,
                               SUM(quantity)                                                   AS completedCount,
                               SUM(CASE WHEN check_result = '合格' THEN quantity ELSE 0 END)   AS qualifiedCount,
                               SUM(CASE WHEN check_result = '不合格' THEN quantity ELSE 0 END) AS unqualifiedCount
                        FROM quality_inspect
                        WHERE YEAR(check_time) = #{year}
                          AND inspect_state = 1
                        GROUP BY MONTH(check_time), inspect_type),
            prs_data AS (SELECT month_num,
                                inspectType,
                                SUM(totalCount) AS totalCount
                         FROM (SELECT MONTH(create_time) AS month_num,
                                      0                  AS inspectType,
                                      inbound_num        AS totalCount
                               FROM procurement_record_storage
                               WHERE type = 1
                                 AND YEAR(create_time) = #{year}
                               UNION ALL
                               SELECT MONTH(check_time) AS month_num,
                                      0                 AS inspectType,
                                      quantity          AS totalCount
                               FROM quality_unqualified
                               WHERE inspect_type = 0
                                 AND YEAR(check_time) = #{year}
                               UNION ALL
                               SELECT MONTH(create_time) AS month_num,
                                      CASE
                                          WHEN sales_ledger_product_id = 0 THEN 1
                                          ELSE 2
                                          END            AS inspectType,
                                      inbound_num        AS totalCount
                               FROM procurement_record_storage
                               WHERE type = 2
                                 AND YEAR(create_time) = #{year}) sub
                         GROUP BY month_num, inspectType)
        SELECT CASE b.month_num
                   WHEN 1 THEN '一月'
                   WHEN 2 THEN '二月'
                   WHEN 3 THEN '三月'
                   WHEN 4 THEN '四月'
                   WHEN 5 THEN '五月'
                   WHEN 6 THEN '六月'
                   WHEN 7 THEN '七月'
                   WHEN 8 THEN '八月'
                   WHEN 9 THEN '九月'
                   WHEN 10 THEN '十月'
                   WHEN 11 THEN '十一月'
                   WHEN 12 THEN '十二月'
                   END                         AS month,
               b.inspectType,
               COALESCE(p.totalCount, 0)       AS totalCount,
               COALESCE(q.completedCount, 0)   AS completedCount,
               COALESCE(q.qualifiedCount, 0)   AS qualifiedCount,
               COALESCE(q.unqualifiedCount, 0) AS unqualifiedCount,
               CASE
                   WHEN COALESCE(p.totalCount, 0) = 0 THEN 0
                   ELSE ROUND(COALESCE(q.completedCount, 0) / p.totalCount * 100, 2)
                   END                         AS completionRate,
               CASE
                   WHEN COALESCE(q.completedCount, 0) = 0 THEN 0
                   ELSE ROUND(COALESCE(q.qualifiedCount, 0) / q.completedCount * 100, 2)
                   END                         AS passRate
        FROM base b
                 LEFT JOIN qi_data q ON b.month_num = q.month_num AND b.inspectType = q.inspect_type
                 LEFT JOIN prs_data p ON b.month_num = p.month_num AND b.inspectType = p.inspectType
        ORDER BY b.month_num, b.inspectType
    </select>

    <select id="getYearlyPassRateStatistics" resultType="com.ruoyi.quality.dto.QualityPassRateDto">
        SELECT t.inspectType,
               COALESCE(prs.totalCount, 0)      AS totalCount,
               COALESCE(qi.completedCount, 0)   AS completedCount,
               COALESCE(qi.qualifiedCount, 0)   AS qualifiedCount,
               COALESCE(qi.unqualifiedCount, 0) AS unqualifiedCount,
               CASE
                   WHEN COALESCE(prs.totalCount, 0) = 0 THEN 0
                   ELSE ROUND(COALESCE(qi.completedCount, 0) / prs.totalCount * 100, 2)
                   END                          AS completionRate,
               CASE
                   WHEN COALESCE(qi.completedCount, 0) = 0 THEN 0
                   ELSE ROUND(COALESCE(qi.qualifiedCount, 0) / qi.completedCount * 100, 2)
                   END                          AS passRate
        FROM (SELECT 0 AS inspectType
              UNION ALL
              SELECT 1
              UNION ALL
              SELECT 2) t
                 LEFT JOIN (SELECT inspect_type,
                                   SUM(quantity)                                                   AS completedCount,
                                   SUM(CASE WHEN check_result = '合格' THEN quantity ELSE 0 END)   AS qualifiedCount,
                                   SUM(CASE WHEN check_result = '不合格' THEN quantity ELSE 0 END) AS unqualifiedCount
                            FROM quality_inspect
                            WHERE YEAR(check_time) = #{year}
                              AND inspect_state = 1
                            GROUP BY inspect_type) qi
                           ON t.inspectType = qi.inspect_type
                 LEFT JOIN (SELECT 0                                               AS inspectType,
                                   COALESCE((SELECT SUM(inbound_num)
                                             FROM procurement_record_storage
                                             WHERE type = 1
                                               AND YEAR(create_time) = #{year}), 0) +
                                   COALESCE((SELECT SUM(quantity)
                                             FROM quality_unqualified
                                             WHERE inspect_type = 0
                                               AND YEAR(check_time) = #{year}), 0) AS totalCount
                            UNION ALL
                            SELECT 1                                                AS inspectType,
                                   COALESCE((SELECT SUM(inbound_num)
                                             FROM procurement_record_storage
                                             WHERE type = 2
                                               AND sales_ledger_product_id = 0
                                               AND YEAR(create_time) = #{year}), 0) AS totalCount
                            UNION ALL
                            SELECT 2                                                AS inspectType,
                                   COALESCE((SELECT SUM(inbound_num)
                                             FROM procurement_record_storage
                                             WHERE type = 2
                                               AND sales_ledger_product_id != 0
                                               AND YEAR(create_time) = #{year}), 0) AS totalCount) prs
                           ON t.inspectType = prs.inspectType
        ORDER BY t.inspectType
    </select>

    <select id="getMonthlyCompletionDetails" resultType="com.ruoyi.quality.dto.QualityMonthlyDetailDto">
        WITH RECURSIVE
            months AS (SELECT 1 AS month_num
                       UNION ALL
                       SELECT month_num + 1
                       FROM months
                       WHERE month_num &lt; 12),
            qi_data AS (SELECT MONTH(check_time)                                        AS month_num,
                               SUM(CASE WHEN inspect_type = 0 THEN quantity ELSE 0 END) AS rawMaterialCount,
                               SUM(CASE WHEN inspect_type = 1 THEN quantity ELSE 0 END) AS processCount,
                               SUM(CASE WHEN inspect_type = 2 THEN quantity ELSE 0 END) AS outgoingCount
                        FROM quality_inspect
                        WHERE YEAR(check_time) = #{year}
                          AND inspect_state = 1
                        GROUP BY MONTH(check_time))
        SELECT CASE m.month_num
                   WHEN 1 THEN '一月'
                   WHEN 2 THEN '二月'
                   WHEN 3 THEN '三月'
                   WHEN 4 THEN '四月'
                   WHEN 5 THEN '五月'
                   WHEN 6 THEN '六月'
                   WHEN 7 THEN '七月'
                   WHEN 8 THEN '八月'
                   WHEN 9 THEN '九月'
                   WHEN 10 THEN '十月'
                   WHEN 11 THEN '十一月'
                   WHEN 12 THEN '十二月'
                   END                         AS month,
               COALESCE(d.rawMaterialCount, 0) AS rawMaterialCount,
               COALESCE(d.processCount, 0)     AS processCount,
               COALESCE(d.outgoingCount, 0)    AS outgoingCount
        FROM months m
                 LEFT JOIN qi_data d ON m.month_num = d.month_num
        ORDER BY m.month_num
    </select>

    <select id="getTopParameters" resultType="com.ruoyi.quality.dto.QualityParameterStatDto">
        WITH parameter_counts AS (SELECT qip.parameter_item            AS name,
                                         SUM(COALESCE(qi.quantity, 0)) AS count
                                  FROM quality_inspect qi
                                           JOIN quality_inspect_param qip ON qip.inspect_id = qi.id
                                  WHERE qi.inspect_type = #{inspectType}
                                  GROUP BY qip.parameter_item),
             ranked AS (SELECT name,
                               count,
                               ROW_NUMBER() OVER (ORDER BY count DESC) AS rn
                        FROM parameter_counts),
             total AS (SELECT SUM(count) AS total_count
                       FROM parameter_counts)
        SELECT name,
               count,
               CASE
                   WHEN (SELECT total_count FROM total) = 0 THEN 0
                   ELSE ROUND(count / (SELECT total_count FROM total) * 100, 2)
                   END AS percentage
        FROM (SELECT name, count, rn
              FROM ranked
              WHERE rn &lt;= 4
              UNION ALL
              SELECT '其他检测' AS name,
                     SUM(count) AS count,
                     5          AS rn
              FROM ranked
              WHERE rn &gt; 4
              HAVING SUM(count) &gt; 0) t
        ORDER BY rn
    </select>

</mapper>

 src/main/resources/mapper/quality/QualityTestStandardMapper.xml

@@ -30,5 +30,6 @@
        <if test="process!='' and process!=null">
            and pp.name = #{process}
        </if>
        order by qts.id desc
    </select>
</mapper>

 src/main/resources/mapper/staff/StaffLeaveMapper.xml

@@ -61,4 +61,24 @@
            AND soj.staff_name LIKE CONCAT('%',#{c.staffName},'%')
        </if>
    </select>

    <select id="staffLeaveReasonAnalytics" resultType="com.ruoyi.staff.dto.StaffLeaveDto">
        SELECT
        staff_leave.reason as reason,
        COUNT(*) as count
        FROM staff_leave
        LEFT JOIN
        staff_on_job soj ON soj.id = staff_leave.staff_on_job_id
        where 1=1
        GROUP BY staff_leave.reason
    </select>

    <!-- ç»Ÿè®¡æŒ‡å®šæœˆä»½çš„离职员工数 -->
    <select id="countLeaveByMonth" resultType="java.lang.Integer">
        SELECT COUNT(*)
        FROM staff_leave sl
        LEFT JOIN staff_on_job soj ON sl.staff_on_job_id = soj.id
        WHERE DATE_FORMAT(sl.create_time, '%Y-%m-%d') BETWEEN #{monthStart} AND #{monthEnd}
        AND soj.staff_state = 0
    </select>
</mapper>

 src/main/resources/mapper/staff/StaffOnJobMapper.xml

@@ -43,4 +43,19 @@
            AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
        </if>
    </select>
    <!-- ç»Ÿè®¡æŒ‡å®šæ—¥æœŸçš„在职员工数 -->
    <select id="countOnJobStaffByDate" resultType="java.lang.Integer">
        SELECT COUNT(*)
        FROM staff_on_job
        WHERE staff_state = 1
        AND DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{date}
    </select>

    <!-- ç»Ÿè®¡æŒ‡å®šæœˆä»½çš„新入职员工数 -->
    <select id="countNewHireByMonth" resultType="java.lang.Integer">
        SELECT COUNT(*)
        FROM staff_on_job
        WHERE staff_state = 1
        AND DATE_FORMAT(create_time, '%Y-%m-%d') BETWEEN #{monthStart} AND #{monthEnd}
    </select>
</mapper>

 src/main/resources/mapper/system/SysDeptMapper.xml

@@ -20,6 +20,7 @@
        <result property="createTime" column="create_time" />
        <result property="updateBy"   column="update_by"   />
        <result property="updateTime" column="update_time" />
        <result property="staffCount" column="staff_count" />
    </resultMap>
    
    <sql id="selectDeptVo">
@@ -28,22 +29,26 @@
    </sql>
    
    <select id="selectDeptList" parameterType="com.ruoyi.project.system.domain.SysDept" resultMap="SysDeptResult">
        <include refid="selectDeptVo"/>
        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,
        count(distinct soj.id) as staff_count
        from sys_dept d
        left join staff_on_job soj on soj.sys_dept_id = d.dept_id and soj.staff_state = '1'
        where d.del_flag = '0'
        <if test="deptId != null and deptId != 0">
            AND dept_id = #{deptId}
            AND d.dept_id = #{deptId}
        </if>
        <if test="parentId != null and parentId != 0">
            AND parent_id = #{parentId}
            AND d.parent_id = #{parentId}
        </if>
        <if test="deptName != null and deptName != ''">
            AND dept_name like concat('%', #{deptName}, '%')
            AND d.dept_name like concat('%', #{deptName}, '%')
        </if>
        <if test="status != null and status != ''">
            AND status = #{status}
            AND d.status = #{status}
        </if>
        <!-- æ•°æ®èŒƒå›´è¿‡æ»¤ -->
        ${params.dataScope}
        group by d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
        order by d.parent_id, d.order_num
    </select>