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<>();
@@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.mes.md.entity.*; import com.mes.md.entity.Machine; import com.mes.md.entity.PrimitiveTask; import com.mes.md.entity.Tasking; import com.mes.md.mapper.PrimitiveTaskMapper; import com.mes.md.service.KBBTJPDrawingBPService; import com.mes.md.service.LineConfigurationService; import com.mes.md.service.PrimitiveTaskService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -123,7 +124,7 @@ tasking.setSilkScreenX(primitiveTask.getSilkScreenX()==null?0:primitiveTask.getSilkScreenX()); tasking.setSilkScreenY(primitiveTask.getSilkScreenY()==null?0:primitiveTask.getSilkScreenY()); tasking.setTaskSequence(primitiveTask.getTaskSequence()); tasking.setTaskQuantity(primitiveTask.getTaskQuantity()); tasking.setTaskQuantity(1); tasking.setR_1_1(primitiveTask.getR_1_1()==null?0:primitiveTask.getR_1_1()); tasking.setR_1_2(primitiveTask.getR_1_2()==null?0:primitiveTask.getR_1_2()); tasking.setR_2_1(primitiveTask.getR_2_1()==null?0:primitiveTask.getR_2_1());
