ERP_override.git

			@@ -7,6 +7,7 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.example.erp.common.AsyncQueryExecutor;
			import com.example.erp.common.Constants;
			import com.example.erp.dto.pp.OrderNumberTransferDTO;
			import com.example.erp.entity.pp.*;
			@@ -34,12 +35,16 @@
			import org.springframework.transaction.interceptor.TransactionAspectSupport;
			import org.springframework.web.client.RestTemplate;


			import javax.annotation.PreDestroy;
			import javax.annotation.Resource;
			import java.text.SimpleDateFormat;
			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.time.LocalTime;
			import java.time.format.DateTimeFormatter;
			import java.util.*;
			import java.util.concurrent.CompletableFuture;

			@Service
			@DS("pp")
			@@ -70,7 +75,8 @@
			private final BasicDataMapper basicDataMapper;
			private final FinishedGoodsInventoryService finishedGoodsInventoryService;


			@Resource
			private AsyncQueryExecutor asyncExecutor;
			/*public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper, LogService logService, LogMapper logMapper, OrderGlassDetailMapper orderGlassDetailMapper, SysErrorService sysErrorService, OrderDetailMapper orderDetailMapper, FinishedOperateLogMapper finishedOperateLogMapper, ReportingWorkTransferMapper reportingWorkTransferMapper) {
			this.reportingWorkMapper = reportingWorkMapper;
			this.basicDateProduceMapper = basicDateProduceMapper;
			@@ -811,13 +817,48 @@
			}

			//报工管理查询
			public Map<String, Object> selectReportingWorkSv(Integer pageNum, Integer pageSize, List<String> selectDate, String orderId, ReportingWork reportingWork) {
			// public Map<String, Object> selectReportingWorkSv(Integer pageNum, Integer pageSize, List<String> selectDate, String orderId, ReportingWork reportingWork) {
			// Integer offset = (pageNum - 1) * pageSize;
			// if ("null".equals(orderId)) {
			// orderId = "";
			// }
			// String endDate = LocalDate.now().toString();
			// String startDate = LocalDate.now().minusDays(3).toString();
			// if(selectDate !=null && selectDate.size()==2){
			// if(!selectDate.get(0).isEmpty()){
			// startDate = selectDate.get(0);
			// }
			// if(!selectDate.get(1).isEmpty()){
			// endDate = selectDate.get(1);
			// }
			// }
			// Map<String, Object> map = new HashMap<>();
			// map.put("data", reportingWorkMapper.selectReportingWorkMp(offset, pageSize, startDate, endDate, orderId, reportingWork));
			// map.put("total" ,reportingWorkMapper.getFootSum(offset, pageSize, startDate, endDate, orderId, reportingWork));
			// List<String> list = new ArrayList<>();
			// list.add(startDate);
			// list.add(endDate);
			// map.put("selectDate",list);
			// return map;
			// }


			public Map<String, Object> selectReportingWorkSv(
			Integer pageNum, Integer pageSize,
			List<String> selectDate, String orderId,
			ReportingWork reportingWork) {

			Integer offset = (pageNum - 1) * pageSize;

			if ("null".equals(orderId)) {
			orderId = "";
			}

			// 默认时间：最近 3 天
			String endDate = LocalDate.now().toString();
			String startDate = LocalDate.now().minusDays(3).toString();

			// 如果传入自定义日期
			if(selectDate !=null && selectDate.size()==2){
			if(!selectDate.get(0).isEmpty()){
			startDate = selectDate.get(0);
			@@ -826,15 +867,42 @@
			endDate = selectDate.get(1);
			}
			}
			Map<String, Object> map = new HashMap<>();
			map.put("data", reportingWorkMapper.selectReportingWorkMp(offset, pageSize, startDate, endDate, orderId, reportingWork));
			// map.put("total", reportingWorkMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
			map.put("total" ,reportingWorkMapper.getFootSum(offset, pageSize, startDate, endDate, orderId, reportingWork));

			Map<String, Object> result = new HashMap<>();

			try {
			// 并行执行两条 SQL 查询
			String finalStartDate = startDate;
			String finalEndDate = endDate;
			String finalOrderId = orderId;
			CompletableFuture<List<ReportingWork>> dataFuture =
			asyncExecutor.runAsync(() ->
			reportingWorkMapper.selectReportingWorkMp(
			offset, pageSize, finalStartDate, finalEndDate, finalOrderId, reportingWork));

			CompletableFuture<Map<String, Float>> totalFuture =
			asyncExecutor.runAsync(() ->
			reportingWorkMapper.getFootSum(
			offset, pageSize, finalStartDate, finalEndDate, finalOrderId, reportingWork));

			// 等待全部完成
			CompletableFuture.allOf(dataFuture, totalFuture).join();

			result.put("data", dataFuture.get());
			result.put("total", totalFuture.get());

			// 日期范围
			List<String> list = new ArrayList<>();
			list.add(startDate);
			list.add(endDate);
			map.put("selectDate",list);
			return map;
			result.put("selectDate", list);

			} catch (Exception e) {
			e.printStackTrace();
			throw new RuntimeException("并行查询报工记录异常：" + e.getMessage(), e);
			}

			return result;
			}

			//删除报工