|
@@ -1678,7 +1678,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
|
|
vo.setNoMovingPinReminder(noMovingPinReminders);
|
|
vo.setNoMovingPinReminder(noMovingPinReminders);
|
|
//过期提醒
|
|
//过期提醒
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
- extendList.stream().filter(v -> v.getInventory().doubleValue() > 0 && v.getProductionDate() != null && v.getExpiryNum() != null)
|
|
|
|
|
|
+ extendList.stream().filter(v -> v.getInventory() != null && v.getInventory().doubleValue() > 0 && v.getProductionDate() != null && v.getExpiryNum() != null)
|
|
.forEach(v ->{
|
|
.forEach(v ->{
|
|
if (DateUtils.differentDaysByMillisecond(v.getProductionDate(),new Date()) > (v.getExpiryNum() -30)){
|
|
if (DateUtils.differentDaysByMillisecond(v.getProductionDate(),new Date()) > (v.getExpiryNum() -30)){
|
|
String name = materialMapper.selectByPrimaryKey(v.getMaterialId()).getName();
|
|
String name = materialMapper.selectByPrimaryKey(v.getMaterialId()).getName();
|