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

liyong

2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

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

@@ -9,8 +9,7 @@
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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
@@ -20,14 +19,12 @@
import java.util.List;
import java.util.Map;

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

    @Autowired
    private StaffOnJobMapper staffOnJobMapper;
    private final StaffLeaveMapper staffLeaveMapper;
    private final StaffOnJobMapper staffOnJobMapper;

    @Override
    public List<StaffLeaveDto> staffLeaveReasonAnalytics() {