bms2相关修改;
This commit is contained in:
+21
-1
@@ -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.po.LeasePO;
|
||||||
import com.mhd.basic.domain.lease.repository.todo.LeaseDO;
|
import com.mhd.basic.domain.lease.repository.todo.LeaseDO;
|
||||||
import com.mhd.basic.domain.lease.service.LeaseDomainService;
|
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.ShipperLeaseDetails;
|
||||||
import com.mhd.basic.domain.shipperLeaseDetails.entity.WarehouseOccupancyRate;
|
import com.mhd.basic.domain.shipperLeaseDetails.entity.WarehouseOccupancyRate;
|
||||||
import com.mhd.basic.domain.shipperLeaseDetails.repository.facade.IShipperLeaseDetailsService;
|
import com.mhd.basic.domain.shipperLeaseDetails.repository.facade.IShipperLeaseDetailsService;
|
||||||
@@ -79,6 +81,9 @@ public class LeaseApplicationService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private WmsServiceFeign WmsServiceFeign;
|
private WmsServiceFeign WmsServiceFeign;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ScheduledTaskMapper scheduledTaskMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页查询租赁管理列表
|
* 分页查询租赁管理列表
|
||||||
*/
|
*/
|
||||||
@@ -154,7 +159,22 @@ public class LeaseApplicationService {
|
|||||||
throw new ServiceException("同一货主租赁信息时间不能重叠");
|
throw new ServiceException("同一货主租赁信息时间不能重叠");
|
||||||
}
|
}
|
||||||
setWarehouseInfo(leaseDO);
|
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) {
|
private void setWarehouseInfo(LeaseDO leaseDO) {
|
||||||
|
|||||||
@@ -28,12 +28,12 @@
|
|||||||
FROM scheduled_task
|
FROM scheduled_task
|
||||||
WHERE
|
WHERE
|
||||||
TO_DATE(
|
TO_DATE(
|
||||||
TO_CHAR(SYSDATE, 'YYYY-MM-') || PUSH_TIME,
|
TO_CHAR(SYSDATE, 'YYYY-MM-') || bill_days || ' ' || bill_time,
|
||||||
'YYYY-MM-DD HH24:MI:SS'
|
'YYYY-MM-DD HH24:MI:SS'
|
||||||
) BETWEEN #{startTime} AND #{endTime}
|
) BETWEEN #{startTime} AND #{endTime}
|
||||||
and task_status = #{status}
|
and task_status = #{status}
|
||||||
ORDER BY TO_DATE(
|
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'
|
'YYYY-MM-DD HH24:MI:SS'
|
||||||
) ASC
|
) ASC
|
||||||
LIMIT #{limit}
|
LIMIT #{limit}
|
||||||
|
|||||||
Reference in New Issue
Block a user