fix bug

2026-08-14 14:45:39 +08:00
parent 2373d62ceb
commit 1ca36ae153
7 changed files with 21 additions and 9 deletions
@@ -57,6 +57,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -127,6 +128,8 @@ public class FileTaskServiceImpl extends ServiceImpl<FileTaskMapper, FileTask> i
        addParam.setUploadId(uploadId);
        // 正在上传
        addParam.setStatus(FileTaskStatus.UPLOADING.getCode());
+        // 文件任务创建即代表上传开始，显式记录时间，避免依赖自动填充导致上传时间为空。
+        addParam.setCreateTime(new Date());
        // 兼容历史表未配置 is_deleted 默认值的场景。
        addParam.setIsDeleted(0);
        this.save(addParam);
@@ -344,7 +347,8 @@ public class FileTaskServiceImpl extends ServiceImpl<FileTaskMapper, FileTask> i
 			.eq(StringUtil.isNotBlank(businessId), FileTask::getBusinessId, businessId)
 			.like(StringUtil.isNotBlank(attachmentName), FileTask::getAttachmentName, attachmentName)
 			.eq(StringUtil.isNotBlank(status), FileTask::getStatus, status)
-			.orderByDesc(FileTask::getCreateTime));
+			.orderByDesc(FileTask::getCreateTime)
+			.orderByDesc(FileTask::getId));
 		return page.convert(this::getFileTaskUpdateVO);
 	}

@@ -615,7 +615,7 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 	}

 	private synchronized String nextCode() {
-		String prefix = "PZ" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "-";
+		String prefix = "PZ-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "-";
 		List<LoadingManage> latestList = list(Wrappers.<LoadingManage>lambdaQuery()
 			.select(LoadingManage::getLoadingNo)
 			.likeRight(LoadingManage::getLoadingNo, prefix)
@@ -455,5 +455,5 @@ public class MasterOrderServiceImpl extends BaseServiceImpl<MasterOrderMapper, M
 	private LocalDate date(Map<String, Object> values, String key) { String value = string(values, key); if (Func.isEmpty(value)) return null; try { return LocalDate.parse(value.substring(0, 10)); } catch (Exception exception) { throw new ServiceException("日期格式不正确"); } }
 	private String string(Map<String, Object> values, String key) { return string(values, key, null); }
 	private String string(Map<String, Object> values, String key, String fallback) { Object value = values.get(key); return value == null ? fallback : String.valueOf(value); }
-	private synchronized String nextCode() { String prefix = "DL" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); long count = count(new LambdaQueryWrapper<MasterOrder>().likeRight(MasterOrder::getMasterNo, prefix)); return prefix + String.format("%04d", count + 1); }
+	private synchronized String nextCode() { String prefix = "DL-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "-"; long count = count(new LambdaQueryWrapper<MasterOrder>().likeRight(MasterOrder::getMasterNo, prefix)); return prefix + String.format("%04d", count + 1); }
 }
@@ -46,10 +46,12 @@ import org.springblade.transport.pojo.entity.TransportPlan;
 import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.pojo.vo.BusinessRemoveResultVO;
 import org.springblade.transport.pojo.vo.TransportPlanVO;
+import org.springblade.transport.pojo.vo.WaybillVO;
 import org.springblade.transport.service.ITransportPlanService;
 import org.springblade.transport.service.IWaybillService;
 import org.springblade.transport.support.TransportBusinessSupport;
 import org.springblade.transport.wrapper.TransportPlanWrapper;
+import org.springblade.transport.wrapper.WaybillWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

@@ -369,11 +371,12 @@ public class TransportPlanServiceImpl extends BaseServiceImpl<TransportPlanMappe
 			plans.forEach(plan -> plan.setDispatchRows(Collections.emptyList()));
 			return;
 		}
-		Map<Long, List<Waybill>> waybillsByPlanId = waybillService.list(Wrappers.<Waybill>lambdaQuery()
+		Map<Long, List<WaybillVO>> waybillsByPlanId = waybillService.list(Wrappers.<Waybill>lambdaQuery()
 			.eq(Waybill::getIsDeleted, 0)
 			.in(Waybill::getPlanId, planIds))
 			.stream()
-			.collect(Collectors.groupingBy(Waybill::getPlanId));
+			.map(WaybillWrapper.build()::entityVO)
+			.collect(Collectors.groupingBy(WaybillVO::getPlanId));
 		plans.forEach(plan -> plan.setDispatchRows(
 			waybillsByPlanId.getOrDefault(plan.getId(), Collections.emptyList())
 		));
@@ -522,7 +525,7 @@ public class TransportPlanServiceImpl extends BaseServiceImpl<TransportPlanMappe
 	}

 	private synchronized String nextCode() {
-		String prefix = "JH-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
+		String prefix = "JH-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "-";
 		List<TransportPlan> latestList = list(Wrappers.<TransportPlan>lambdaQuery()
 			.select(TransportPlan::getPlanNo)
 			.likeRight(TransportPlan::getPlanNo, prefix)
@@ -816,7 +816,7 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 	}

 	private synchronized String nextCode() {
-		String prefix = "YD" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
+		String prefix = "YD-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "-";
 		List<Waybill> latestList = list(Wrappers.<Waybill>lambdaQuery()
 			.select(Waybill::getWaybillNo)
 			.likeRight(Waybill::getWaybillNo, prefix)