From e42b8d0ba9fdf984ea8e1c28f71c112139281e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 18 Mar 2026 19:34:00 +0800 Subject: [PATCH] =?UTF-8?q?bms2=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lease/LeaseApplicationService.java | 22 ++++++++++++++++++- .../mapper/basic/ScheduledTaskMapper.xml | 4 ++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java index dd2c3ab74..bd87f0778 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -12,6 +12,8 @@ import com.mhd.basic.domain.lease.repository.facade.ILeaseService; import com.mhd.basic.domain.lease.repository.po.LeasePO; import com.mhd.basic.domain.lease.repository.todo.LeaseDO; import com.mhd.basic.domain.lease.service.LeaseDomainService; +import com.mhd.basic.domain.scheduledTask.entity.ScheduledTask; +import com.mhd.basic.domain.scheduledTask.repository.mapper.ScheduledTaskMapper; import com.mhd.basic.domain.shipperLeaseDetails.entity.ShipperLeaseDetails; import com.mhd.basic.domain.shipperLeaseDetails.entity.WarehouseOccupancyRate; import com.mhd.basic.domain.shipperLeaseDetails.repository.facade.IShipperLeaseDetailsService; @@ -79,6 +81,9 @@ public class LeaseApplicationService { @Autowired private WmsServiceFeign WmsServiceFeign; + @Autowired + private ScheduledTaskMapper scheduledTaskMapper; + /** * 分页查询租赁管理列表 */ @@ -154,7 +159,22 @@ public class LeaseApplicationService { throw new ServiceException("同一货主租赁信息时间不能重叠"); } setWarehouseInfo(leaseDO); - return leaseDomainService.insert(leaseDO); + Boolean insert = leaseDomainService.insert(leaseDO); + if (insert) { + ScheduledTask scheduledTask = new ScheduledTask(); + scheduledTask.setTaskType("shipperLeaseDetails"); + scheduledTask.setTaskStatus("PENDING"); + scheduledTask.setBusId(leaseDO.getId()); + scheduledTask.setTaskData(JSON.toJSONString(scheduledTask)); + scheduledTask.setCreateTime(new Date()); + scheduledTask.setBillDays(leaseDO.getBillDays()); + scheduledTask.setBillTime(leaseDO.getBillTime()); + scheduledTask.setRetryCount(0); + scheduledTask.setExecuteTime(DateUtil.beginOfDay(DateUtil.tomorrow())); + scheduledTask.setDelFlag(1); + scheduledTaskMapper.insert(scheduledTask); + } + return insert; } private void setWarehouseInfo(LeaseDO leaseDO) { diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ScheduledTaskMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ScheduledTaskMapper.xml index 7c73c94cc..f6cbaaeef 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ScheduledTaskMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ScheduledTaskMapper.xml @@ -28,12 +28,12 @@ FROM scheduled_task WHERE TO_DATE( - TO_CHAR(SYSDATE, 'YYYY-MM-') || PUSH_TIME, + TO_CHAR(SYSDATE, 'YYYY-MM-') || bill_days || ' ' || bill_time, 'YYYY-MM-DD HH24:MI:SS' ) BETWEEN #{startTime} AND #{endTime} and task_status = #{status} ORDER BY TO_DATE( - TO_CHAR(SYSDATE, 'YYYY-MM-') || PUSH_TIME, + TO_CHAR(SYSDATE, 'YYYY-MM-') || bill_days || ' ' || bill_time, 'YYYY-MM-DD HH24:MI:SS' ) ASC LIMIT #{limit}