From bcee164f488d30335933862dbc0bc3ca5ac16ac7 Mon Sep 17 00:00:00 2001 From: zt Date: Mon, 3 Nov 2025 19:58:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/org/dromara/test/DemoTest.java | 10 ++++++++-- .../vehicle/controller/VehVehicleTripController.java | 4 ++-- .../controller/app/VehVehicleTripAppController.java | 4 ++-- .../vehicle/service/IVehVehicleTripService.java | 2 +- .../service/impl/VehVehicleTripServiceImpl.java | 8 +++++--- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java b/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java index c0b4bcfc..5a92d34c 100644 --- a/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java +++ b/xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java @@ -135,7 +135,7 @@ public class DemoTest { log.info("执行定时任务：同步 {}至{} 计划详情到施工产值", lastMonday, lastSunday); Boolean synced = progressPlanDetailService.syncPlanDetail2ConstructionValue(lastMonday, lastSunday, null);*/ LocalDate start = LocalDate.of(2024, 1, 1); // 起始时间（2024-01-01） - LocalDate end = LocalDate.of(2025, 10, 20); // 截止时间（2025-09-15） + LocalDate end = LocalDate.of(2025, 10, 27); // 截止时间（2025-09-15） // 如果起始不是周一，调整到当周的周一 if (start.getDayOfWeek() != DayOfWeek.MONDAY) { @@ -150,12 +150,18 @@ public class DemoTest { System.out.println(monday + " ~ " + sunday); log.info("执行定时任务：同步 {}至{} 计划详情到施工产值", monday, sunday); // Boolean synced = progressPlanDetailService.syncPlanDetail2ConstructionValue(start, now, null); + List list = projectService.lambdaQuery() + .eq(BusProject::getPId, 1968506669544656898L) + .list(); + List list1 = new ArrayList<>(list.stream().map(BusProject::getId).toList()); + list1.add(1968506669544656898L); // 获取范围时间内的计划详情 List planDetailList = progressPlanDetailService.lambdaQuery() + .in(PgsProgressPlanDetail::getProjectId, list1) .ge(PgsProgressPlanDetail::getDate, monday) .le(PgsProgressPlanDetail::getDate, sunday) .ne(PgsProgressPlanDetail::getFinishedNumber, BigDecimal.ZERO) -// .eq(PgsProgressPlanDetail::getStatus, "1") + .eq(PgsProgressPlanDetail::getStatus, "1") .list(); if (CollUtil.isEmpty(planDetailList)) { // 下一周 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java index 364ab71e..83eb720b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java @@ -84,8 +84,8 @@ public class VehVehicleTripController extends BaseController { @Log(title = "车辆出行记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated @RequestBody VehVehicleTripCreateReq req) { - return toAjax(vehVehicleTripService.insertByBo(req)); + public R add(@Validated @RequestBody VehVehicleTripCreateReq req) { + return R.ok(vehVehicleTripService.insertByBo(req)); } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/app/VehVehicleTripAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/app/VehVehicleTripAppController.java index 41a25fc6..eb6e0856 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/app/VehVehicleTripAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/app/VehVehicleTripAppController.java @@ -66,8 +66,8 @@ public class VehVehicleTripAppController extends BaseController { @Log(title = "车辆出行记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated @RequestBody VehVehicleTripCreateReq req) { - return toAjax(vehicleTripService.insertByBo(req)); + public R add(@Validated @RequestBody VehVehicleTripCreateReq req) { + return R.ok(vehicleTripService.insertByBo(req)); } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/IVehVehicleTripService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/IVehVehicleTripService.java index 962d7a65..10cc25b5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/IVehVehicleTripService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/IVehVehicleTripService.java @@ -66,7 +66,7 @@ public interface IVehVehicleTripService extends IService { * @param req 车辆出行记录 * @return 是否新增成功 */ - Boolean insertByBo(VehVehicleTripCreateReq req); + Long insertByBo(VehVehicleTripCreateReq req); /** * 修改车辆出行记录 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/impl/VehVehicleTripServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/impl/VehVehicleTripServiceImpl.java index 736b0658..7a5c7e36 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/impl/VehVehicleTripServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/service/impl/VehVehicleTripServiceImpl.java @@ -211,7 +211,7 @@ public class VehVehicleTripServiceImpl extends ServiceImpl