迁移pro

liyong

14 小时以前 1ca5584d7e3200a9af65a099bd26d3593e2ba702

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

@@ -47,8 +47,8 @@
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.stock.mapper.StockInventoryMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

@@ -68,73 +68,56 @@
 */
@Service
@Slf4j
@RequiredArgsConstructor
public class HomeServiceImpl implements HomeService {

    @Autowired
    private SalesLedgerMapper salesLedgerMapper;
    private final SalesLedgerMapper salesLedgerMapper;

    @Autowired
    private PurchaseLedgerMapper purchaseLedgerMapper;
    private final PurchaseLedgerMapper purchaseLedgerMapper;

    @Autowired
    private SalesLedgerProductMapper salesLedgerProductMapper;
    private final SalesLedgerProductMapper salesLedgerProductMapper;

    @Autowired
    private StockInventoryMapper stockInventoryMapper;
    private final StockInventoryMapper stockInventoryMapper;

    @Autowired
    private QualityInspectMapper qualityStatisticsMapper;
    private final QualityInspectMapper qualityStatisticsMapper;

    @Autowired
    private ApproveProcessMapper approveProcessMapper;
    private final ApproveProcessMapper approveProcessMapper;

    @Autowired
    private ReceiptPaymentMapper receiptPaymentMapper;
    private final ReceiptPaymentMapper receiptPaymentMapper;

    @Autowired
    private PaymentRegistrationMapper paymentRegistrationMapper;
    private final PaymentRegistrationMapper paymentRegistrationMapper;

    @Autowired
    private SysDeptMapper sysDeptMapper;
    private final SysDeptMapper sysDeptMapper;

    @Autowired
    private NoticeMapper noticeMapper;
    private final NoticeMapper noticeMapper;

    @Autowired
    private ProductionOrderMapper productionOrderMapper;
    private final ProductionOrderMapper productionOrderMapper;

    @Autowired
    private ProductMapper productMapper;
    private final ProductMapper productMapper;

    @Autowired
    private StaffOnJobMapper staffOnJobMapper;
    private final StaffOnJobMapper staffOnJobMapper;

    @Autowired
    private CustomerMapper customerMapper;
    private final CustomerMapper customerMapper;

    @Autowired
    private SupplierManageMapper supplierManageMapper;
    private final SupplierManageMapper supplierManageMapper;

    @Autowired
    private HomeMapper homeMapper;
    private final HomeMapper homeMapper;

    @Autowired
    private ProductionProductOutputMapper productionProductOutputMapper;
    private final ProductionProductOutputMapper productionProductOutputMapper;

    @Autowired
    private QualityInspectMapper qualityInspectMapper;
    private final QualityInspectMapper qualityInspectMapper;

    @Autowired
    private QualityUnqualifiedMapper qualityUnqualifiedMapper;
    private final QualityUnqualifiedMapper qualityUnqualifiedMapper;

    @Autowired
    private ProductionOperationTaskMapper productionOperationTaskMapper;
    
    @Autowired
    private AccountExpenseMapper accountExpenseMapper;
    private final ProductionOperationTaskMapper productionOperationTaskMapper;

    @Autowired
    private AccountIncomeMapper accountIncomeMapper;
    private final AccountExpenseMapper accountExpenseMapper;

    private final AccountIncomeMapper accountIncomeMapper;

    private final ProductionAccountMapper productionAccountMapper;

    private final ProductionProductInputMapper productionProductInputMapper;

    @Override
    public HomeBusinessDto business() {
@@ -511,7 +494,7 @@
                .reduce(BigDecimal.ZERO, BigDecimal::add);
    }

    @Autowired

    private DeviceRepairMapper deviceRepairMapper;

    @Override
@@ -1486,9 +1469,6 @@
        return dto;
    }

    @Autowired
    private ProductionProductInputMapper productionProductInputMapper;

    @Override
    public List<InputOutputAnalysisDto> inputOutputAnalysis(Integer type) {
        LocalDate today = LocalDate.now();
@@ -1519,7 +1499,8 @@
        String endStr = endDate.atStartOfDay()
                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));

        List<Map<String, Object>> inputList = productionProductInputMapper.selectInputStats(startStr, endStr);
//        List<Map<String, Object>> inputList = productionProductInputMapper.selectInputStats(startStr, endStr);
        List<Map<String, Object>> inputList = null;
        List<Map<String, Object>> outputList = productionProductOutputMapper.selectDailyOutputStats(startStr, endStr);

        Map<String, InputOutputAnalysisDto> dateMap = new HashMap<>();
@@ -1745,8 +1726,6 @@
                .collect(Collectors.toList());
    }

    @Autowired
    private ProductionAccountMapper salesLedgerProductionAccountingMapper;

    @Override
    public List<ProductionAccountingDto> productionAccountingAnalysis(Integer type) {
@@ -1775,7 +1754,7 @@

        String endStr = endDate.plusDays(1).atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));

        List<Map<String, Object>> wagesList = salesLedgerProductionAccountingMapper.selectDailyWagesStats(startStr,
        List<Map<String, Object>> wagesList = productionAccountMapper.selectDailyWagesStats(startStr,
                endStr);

        if (CollectionUtils.isEmpty(wagesList)) {