产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
gongchunyi
7 小时以前 47b42159fbe69fb2b4dbc13c75dd45abd00a55ae 
 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java


@@ -2,6 +2,7 @@




import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.ruoyi.account.mapper.AccountIncomeMapper;


import com.ruoyi.account.pojo.AccountExpense;


@@ -330,10 +331,10 @@


            // 当月的结束日期（每月最后一天）


            LocalDate monthEnd = currentMonth.withDayOfMonth(currentMonth.lengthOfMonth());




            // 构建当月的查询条件（如果想一次性查全4个月数据再内存筛选，可优化为先查全再循环筛选）


            // 构建当月的查询条件


            LambdaQueryWrapper<QualityInspect> queryWrapper = new LambdaQueryWrapper<>();


            queryWrapper.ge(QualityInspect::getCheckTime, monthStart)


                    .le(QualityInspect::getCheckTime, monthEnd); // 筛选当月数据


            queryWrapper.ge(QualityInspect::getCheckTime, monthStart.toString())


                    .le(QualityInspect::getCheckTime, monthEnd.toString());


            List<QualityInspect> monthInspects = qualityStatisticsMapper.selectList(queryWrapper);


            BigDecimal reduce = monthInspects.stream()


                    .filter(inspect -> inspect.getInspectType().equals(0))


@@ -1031,28 +1032,20 @@




    @Override


    public List<MapDto> salesPurchaseStorageProductCount() {


        LocalDate now = LocalDate.now();


        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");


        LocalDateTime now = LocalDateTime.now();


        LocalDateTime currentMonthStart = now.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);


        LocalDateTime lastMonth = now.minusMonths(1);


        LocalDateTime lastMonthStart = lastMonth.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);


        LocalDateTime lastMonthEnd = lastMonth.with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX);




        String currentMonthStart = now.with(TemporalAdjusters.firstDayOfMonth()).format(dtf);


        String currentMonthNow = now.format(dtf);




        LocalDate lastMonth = now.minusMonths(1);


        String lastMonthStart = lastMonth.with(TemporalAdjusters.firstDayOfMonth()).format(dtf);


        String lastMonthEnd = lastMonth.with(TemporalAdjusters.lastDayOfMonth()).format(dtf);




        // 销售


        int currentSales = salesLedgerProductMapper.selectProductCountByTypeAndDate(1, currentMonthStart,


                currentMonthNow);


        //  销售


        int currentSales = salesLedgerProductMapper.selectProductCountByTypeAndDate(1, currentMonthStart, now);


        int lastSales = salesLedgerProductMapper.selectProductCountByTypeAndDate(1, lastMonthStart, lastMonthEnd);




        // 采购


        int currentPurchase = salesLedgerProductMapper.selectProductCountByTypeAndDate(2, currentMonthStart,


                currentMonthNow);


        //  采购


        int currentPurchase = salesLedgerProductMapper.selectProductCountByTypeAndDate(2, currentMonthStart, now);


        int lastPurchase = salesLedgerProductMapper.selectProductCountByTypeAndDate(2, lastMonthStart, lastMonthEnd);




        // 储存


        int currentStorage = stockInventoryMapper.selectStorageProductCountByDate(currentMonthStart, currentMonthNow);


        //  储存


        int currentStorage = stockInventoryMapper.selectStorageProductCountByDate(currentMonthStart, now);


        int lastStorage = stockInventoryMapper.selectStorageProductCountByDate(lastMonthStart, lastMonthEnd);




        List<MapDto> list = new ArrayList<>();


@@ -1916,10 +1909,8 @@


        LocalDate startDate = range[0];


        LocalDate endDate = range[1];




        String startStr = startDate.atStartOfDay()


                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));


        String endStr = endDate.atTime(LocalTime.MAX)


                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));


        String startStr = startDate.toString();


        String endStr = endDate.toString();




        List<QualityInspect> list = qualityInspectMapper.selectList(


                new LambdaQueryWrapper<QualityInspect>()


@@ -2009,20 +2000,14 @@




    @Override


    public QualityInspectionCountDto qualityInspectionCount() {


        // 获取今天的开始和结束日期,包含时分秒


        LocalDateTime todayStart = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0);


        LocalDateTime todayEnd = LocalDateTime.now().withHour(23).withMinute(59).withSecond(59).withNano(0);


        // 获取前一天的开始和结束日期,包含时分秒


        LocalDateTime prevStart = todayStart.minusDays(1);


        LocalDateTime prevEnd = todayEnd.minusDays(1);


        String todayStr = LocalDate.now().toString();


        String prevDayStr = LocalDate.now().minusDays(1).toString();


        // 查询出截止今日的总检验数


        List<QualityInspect> todayList = qualityInspectMapper.selectList(new LambdaQueryWrapper<QualityInspect>()


                // .eq(QualityInspect::getInspectState, 1)


                .le(QualityInspect::getCheckTime, todayEnd));


                .le(QualityInspect::getCheckTime, todayStr));


        // 查询出截止前一天的总检验数


        List<QualityInspect> prevList = qualityInspectMapper.selectList(new LambdaQueryWrapper<QualityInspect>()


                // .eq(QualityInspect::getInspectState, 1)


                .le(QualityInspect::getCheckTime, prevEnd));


                .le(QualityInspect::getCheckTime, prevDayStr));


        // 计算今日的总检验数


        BigDecimal todayCount = todayList.stream()


                .map(QualityInspect::getQuantity)


@@ -2038,14 +2023,12 @@


        // 计算今天的待完成数量


        List<QualityInspect> todayPendingList = qualityInspectMapper.selectList(new LambdaQueryWrapper<QualityInspect>()


                .eq(QualityInspect::getInspectState, 0)


                .ge(QualityInspect::getCheckTime, todayStart)


                .le(QualityInspect::getCheckTime, todayEnd));


                .eq(QualityInspect::getCheckTime, todayStr));




        // 计算前一天的待完成数量


        List<QualityInspect> prevPendingList = qualityInspectMapper.selectList(new LambdaQueryWrapper<QualityInspect>()


                .eq(QualityInspect::getInspectState, 0)


                .ge(QualityInspect::getCheckTime, prevStart)


                .le(QualityInspect::getCheckTime, prevEnd));


                .eq(QualityInspect::getCheckTime, prevDayStr));


        // 计算今天的待完成数量


        BigDecimal todayPendingCount = todayPendingList.stream()


                .map(QualityInspect::getQuantity)


@@ -2061,14 +2044,12 @@


        List<QualityInspect> todayCompletedList = qualityInspectMapper


                .selectList(new LambdaQueryWrapper<QualityInspect>()


                        .eq(QualityInspect::getInspectState, 1)


                        .ge(QualityInspect::getCheckTime, todayStart)


                        .le(QualityInspect::getCheckTime, todayEnd));


                        .eq(QualityInspect::getCheckTime, todayStr));


        // 计算前一天的已完成数量


        List<QualityInspect> prevCompletedList = qualityInspectMapper


                .selectList(new LambdaQueryWrapper<QualityInspect>()


                        .eq(QualityInspect::getInspectState, 1)


                        .ge(QualityInspect::getCheckTime, prevStart)


                        .le(QualityInspect::getCheckTime, prevEnd));


                        .eq(QualityInspect::getCheckTime, prevDayStr));


        // 计算今天的已完成数量


        BigDecimal todayCompletedCount = todayCompletedList.stream()


                .map(QualityInspect::getQuantity)


@@ -2101,18 +2082,16 @@




    @Override


    public NonComplianceWarningDto nonComplianceWarning() {




        // 近七天时间区间


        LocalDateTime[] range = lastSevenDaysRange();


        LocalDateTime startTime = range[0];


        LocalDateTime endTime = range[1];


        String[] range = lastSevenDaysDateRange();


        String startStr = range[0];


        String endStr = range[1];




        // 查询近七天已处理不合格数据


        List<QualityUnqualified> list = qualityUnqualifiedMapper.selectList(


                new LambdaQueryWrapper<QualityUnqualified>()


                        .eq(QualityUnqualified::getInspectState, 1)


                        .ge(QualityUnqualified::getCheckTime, startTime)


                        .le(QualityUnqualified::getCheckTime, endTime));


                        .ge(QualityUnqualified::getCheckTime, startStr)


                        .le(QualityUnqualified::getCheckTime, endStr));




        NonComplianceWarningDto dto = new NonComplianceWarningDto();




@@ -2211,29 +2190,24 @@


    }




    /**


     * 获取近七天的时间区间（包含今天）


     * 获取近七天的日期区间（仅含年月日）


     */


    public static LocalDateTime[] lastSevenDaysRange() {


    public static String[] lastSevenDaysDateRange() {


        LocalDate today = LocalDate.now();




        LocalDateTime startTime = today.minusDays(6).atStartOfDay();


        LocalDateTime endTime = today.atTime(23, 59, 59);




        return new LocalDateTime[] { startTime, endTime };


        return new String[] { today.minusDays(6).toString(), today.toString() };


    }




    @Override


    public List<CompletedInspectionCountDto> completedInspectionCount() {


        // 近七天时间区间


        LocalDateTime[] range = lastSevenDaysRange();


        LocalDateTime startTime = range[0];


        LocalDateTime endTime = range[1];


        String[] range = lastSevenDaysDateRange();


        String startStr = range[0];


        String endStr = range[1];




        // 查询近七天已完成的检验数据


        List<QualityInspect> list = qualityInspectMapper.selectList(new LambdaQueryWrapper<QualityInspect>()


                .eq(QualityInspect::getInspectState, 1)


                .ge(QualityInspect::getCheckTime, startTime)


                .le(QualityInspect::getCheckTime, endTime));


                .ge(QualityInspect::getCheckTime, startStr)


                .le(QualityInspect::getCheckTime, endStr));




        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM-dd");




@@ -2440,8 +2414,8 @@




        List<QualityInspect> qualityInspectList = qualityInspectMapper


                .selectList(new LambdaQueryWrapper<QualityInspect>()


                        .ge(QualityInspect::getCheckTime, startDate)


                        .le(QualityInspect::getCheckTime, endDate)


                        .ge(QualityInspect::getCheckTime, startDate.toString())


                        .le(QualityInspect::getCheckTime, endDate.toString())


                        .eq(QualityInspect::getInspectState, 1));




        QualityStatisticsDto dto = new QualityStatisticsDto();


@@ -2453,6 +2427,9 @@


        Map<String, List<QualityInspect>> groupedByCheckResult = qualityInspectList.stream()


                .collect(Collectors.groupingBy(QualityInspect::getCheckResult));


        List<QualityInspect> qualityInspects = groupedByCheckResult.get("不合格");


        if(ObjectUtils.isNull(qualityInspects) || qualityInspects.size()==0){


            return null;


        }


        // 4. 处理图表项 (Item)


        List<QualityStatisticsItem> itemList = new ArrayList<>();




@@ -2547,4 +2524,4 @@




        return productProcessMapper.calculateProductionStatistics(startDateTime, endDateTime, userId, processIds);


    }


}


}