diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/remind/InformMonthly.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/remind/InformMonthly.java index 0324bd94..bc31b649 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/remind/InformMonthly.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/remind/InformMonthly.java @@ -30,7 +30,7 @@ public class InformMonthly { * - 星期(?):表示星期,由于每月第一天的星期不固定,因此使用?表示。 * - 年份(空):不指定年份,表示每年都执行。 */ - @Scheduled(cron = "0 0 1 * * ?") + //@Scheduled(cron = "0 0 1 * * ?") public void taskCycle() { System.out.println("使用SpringMVC框架配置定时任务"); try { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java index f3dab667..4fd882e3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java @@ -1303,14 +1303,22 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService { // 计算租赁天数 long leaseDays = calculateDaysBetween(calcStartTime, calcEndTime); + // 计算租赁费用 BigDecimal leaseCost = BigDecimal.ZERO; if (result.getComsumable() != null && result.getComsumable() == 1) { + Date startTime =result.getStartTime(); + long startDays = calculateDaysBetween(startTime, calcEndTime); + if (result.getNum() == null) { result.setNum(BigDecimal.ZERO); } - // 消耗性物资直接计算购置价 - result.setConsumeCost(result.getNum().multiply(Optional.ofNullable(result.getBuyPrice()).orElse(BigDecimal.ZERO))); + + if(startDays >0) { + // 消耗性物资直接计算购置价 + result.setConsumeCost(result.getNum().multiply(Optional.ofNullable(result.getBuyPrice()).orElse(BigDecimal.ZERO))); + } + } if (result.getNum() != null && result.getLeasePrice() != null && leaseDays >= 1) { // 非消耗性物资按照租赁单价计算租赁费用 @@ -1456,7 +1464,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService { Calendar endCal = Calendar.getInstance(); endCal.setTime(endDate); - // 将结束时间设为当天00:00:00.000 + // 将结束时间设为当天00:00:00.000 endCal.set(Calendar.HOUR_OF_DAY, 0); endCal.set(Calendar.MINUTE, 0); endCal.set(Calendar.SECOND, 0); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml index 5e88152f..e644c6b4 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml @@ -434,8 +434,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item.leasePrice}, #{item.leaseCost}, #{item.taskId}, - null, - 0.00, + #{item.buyPrice}, + #{item.consumeCost}, #{item.equipmentType} )