yys 1.劳保台账修改

maven

2025-11-19 72a372cb26c4ba489efae6b65dbf9fdfea1b5815

yys
1.劳保台账修改

 src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java

@@ -3,7 +3,9 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.pojo.DeviceRepair;
@@ -19,6 +21,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@Api(tags = "设备保养")
@RestController
@@ -87,4 +90,27 @@
    }


    /**
     * æŒ‰å¹´ä»½æŸ¥è¯¢æ¯æœˆæŠ¥ä¿®é‡‘额（按设备台账分组）
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如2025）
     */
    @GetMapping("/monthlyAmount")
    @ApiModelProperty("按年份查询每月报修金额（按设备台账分组）")
    public AjaxResult getMonthlyAmount(@RequestParam(defaultValue = "2025", required = true,name = "year") String year) {
        List<DeviceMonthlyRepairTableDTO> result = deviceMaintenanceService.getMonthlyRepairAmountByYear(year);
        return AjaxResult.success(result);
    }

    /**
     * æŒ‰å¹´ä»½æŸ¥è¯¢æŠ¥ä¿®é‡‘额（按设备台账分组）
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如2025）
     */
    @GetMapping("/yearlyAmount")
    @ApiModelProperty("按年份查询报修金额（按设备台账分组）")
    public AjaxResult yearlyAmount(@RequestParam(defaultValue = "2025", required = true,name = "year") String year) {
        List<RepairAmountGroupDTO> result = deviceMaintenanceService.getRepairAmountByYear(year);
        return AjaxResult.success(result);
    }


}

 src/main/java/com/ruoyi/device/controller/DeviceRepairController.java

@@ -2,7 +2,9 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
@@ -16,6 +18,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@Api(tags = "设备报修管理")
@RequestMapping("/device/repair")
@@ -75,4 +78,27 @@
    public void export(HttpServletResponse response, Long[] ids) {
        deviceRepairService.export(response, ids);
    }

    /**
     * æŒ‰å¹´ä»½æŸ¥è¯¢æ¯æœˆæŠ¥ä¿®é‡‘额（按设备台账分组）
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如2025）
     */
    @GetMapping("/monthlyAmount")
    @ApiModelProperty("按年份查询每月报修金额（按设备台账分组）")
    public AjaxResult getMonthlyAmount(@RequestParam(defaultValue = "2025", required = true,name = "year") String year) {
        List<DeviceMonthlyRepairTableDTO> result = deviceRepairService.getMonthlyRepairAmountByYear(year);
        return AjaxResult.success(result);
    }

    /**
     * æŒ‰å¹´ä»½æŸ¥è¯¢æŠ¥ä¿®é‡‘额（按设备台账分组）
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如2025）
     */
    @GetMapping("/yearlyAmount")
    @ApiModelProperty("按年份查询报修金额（按设备台账分组）")
    public AjaxResult yearlyAmount(@RequestParam(defaultValue = "2025", required = true,name = "year") String year) {
        List<RepairAmountGroupDTO> result = deviceRepairService.getRepairAmountByYear(year);
        return AjaxResult.success(result);
    }

}

 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java

@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

@@ -16,6 +17,9 @@

    private Long id;

    @ApiModelProperty("设备保养金额")
    private BigDecimal maintenancePrice;

    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;


 src/main/java/com/ruoyi/device/dto/DeviceMonthlyRepairTableDTO.java

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

import lombok.Data;

import java.math.BigDecimal;

/**
 * @author :yys
 * @date : 2025/11/19 10:58
 */
@Data
public class DeviceMonthlyRepairTableDTO {

    private String deviceName; // è®¾å¤‡åç§°
    private BigDecimal month1; // 1月金额
    private BigDecimal month2; // 2月金额
    private BigDecimal month3; // 3月金额
    private BigDecimal month4; // 4月金额
    private BigDecimal month5; // 5月金额
    private BigDecimal month6; // 6月金额
    private BigDecimal month7; // 7月金额
    private BigDecimal month8; // 8月金额
    private BigDecimal month9; // 9月金额
    private BigDecimal month10; // 10月金额
    private BigDecimal month11; // 11月金额
    private BigDecimal month12; // 12月金额
    private BigDecimal total; // æ€»è®¡

}

 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java

@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

@@ -18,6 +19,9 @@
    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;

    @ApiModelProperty("报修金额")
    private BigDecimal repairPrice;

    @ApiModelProperty("设备名称")
    private String deviceName;


 src/main/java/com/ruoyi/device/dto/RepairAmountGroupDTO.java

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

import lombok.Data;

import java.math.BigDecimal;

/**
 * @author :yys
 * @date : 2025/11/19 10:44
 */
@Data
public class RepairAmountGroupDTO {

    // å¹´æœˆï¼ˆæ ¼å¼ï¼šMM）
    private String repairYearMonth;
    // è®¾å¤‡å°è´¦id
    private Long deviceLedgerId;
    // è®¾å¤‡å°è´¦åç§°
    private String deviceName;
    // è¯¥è®¾å¤‡æŠ¥ä¿®é‡‘额总和
    private BigDecimal totalRepairPrice;

}

 src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

@@ -17,6 +18,11 @@
    @Excel(name = "设备名称")
    private String deviceName;


    @ApiModelProperty("设备保养金额")
    @Excel(name = "设备保养金额")
    private BigDecimal maintenancePrice;

    @Excel(name = "规格型号")
    @ApiModelProperty("规格型号")
    private String deviceModel;

 src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java

@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

@@ -17,6 +18,10 @@
    @Excel(name = "设备名称")
    private String deviceName;

    @ApiModelProperty("报修金额")
    @Excel(name = "报修金额")
    private BigDecimal repairPrice;

    @ApiModelProperty("设备型号")
    @Excel(name = "设备型号")
    private String deviceModel;

 src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java

@@ -7,8 +7,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceMaintenance;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

@@ -21,4 +24,31 @@

    @InterceptorIgnore(tenantLine = "true")
    List<DeviceMaintenance> list1(Long id);

    /**
     * æŒ‰â€œæŒ‡å®šå¹´ä»½çš„年月+设备台账id”分组，求和报修金额
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如"2025"）
     */
    @Select("SELECT " +
            "  DATE_FORMAT(maintenance_actually_time, '%m') AS repairYearMonth, " +
            "  device_ledger_id AS deviceLedgerId, " +
            "  SUM(maintenance_price) AS totalRepairPrice " +
            "FROM device_maintenance " +
            "WHERE DATE_FORMAT(maintenance_actually_time, '%Y') = #{year} " + // åªæŸ¥è¯¢æŒ‡å®šå¹´ä»½çš„数据
            "GROUP BY device_ledger_id,DATE_FORMAT(maintenance_actually_time, '%Y-%m')  " +
            "ORDER BY repairYearMonth ASC") // æŒ‰æœˆä»½æŽ’序，方便前端展示
    List<RepairAmountGroupDTO> groupByMonthAndDeviceLedger(@Param("year") String year);

    /**
     * æŒ‰â€œè®¾å¤‡å°è´¦id”分组，求和报修金额
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如"2025"）
     */
    @Select("SELECT " +
            "  device_ledger_id AS deviceLedgerId, " +
            "  SUM(maintenance_price) AS totalRepairPrice " +
            "FROM device_maintenance " +
            "WHERE DATE_FORMAT(maintenance_actually_time, '%Y') = #{year} " + // åªæŸ¥è¯¢æŒ‡å®šå¹´ä»½çš„数据
            "GROUP BY device_ledger_id ") // æŒ‰æœˆä»½æŽ’序，方便前端展示
    List<RepairAmountGroupDTO> groupByDeviceLedger(@Param("year") String year);

}

 src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java

@@ -4,13 +4,44 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceRepair;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

@Mapper
public interface DeviceRepairMapper extends BaseMapper<DeviceRepair> {
    IPage<DeviceRepairDto> queryPage(Page page, @Param("deviceRepairDto") DeviceRepairDto deviceRepairDto);

    DeviceRepairDto detailById(Long id);


    /**
     * æŒ‰â€œæŒ‡å®šå¹´ä»½çš„年月+设备台账id”分组，求和报修金额
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如"2025"）
     */
    @Select("SELECT " +
            "  DATE_FORMAT(repair_time, '%m') AS repairYearMonth, " +
            "  device_ledger_id AS deviceLedgerId, " +
            "  SUM(repair_price) AS totalRepairPrice " +
            "FROM device_repair " +
            "WHERE DATE_FORMAT(repair_time, '%Y') = #{year} " + // åªæŸ¥è¯¢æŒ‡å®šå¹´ä»½çš„数据
            "GROUP BY device_ledger_id,DATE_FORMAT(repair_time, '%Y-%m')  " +
            "ORDER BY repairYearMonth ASC") // æŒ‰æœˆä»½æŽ’序，方便前端展示
    List<RepairAmountGroupDTO> groupByMonthAndDeviceLedger(@Param("year") String year);

    /**
     * æŒ‰â€œè®¾å¤‡å°è´¦id”分组，求和报修金额
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如"2025"）
     */
    @Select("SELECT " +
            "  device_ledger_id AS deviceLedgerId, " +
            "  SUM(repair_price) AS totalRepairPrice " +
            "FROM device_repair " +
            "WHERE DATE_FORMAT(repair_time, '%Y') = #{year} " + // åªæŸ¥è¯¢æŒ‡å®šå¹´ä»½çš„数据
            "GROUP BY device_ledger_id ") // æŒ‰æœˆä»½æŽ’序，方便前端展示
    List<RepairAmountGroupDTO> groupByDeviceLedger(@Param("year") String year);
}

 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java

@@ -8,6 +8,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

@@ -22,6 +23,9 @@
    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;

    @ApiModelProperty("设备保养金额")
    private BigDecimal maintenancePrice;


    private String deviceName;


 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java

@@ -25,6 +25,9 @@
    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;

    @ApiModelProperty("报修金额")
    private BigDecimal repairPrice;

    private String deviceName;

    private String deviceModel;

 src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java

@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.framework.web.domain.AjaxResult;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

public interface IDeviceMaintenanceService extends IService<DeviceMaintenance> {

@@ -20,4 +23,8 @@
    void export(HttpServletResponse response, Long[] ids);

    DeviceMaintenanceDto detailById(Long id);

    List<DeviceMonthlyRepairTableDTO> getMonthlyRepairAmountByYear(String year);

    List<RepairAmountGroupDTO> getRepairAmountByYear(String year);
}

 src/main/java/com/ruoyi/device/service/IDeviceRepairService.java

@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.framework.web.domain.AjaxResult;

import javax.servlet.http.HttpServletResponse;
import java.util.List;


public interface IDeviceRepairService extends IService<DeviceRepair> {
@@ -21,4 +24,8 @@
    void export(HttpServletResponse response, Long[] ids);

    DeviceRepairDto detailById(Long id);

    List<DeviceMonthlyRepairTableDTO> getMonthlyRepairAmountByYear(String year);

    List<RepairAmountGroupDTO> getRepairAmountByYear(String year);
}

 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java

@@ -7,18 +7,24 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;


@Service
@@ -73,4 +79,96 @@

        return deviceMaintenanceMapper.detailById(id);
    }

    @Autowired
    private DeviceLedgerMapper deviceLedgerMapper;

    @Override
    public List<DeviceMonthlyRepairTableDTO> getMonthlyRepairAmountByYear(String year) {
        List<RepairAmountGroupDTO> repairAmountGroupDTOS = deviceMaintenanceMapper.groupByMonthAndDeviceLedger(year);
        // 1. å…ˆé€šè¿‡è®¾å¤‡å°è´¦id关联设备名称（如果RepairAmountGroupDTO没有deviceName，需先查设备台账表）
        // è¿™é‡Œå‡è®¾ä½ èƒ½é€šè¿‡deviceLedgerId获取到deviceName，比如：
        Map<Long, String> deviceNameMap = new HashMap<>(); // key:deviceLedgerId, value:deviceName
        // ï¼ˆå®žé™…需调用设备台账的Mapper查询：deviceNameMap = deviceLedgerMapper.listAll().stream().collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName))）
        deviceNameMap = deviceLedgerMapper.selectList(null)
                .stream()
                .collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName));
        if(CollectionUtils.isEmpty(deviceNameMap)){
            return Collections.emptyList();
        }
        // 2. æŒ‰è®¾å¤‡åç§°åˆ†ç»„，存储每个设备的各月金额
        Map<String, DeviceMonthlyRepairTableDTO> deviceTableMap = new HashMap<>();

        for (RepairAmountGroupDTO dto : repairAmountGroupDTOS) {
            // æ‹†åˆ†repairYearMonth为月份（如"2025-01" â†’ "01" â†’ 1）
            String yearMonth = dto.getRepairYearMonth(); // æ ¼å¼ï¼šyyyy-MM
            int month = Integer.parseInt(yearMonth); // æå–MM并转成数字（1-12）

            // èŽ·å–设备名称
            String deviceName = deviceNameMap.get(dto.getDeviceLedgerId());
            if (deviceName == null) {
                deviceName = "未知设备"; // å…œåº•
            }

            // ä»ŽMap中获取该设备的表格DTO，不存在则初始化
            DeviceMonthlyRepairTableDTO tableDTO = deviceTableMap.getOrDefault(deviceName, new DeviceMonthlyRepairTableDTO());
            tableDTO.setDeviceName(deviceName);

            // æ ¹æ®æœˆä»½å¡«å……金额（BigDecimal默认0，避免null）
            BigDecimal amount = dto.getTotalRepairPrice() == null ? BigDecimal.ZERO : dto.getTotalRepairPrice();
            switch (month) {
                case 1: tableDTO.setMonth1(amount); break;
                case 2: tableDTO.setMonth2(amount); break;
                case 3: tableDTO.setMonth3(amount); break;
                case 4: tableDTO.setMonth4(amount); break;
                case 5: tableDTO.setMonth5(amount); break;
                case 6: tableDTO.setMonth6(amount); break;
                case 7: tableDTO.setMonth7(amount); break;
                case 8: tableDTO.setMonth8(amount); break;
                case 9: tableDTO.setMonth9(amount); break;
                case 10: tableDTO.setMonth10(amount); break;
                case 11: tableDTO.setMonth11(amount); break;
                case 12: tableDTO.setMonth12(amount); break;
            }

            // é‡æ–°æ”¾å…¥Map
            deviceTableMap.put(deviceName, tableDTO);
        }


        // 3. è®¡ç®—每个设备的总计，并补充序号
        List<DeviceMonthlyRepairTableDTO> resultList = new ArrayList<>();
        for (DeviceMonthlyRepairTableDTO tableDTO : deviceTableMap.values()) {
            // è®¡ç®—总计：1-12月金额相加
            BigDecimal total = Stream.of(
                            tableDTO.getMonth1(), tableDTO.getMonth2(), tableDTO.getMonth3(),
                            tableDTO.getMonth4(), tableDTO.getMonth5(), tableDTO.getMonth6(),
                            tableDTO.getMonth7(), tableDTO.getMonth8(), tableDTO.getMonth9(),
                            tableDTO.getMonth10(), tableDTO.getMonth11(), tableDTO.getMonth12()
                    )
                    .map(amt -> amt == null ? BigDecimal.ZERO : amt)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            tableDTO.setTotal(total);
            resultList.add(tableDTO);
        }
        return resultList;
    }

    @Override
    public List<RepairAmountGroupDTO> getRepairAmountByYear(String year) {
        List<RepairAmountGroupDTO> repairAmountGroupDTOS = deviceMaintenanceMapper.groupByDeviceLedger(year);
        Map<Long, String> deviceNameMap = new HashMap<>(); // key:deviceLedgerId, value:deviceName
        // ï¼ˆå®žé™…需调用设备台账的Mapper查询：deviceNameMap = deviceLedgerMapper.listAll().stream().collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName))）
        deviceNameMap = deviceLedgerMapper.selectList(null)
                .stream()
                .collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName));
        if(CollectionUtils.isEmpty(deviceNameMap)){
            return Collections.emptyList();
        }
        Map<Long, String> finalDeviceNameMap = deviceNameMap;
        repairAmountGroupDTOS.forEach(dto -> {
            dto.setDeviceName(finalDeviceNameMap.get(dto.getDeviceLedgerId()));
        });
        return repairAmountGroupDTOS;
    }
}

 src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java

@@ -6,9 +6,12 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.execl.DeviceRepairExeclDto;
import com.ruoyi.device.mapper.DeviceDefectRecordMapper;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.mapper.DeviceRepairMapper;
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.pojo.DeviceLedger;
@@ -21,11 +24,13 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

@Service
@AllArgsConstructor
@@ -116,4 +121,96 @@
        return deviceRepairMapper.detailById(id);
    }

    @Autowired
    private DeviceLedgerMapper deviceLedgerMapper;

    @Override
    public List<DeviceMonthlyRepairTableDTO> getMonthlyRepairAmountByYear(String year) {
        List<RepairAmountGroupDTO> repairAmountGroupDTOS = deviceRepairMapper.groupByMonthAndDeviceLedger(year);
        // 1. å…ˆé€šè¿‡è®¾å¤‡å°è´¦id关联设备名称（如果RepairAmountGroupDTO没有deviceName，需先查设备台账表）
        // è¿™é‡Œå‡è®¾ä½ èƒ½é€šè¿‡deviceLedgerId获取到deviceName，比如：
        Map<Long, String> deviceNameMap = new HashMap<>(); // key:deviceLedgerId, value:deviceName
        // ï¼ˆå®žé™…需调用设备台账的Mapper查询：deviceNameMap = deviceLedgerMapper.listAll().stream().collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName))）
        deviceNameMap = deviceLedgerMapper.selectList(null)
                .stream()
                .collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName));
        if(CollectionUtils.isEmpty(deviceNameMap)){
            return Collections.emptyList();
        }
        // 2. æŒ‰è®¾å¤‡åç§°åˆ†ç»„，存储每个设备的各月金额
        Map<String, DeviceMonthlyRepairTableDTO> deviceTableMap = new HashMap<>();

        for (RepairAmountGroupDTO dto : repairAmountGroupDTOS) {
            // æ‹†åˆ†repairYearMonth为月份（如"2025-01" â†’ "01" â†’ 1）
            String yearMonth = dto.getRepairYearMonth(); // æ ¼å¼ï¼šyyyy-MM
            int month = Integer.parseInt(yearMonth); // æå–MM并转成数字（1-12）

            // èŽ·å–设备名称
            String deviceName = deviceNameMap.get(dto.getDeviceLedgerId());
            if (deviceName == null) {
                deviceName = "未知设备"; // å…œåº•
            }

            // ä»ŽMap中获取该设备的表格DTO，不存在则初始化
            DeviceMonthlyRepairTableDTO tableDTO = deviceTableMap.getOrDefault(deviceName, new DeviceMonthlyRepairTableDTO());
            tableDTO.setDeviceName(deviceName);

            // æ ¹æ®æœˆä»½å¡«å……金额（BigDecimal默认0，避免null）
            BigDecimal amount = dto.getTotalRepairPrice() == null ? BigDecimal.ZERO : dto.getTotalRepairPrice();
            switch (month) {
                case 1: tableDTO.setMonth1(amount); break;
                case 2: tableDTO.setMonth2(amount); break;
                case 3: tableDTO.setMonth3(amount); break;
                case 4: tableDTO.setMonth4(amount); break;
                case 5: tableDTO.setMonth5(amount); break;
                case 6: tableDTO.setMonth6(amount); break;
                case 7: tableDTO.setMonth7(amount); break;
                case 8: tableDTO.setMonth8(amount); break;
                case 9: tableDTO.setMonth9(amount); break;
                case 10: tableDTO.setMonth10(amount); break;
                case 11: tableDTO.setMonth11(amount); break;
                case 12: tableDTO.setMonth12(amount); break;
            }

            // é‡æ–°æ”¾å…¥Map
            deviceTableMap.put(deviceName, tableDTO);
        }


        // 3. è®¡ç®—每个设备的总计，并补充序号
        List<DeviceMonthlyRepairTableDTO> resultList = new ArrayList<>();
        for (DeviceMonthlyRepairTableDTO tableDTO : deviceTableMap.values()) {
            // è®¡ç®—总计：1-12月金额相加
            BigDecimal total = Stream.of(
                            tableDTO.getMonth1(), tableDTO.getMonth2(), tableDTO.getMonth3(),
                            tableDTO.getMonth4(), tableDTO.getMonth5(), tableDTO.getMonth6(),
                            tableDTO.getMonth7(), tableDTO.getMonth8(), tableDTO.getMonth9(),
                            tableDTO.getMonth10(), tableDTO.getMonth11(), tableDTO.getMonth12()
                    )
                    .map(amt -> amt == null ? BigDecimal.ZERO : amt)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            tableDTO.setTotal(total);
            resultList.add(tableDTO);
        }
        return resultList;
    }

    @Override
    public List<RepairAmountGroupDTO> getRepairAmountByYear(String year) {
        List<RepairAmountGroupDTO> repairAmountGroupDTOS = deviceRepairMapper.groupByDeviceLedger(year);
        Map<Long, String> deviceNameMap = new HashMap<>(); // key:deviceLedgerId, value:deviceName
        // ï¼ˆå®žé™…需调用设备台账的Mapper查询：deviceNameMap = deviceLedgerMapper.listAll().stream().collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName))）
        deviceNameMap = deviceLedgerMapper.selectList(null)
                .stream()
                .collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName));
        if(CollectionUtils.isEmpty(deviceNameMap)){
            return Collections.emptyList();
        }
        Map<Long, String> finalDeviceNameMap = deviceNameMap;
        repairAmountGroupDTOS.forEach(dto -> {
            dto.setDeviceName(finalDeviceNameMap.get(dto.getDeviceLedgerId()));
        });
        return repairAmountGroupDTOS;
    }

}

 src/main/java/com/ruoyi/lavorissue/controller/DeptPositionController.java

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

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.lavorissue.pojo.DeptPosition;
import com.ruoyi.lavorissue.service.DeptPositionService;
import io.swagger.annotations.Api;
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;

/**
 * @author :yys
 * @date : 2025/11/19 13:20
 */
@RestController
@Api(tags = "部门岗位")
@RequestMapping("/deptPosition")
public class DeptPositionController extends BaseController {

    @Autowired
    private DeptPositionService deptPositionService;


    /**
     * é€’归获取部门岗位树形结构
     * @return
     */
    @GetMapping("/getDeptPositionTree")
    @Log(title = "递归获取部门岗位树形结构", businessType = BusinessType.OTHER)
    @ApiOperation("递归获取部门岗位树形结构")
    public AjaxResult getDeptPositionTree() {
        return deptPositionService.getDeptPositionTree();
    }

    /**
     * æŸ¥è¯¢æ‰€æœ‰å²—位列表
     */
    @GetMapping("/list")
    @Log(title = "查询所有岗位列表", businessType = BusinessType.OTHER)
    @ApiOperation("查询所有岗位列表")
    public AjaxResult list() {
        return AjaxResult.success(deptPositionService.list(Wrappers.lambdaQuery(DeptPosition.class)
                .eq(DeptPosition::getType, 2)));
    }

    /**
     * é€šè¿‡id递归查询所有的岗位,在通过岗位查询对应人员
     * @param deptPosition
     * @return
     */
    @GetMapping("/getDeptPositionByDeptId")
    @Log(title = "通过部门id递归查询所有的岗位", businessType = BusinessType.OTHER)
    @ApiOperation("通过部门id递归查询所有的岗位")
    public AjaxResult getDeptPositionByDeptId(@RequestBody DeptPosition deptPosition) {
        return AjaxResult.success(deptPositionService.getDeptPositionByDeptId(deptPosition));
    }

    /**
     * é€šè¿‡id递归查询所有的岗位,在通过岗位查询对应劳保用品
     * @param deptPosition
     * @return
     */
    @GetMapping("/getDeptPositionByDeptIdLabor")
    @Log(title = "通过id递归查询所有的岗位,在通过岗位查询对应劳保用品", businessType = BusinessType.OTHER)
    @ApiOperation("通过id递归查询所有的岗位,在通过岗位查询对应劳保用品")
    public AjaxResult getDeptPositionByDeptIdLabor(@RequestBody DeptPosition deptPosition) {
        return AjaxResult.success(deptPositionService.getDeptPositionByDeptIdLabor(deptPosition));
    }

    @PostMapping("/addDeptPosition")
    @Log(title = "添加部门岗位", businessType = BusinessType.INSERT)
    @ApiOperation("添加部门岗位")
    public AjaxResult addDeptPosition(@RequestBody DeptPosition deptPosition) {
        return AjaxResult.success(deptPositionService.save(deptPosition));
    }

    @PostMapping("/updateDeptPosition")
    @Log(title = "修改部门岗位", businessType = BusinessType.UPDATE)
    @ApiOperation("修改部门岗位")
    public AjaxResult updateDeptPosition(@RequestBody DeptPosition deptPosition) {
        return AjaxResult.success(deptPositionService.updateById(deptPosition));
    }

    @DeleteMapping("/deleteDeptPosition")
    @Log(title = "删除部门岗位", businessType = BusinessType.DELETE)
    @ApiOperation("删除部门岗位")
    public AjaxResult deleteDeptPosition(@RequestBody List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("请选择要删除的部门岗位");
        return AjaxResult.success(deptPositionService.removeBatchByIds(ids));
    }

}

 src/main/java/com/ruoyi/lavorissue/controller/LaborConfController.java

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.lavorissue.pojo.LaborConf;
import com.ruoyi.lavorissue.service.LaborConfService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * @author :yys
 * @date : 2025/11/19 14:02
 */
@RestController
@Api(tags = "劳保配置")
@RequestMapping("/laborConf")
public class LaborConfController extends BaseController {

    @Autowired
    private LaborConfService laborConfService;

    @GetMapping("/listPage")
    @Log(title = "查询劳保配置", businessType = BusinessType.OTHER)
    @ApiOperation("查询劳保配置")
    public AjaxResult listPage(Page page, LaborConf laborConf) {
        return laborConfService.listPage(page, laborConf);
    }


    @PostMapping("/add")
    @Log(title = "添加劳保配置", businessType = BusinessType.INSERT)
    @ApiOperation("添加劳保配置")
    public AjaxResult add(@RequestBody LaborConf laborConf) {
        return laborConfService.save(laborConf) ? success() : error();
    }

    @PostMapping("/update")
    @Log(title = "修改劳保配置", businessType = BusinessType.UPDATE)
    @ApiOperation("修改劳保配置")
    public AjaxResult update(@RequestBody LaborConf laborConf) {
        return laborConfService.updateById(laborConf) ? success() : error();
    }

    @DeleteMapping("/delete")
    @Log(title = "删除劳保配置", businessType = BusinessType.DELETE)
    @ApiOperation("删除劳保配置")
    public AjaxResult delete(@RequestBody List<Long> ids) {
        return laborConfService.removeBatchByIds(ids) ? success() : error();
    }

}

 src/main/java/com/ruoyi/lavorissue/mapper/DeptPositionMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package com.ruoyi.lavorissue.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.lavorissue.pojo.DeptPosition;

import java.util.List;

/**
 * @author :yys
 * @date : 2025/11/19 13:19
 */
public interface DeptPositionMapper extends BaseMapper<DeptPosition> {
    List<DeptPosition> getDeptPositionTree(List<DeptPosition> deptPositions);
}

 src/main/java/com/ruoyi/lavorissue/mapper/LaborConfMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.lavorissue.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.lavorissue.pojo.LaborConf;
import org.apache.ibatis.annotations.Param;

/**
 * @author :yys
 * @date : 2025/11/19 14:00
 */
public interface LaborConfMapper extends BaseMapper<LaborConf> {
    IPage<LaborConf> listPage(Page page,@Param("req") LaborConf laborConf);
}

 src/main/java/com/ruoyi/lavorissue/pojo/DeptPosition.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,80 @@
package com.ruoyi.lavorissue.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;

/**
 * @author :yys
 * @date : 2025/11/19 11:58
 */
@Data
@TableName("dept_position")
public class DeptPosition {
    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("父id")
    private Long parentId;

    @ApiModelProperty("名称")
    private String name;

    /**
     * ç±»åž‹ï¼ˆ1-部门 2-岗位）
     */
    @ApiModelProperty("类型（1-部门 2-岗位）")
    private Integer type;

    /**
     * æŽ’序
     */
    @ApiModelProperty("排序")
    private Integer sort;

    @ApiModelProperty("子数据（岗位）")
    @TableField(exist = false)
    private List<DeptPosition> children;


    /**
     * åˆ›å»ºè€…
     */
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    /**
     * ä¿®æ”¹è€…
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    /**
     * ä¿®æ”¹æ—¶é—´
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    /**
     * ç§Ÿæˆ·ID
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;


}

 src/main/java/com/ruoyi/lavorissue/pojo/LaborConf.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,85 @@
package com.ruoyi.lavorissue.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;
import java.util.List;

/**
 * @author :yys
 * @date : 2025/11/19 13:56
 */
@Data
@TableName("labor_conf")
public class LaborConf {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("部门岗位表id")
    private Long deptPositionId;

    /**
     * é˜²å…·åç§°-字典
     */
    @ApiModelProperty("防具名称-字典")
    private String dictId;

    /**
     * é˜²å…·åç§°
     */
    @ApiModelProperty("防具名称")
    @TableField(exist = false)
    private String dictName;


    /**
     * æ•°é‡
     */
    @ApiModelProperty("数量")
    private Integer num;


    /**
     * å­£åº¦ï¼ˆç¬¬ä¸€å­£åº¦-1类推）
     */
    @ApiModelProperty("季度（第一季度-1类推）")
    private Integer quarter;


    /**
     * åˆ›å»ºè€…
     */
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    /**
     * ä¿®æ”¹è€…
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    /**
     * ä¿®æ”¹æ—¶é—´
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    /**
     * ç§Ÿæˆ·ID
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

}

 src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java

@@ -34,10 +34,16 @@
    private Integer season;

    /**
     * éƒ¨é—¨åç§°
     * éƒ¨é—¨å²—位id
     */
    @ApiModelProperty("部门名称")
    @Excel(name = "部门名称")
    @ApiModelProperty("部门岗位id")
    private Integer deptPositionName;

    /**
     * éƒ¨é—¨å²—位名称
     */
    @ApiModelProperty("部门岗位名称")
    @Excel(name = "部门岗位名称")
    @TableField(exist = false)
    private String deptName;


 src/main/java/com/ruoyi/lavorissue/service/DeptPositionService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.lavorissue.pojo.DeptPosition;
import com.ruoyi.lavorissue.pojo.LaborConf;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;

import java.util.List;

/**
 * @author :yys
 * @date : 2025/11/19 13:21
 */
public interface DeptPositionService extends IService<DeptPosition> {

    /**
     * é€’归获取部门岗位树形结构
     * @return
     */
    AjaxResult getDeptPositionTree();

    List<StaffOnJob> getDeptPositionByDeptId(DeptPosition deptPosition);

    List<LaborConf> getDeptPositionByDeptIdLabor(DeptPosition deptPosition);
}

 src/main/java/com/ruoyi/lavorissue/service/LaborConfService.java

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.lavorissue.pojo.LaborConf;

/**
 * @author :yys
 * @date : 2025/11/19 14:00
 */
public interface LaborConfService extends IService<LaborConf> {
    AjaxResult listPage(Page page, LaborConf laborConf);
}

 src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java

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

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.lavorissue.mapper.DeptPositionMapper;
import com.ruoyi.lavorissue.mapper.LaborConfMapper;
import com.ruoyi.lavorissue.pojo.DeptPosition;
import com.ruoyi.lavorissue.pojo.LaborConf;
import com.ruoyi.lavorissue.service.DeptPositionService;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.*;
import java.util.stream.Collectors;

/**
 * @author :yys
 * @date : 2025/11/19 13:21
 */
@Service
@Slf4j
public class DeptPositionServiceImpl extends ServiceImpl<DeptPositionMapper, DeptPosition> implements DeptPositionService {

    @Autowired
    private DeptPositionMapper deptPositionMapper;


    /**
     * é€’归获取部门岗位树形结构
     * @return
     */
    @Override
    public AjaxResult getDeptPositionTree() {
        List<DeptPosition> deptPositions = deptPositionMapper.selectList(null);
        // 2. ç­›é€‰æ ¹éƒ¨é—¨ï¼ˆparentId为0或null，且类型为部门type=1）
        List<DeptPosition> rootDepts = deptPositions.stream()
                .filter(item -> (item.getParentId() == null || item.getParentId() == 0)
                        && item.getType() == 1) // æ ¹èŠ‚点必须是部门
                .sorted(Comparator.comparingInt(DeptPosition::getSort)) // æŒ‰æŽ’序字段升序
                .collect(Collectors.toList());

        // 3. ä¸ºæ¯ä¸ªæ ¹éƒ¨é—¨é€’归查找下属岗位（子集）
        for (DeptPosition rootDept : rootDepts) {
            buildDeptChildren(rootDept, deptPositions);
        }
        return AjaxResult.success(rootDepts);
    }

    @Autowired
    private StaffOnJobMapper staffOnJobMapper;

    /**
     * é€šè¿‡id递归查询所有的岗位
     * @param deptPosition
     * @return
     */
    @Override
    public List<StaffOnJob> getDeptPositionByDeptId(DeptPosition deptPosition) {
        Long deptId = deptPosition.getId();
        // 1. æ ¡éªŒéƒ¨é—¨æ˜¯å¦å­˜åœ¨
        DeptPosition dept = deptPositionMapper.selectById(deptId);
        if (dept == null) {
            throw new IllegalArgumentException("无效的部门或岗位ID");
        }
        if(dept.getType() == 2){
            return staffOnJobMapper.selectList(Wrappers.lambdaQuery(StaffOnJob.class)
                    .eq(StaffOnJob::getStaffState, 1)
                    .eq(StaffOnJob::getDeptPositionId, deptId));
        }

        // 2. é€’归获取当前部门及所有子部门的ID集合
        Set<Long> deptIdSet = new HashSet<>();
        // å…ˆæ·»åŠ å½“前部门ID
        deptIdSet.add(deptId);
        // é€’归获取所有子部门ID
        findAllChildDeptIds(deptId, deptIdSet);

        // 3. æŸ¥è¯¢è¿™äº›éƒ¨é—¨ä¸‹çš„所有岗位（type=2）
        if (deptIdSet.isEmpty()) {
            return Collections.emptyList();
        }
        List<DeptPosition> deptPositions = deptPositionMapper.selectList(
                Wrappers.<DeptPosition>lambdaQuery()
                        .in(DeptPosition::getParentId, deptIdSet) // çˆ¶ID在部门ID集合中
                        .eq(DeptPosition::getType, 2) // ç±»åž‹ä¸ºå²—位
                        .orderByAsc(DeptPosition::getSort) // æŒ‰æŽ’序字段升序
        );
        if(CollectionUtils.isEmpty(deptPositions)){
            return Collections.emptyList();
        }
        return staffOnJobMapper.selectList(Wrappers.lambdaQuery(StaffOnJob.class)
                .eq(StaffOnJob::getStaffState, 1)
                .in(StaffOnJob::getDeptPositionId, deptPositions
                        .stream()
                        .map(DeptPosition::getId)
                        .collect(Collectors.toSet())));
    }

    @Autowired
    private LaborConfMapper laborConfMapper;

    @Override
    public List<LaborConf> getDeptPositionByDeptIdLabor(DeptPosition deptPosition) {
        Long deptId = deptPosition.getId();
        // 1. æ ¡éªŒéƒ¨é—¨æ˜¯å¦å­˜åœ¨
        DeptPosition dept = deptPositionMapper.selectById(deptId);
        if (dept == null) {
            throw new IllegalArgumentException("无效的部门或岗位ID");
        }
        if(dept.getType() == 2){
            return laborConfMapper.selectList(Wrappers.lambdaQuery(LaborConf.class)
                    .eq(LaborConf::getDeptPositionId, deptId));
        }

        // 2. é€’归获取当前部门及所有子部门的ID集合
        Set<Long> deptIdSet = new HashSet<>();
        // å…ˆæ·»åŠ å½“前部门ID
        deptIdSet.add(deptId);
        // é€’归获取所有子部门ID
        findAllChildDeptIds(deptId, deptIdSet);

        // 3. æŸ¥è¯¢è¿™äº›éƒ¨é—¨ä¸‹çš„所有岗位（type=2）
        if (deptIdSet.isEmpty()) {
            return Collections.emptyList();
        }
        List<DeptPosition> deptPositions = deptPositionMapper.selectList(
                Wrappers.<DeptPosition>lambdaQuery()
                        .in(DeptPosition::getParentId, deptIdSet) // çˆ¶ID在部门ID集合中
                        .eq(DeptPosition::getType, 2) // ç±»åž‹ä¸ºå²—位
                        .orderByAsc(DeptPosition::getSort) // æŒ‰æŽ’序字段升序
        );
        if(CollectionUtils.isEmpty(deptPositions)){
            return Collections.emptyList();
        }
        return laborConfMapper.selectList(Wrappers.lambdaQuery(LaborConf.class)
                .in(LaborConf::getDeptPositionId, deptPositions.stream()
                        .map(DeptPosition::getId)
                        .collect(Collectors.toSet())));
    }

    /**
     * é€’归获取所有子部门ID（仅包括type=1的部门）
     * @param parentDeptId çˆ¶éƒ¨é—¨ID
     * @param deptIdSet å­˜å‚¨éƒ¨é—¨ID的集合（引用传递，持续添加子部门ID）
     */
    private void findAllChildDeptIds(Long parentDeptId, Set<Long> deptIdSet) {
        // æŸ¥è¯¢å½“前父部门下的所有子部门（type=1）
        List<DeptPosition> childDepts = deptPositionMapper.selectList(
                Wrappers.<DeptPosition>lambdaQuery()
                        .eq(DeptPosition::getParentId, parentDeptId)
                        .eq(DeptPosition::getType, 1) // åªæŸ¥å­éƒ¨é—¨ï¼Œä¸æŸ¥å²—位
        );

        // è‹¥æœ‰å­éƒ¨é—¨ï¼Œæ·»åŠ ID到集合，并继续递归查询其子部门
        if (!childDepts.isEmpty()) {
            for (DeptPosition childDept : childDepts) {
                Long childDeptId = childDept.getId();
                deptIdSet.add(childDeptId); // æ·»åŠ å­éƒ¨é—¨ID
                findAllChildDeptIds(childDeptId, deptIdSet); // é€’归查询该子部门的子部门
            }
        }
    }


    /**
     * é€’归构建部门的子节点（可能是子部门或岗位）
     * @param parent çˆ¶èŠ‚点（部门）
     * @param allList æ‰€æœ‰æ•°æ®
     */
    private void buildDeptChildren(DeptPosition parent, List<DeptPosition> allList) {
        // ç¬¬ä¸€æ­¥ï¼šæŸ¥æ‰¾å½“前部门的子部门（type=1），构建部门层级
        List<DeptPosition> childDepts = allList.stream()
                .filter(item -> parent.getId().equals(item.getParentId())
                        && item.getType() == 1) // å­èŠ‚点是部门
                .sorted(Comparator.comparingInt(DeptPosition::getSort))
                .collect(Collectors.toList());

        // ç¬¬äºŒæ­¥ï¼šæŸ¥æ‰¾å½“前部门的岗位（type=2），作为子节点
        List<DeptPosition> childPositions = allList.stream()
                .filter(item -> parent.getId().equals(item.getParentId())
                        && item.getType() == 2) // å­èŠ‚点是岗位
                .sorted(Comparator.comparingInt(DeptPosition::getSort))
                .collect(Collectors.toList());

        // åˆå¹¶å­éƒ¨é—¨å’Œå²—位（子部门在前，岗位在后，或按sort排序）
        List<DeptPosition> allChildren = new ArrayList<>();
        allChildren.addAll(childDepts);
        allChildren.addAll(childPositions);

        // è®¾ç½®å­èŠ‚点
        if (!allChildren.isEmpty()) {
            parent.setChildren(allChildren);

            // é€’归处理子部门（岗位无需递归，因为岗位是叶子节点）
            for (DeptPosition child : childDepts) {
                buildDeptChildren(child, allList); // å­éƒ¨é—¨ç»§ç»­æ‰¾å®ƒçš„子节点
            }
        }
    }
}

 src/main/java/com/ruoyi/lavorissue/service/impl/LaborConfServiceImpl.java

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.lavorissue.mapper.LaborConfMapper;
import com.ruoyi.lavorissue.pojo.LaborConf;
import com.ruoyi.lavorissue.service.LaborConfService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
 * @author :yys
 * @date : 2025/11/19 14:01
 */
@Service
@Slf4j
public class LaborConfServiceImpl extends ServiceImpl<LaborConfMapper, LaborConf> implements LaborConfService {

    @Autowired
    private LaborConfMapper laborConfMapper;

    @Override
    public AjaxResult listPage(Page page, LaborConf laborConf) {
        return AjaxResult.success(laborConfMapper.listPage(page, laborConf));
    }
}

 src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java

@@ -68,10 +68,14 @@
    private String nativePlace;

    /**
     * å²—位
     * éƒ¨é—¨å²—位id
     */
//    @Excel(name = "岗位")
    private Integer deptPositionId;

    @TableField(exist = false)
    @Excel(name = "岗位")
    private String postJob;
    private String deptPositionName;

    /**
     * å®¶åº­ä½å€

 src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java

@@ -57,10 +57,14 @@
    private String nativePlace;

    /**
     * å²—位
     * éƒ¨é—¨å²—位id
     */
//    @Excel(name = "岗位")
    private Integer deptPositionId;

    @TableField(exist = false)
    @Excel(name = "岗位")
    private String postJob;
    private String deptPositionName;

    /**
     * å®¶åº­ä½å€

 src/main/resources/application-jyhjCopy.yml

@@ -62,9 +62,9 @@
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://192.168.1.185:3306/product-inventory-management-jyhj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://localhost:3306/product-inventory-management-jyhj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: xd@123456..
        password: 123456
      # ä»Žåº“数据源
      slave:
        # ä»Žæ•°æ®æºå¼€å…³/默认关闭

 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml

@@ -20,7 +20,8 @@
        dm.maintenance_actually_name,
        dl.device_name,
        dl.device_model,
        su.user_name as create_user_name
        su.user_name as create_user_name,
        dm.maintenance_price
        from device_maintenance dm
        left join device_ledger dl on dm.device_ledger_id = dl.id
        left join sys_user su on dm.create_user = su.user_id

 src/main/resources/mapper/device/DeviceRepairMapper.xml

@@ -19,6 +19,7 @@
                dr.update_time,
                dr.create_user,
                dr.update_user,
               dr.repair_price,
               dr.tenant_id,
               dl.device_name,
               dl.device_model

 src/main/resources/mapper/lavorissue/LaborConfMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.lavorissue.mapper.LaborConfMapper">

    <select id="listPage" resultType="com.ruoyi.lavorissue.pojo.LaborConf">
        SELECT
        t1.*,
        t3.dict_label as dictName
        FROM labor_conf t1
        left join sys_dict_data t3 on t1.dict_id = t3.dict_value
        <where>
            <if test="req.deptPositionId != null">
                AND t1.dept_position_id = #{req.deptPositionId}
            </if>
        </where>
    </select>
</mapper>

 src/main/resources/mapper/lavorissue/LavorIssueMapper.xml

@@ -8,11 +8,13 @@
               t2.staff_name as staffName,
               t2.staff_no as staffNo,
               t3.dict_label as dictName,
               t4.dict_label as dictTypeName
               t4.dict_label as dictTypeName,
               t5.name as deptName
        from labor_issue t1
        left join staff_join_leave_record t2 on t1.staff_id = t2.id
        left join sys_dict_data t3 on t1.dict_id = t3.dict_value
        left join sys_dict_data t4 on t1.dict_type = t4.dict_value
        left join dept_position t5 on t1.dept_position_id = t5.id
        <where>
            <if test="req.season != null and req.season != ''">
                and (t1.issue_date &gt;= #{req.startDate} and t1.issue_date &lt;= #{req.endDate})
@@ -43,11 +45,13 @@
            t2.staff_name as staffName,
            t2.staff_no as staffNo,
            t3.dict_label as dictName,
            t4.dict_label as dictTypeName
            t4.dict_label as dictTypeName,
               t5.name as deptName
        from labor_issue t1
                 left join staff_join_leave_record t2 on t1.staff_id = t2.id
                 left join sys_dict_data t3 on t1.dict_id = t3.dict_value
                 left join sys_dict_data t4 on t1.dict_type = t4.dict_value
                                                   left join dept_position t5 on t1.dept_position_id = t5.id
        <where>
            <if test="req.adoptedDate != null">
                and t1.adopted_date is null

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

@@ -3,20 +3,22 @@
<mapper namespace="com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper">
    <select id="staffJoinLeaveRecordListPage" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
        SELECT
        *
        FROM staff_join_leave_record
        t1.*,
        t2.name as deptPositionName
        FROM staff_join_leave_record t1
        left join dept_position  t2 on t1.dept_position_id = t2.id and t2.type = 2
        where
        staff_state = #{staffJoinLeaveRecord.staffState}
        <if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
            AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
            AND t1.staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
        </if>
        <if test="staffJoinLeaveRecord.entryDateStart != null and staffJoinLeaveRecord.entryDateStart != '' ">
            and contract_start_time like concat('%',#{staffJoinLeaveRecord.entryDateStart},'%')
            and t1.contract_start_time like concat('%',#{staffJoinLeaveRecord.entryDateStart},'%')
        </if>
        <if test="staffJoinLeaveRecord.entryDateEnd != null and staffJoinLeaveRecord.entryDateEnd != '' ">
            and contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%')
            and t1.contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%')
        </if>
        order by create_time desc
        order by t1.create_time desc
    </select>
    <select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
        SELECT

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

@@ -3,20 +3,22 @@
<mapper namespace="com.ruoyi.staff.mapper.StaffOnJobMapper">
    <select id="staffOnJobListPage" resultType="com.ruoyi.staff.pojo.StaffOnJob">
        SELECT
        *
        FROM staff_on_job
        t1.*,
        t2.name as deptPositionName
        FROM staff_on_job t1
        left join dept_position t2 on t1.dept_position_id = t2.id and t2.type = 2
        where 1=1
        <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
        AND staff_state = #{staffOnJob.staffState}
        AND t1.staff_state = #{staffOnJob.staffState}
        </if>
        <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
            AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
            AND t1.staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
        </if>
        <if test="staffOnJob.entryDateStart != null and staffOnJob.entryDateStart != '' ">
            AND contract_expire_time &gt;= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d')
            AND t1.contract_expire_time &gt;= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d')
        </if>
        <if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' ">
            AND  contract_expire_time &lt;= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
            AND  t1.contract_expire_time &lt;= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
        </if>
    </select>
    <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffOnJob">