huang
2025-07-03 3ee9005c437133466125f6a71ebe008b0bc701b9
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
@@ -193,9 +193,13 @@
        int dayCount = lastDayCal.get(Calendar.DAY_OF_MONTH);
        QueryWrapper<TaskingLog> queryWrapper = new QueryWrapper<>();
        queryWrapper.select("CAST(operation_record_time AS DATE) AS CreateDate,ifNull(sum(task_quantity),0) as task_quantity_sum,ifNull(sum(length*width*task_quantity)/1000000,0) as area_sum")
                .ge("operation_record_time",startDate).le("operation_record_time",endDate).eq("work_state","完工").groupBy("CAST(operation_record_time AS DATE)")
                .orderByAsc("CAST(operation_record_time AS DATE)");;
        queryWrapper.select("CAST(operation_record_time AS DATE) AS CreateDate,ifNull(sum(task_quantity),0) as task_quantity_sum,ifNull(sum(length*width)/1000000,0) as area_sum")
                .ge("operation_record_time",startDate).le("operation_record_time",endDate)
                .in("operation_record","旋转1","旋转2")
                .eq("operation_mode","结束")
                .eq("work_state","完工")
                .groupBy("CAST(operation_record_time AS DATE)")
                .orderByAsc("CAST(operation_record_time AS DATE)");
        List<Map> list=taskingLogMapper.selectMaps((QueryWrapper)queryWrapper);
        List<Map> resultDate=new ArrayList<>();