物资超期

jyzb-biz/src/main/java/com/junmp/jyzb/task/InvOverDueMsg.java

 package com.junmp.jyzb.task;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.junmp.jyzb.api.bean.req.InvExpireReq;
 import com.junmp.jyzb.entity.OrderMain;
@@ -74,7 +75,14 @@ public class InvOverDueMsg implements JobAction {
 
         for (OrderMain orderMain:list) {
             for (InvExpireReq userIds:userIdsList) {
-                if (orderMain.getStartOrgId()==userIds.getOrgId() && orderMain.getReturnUserId().equals(userIds.getUserId())){
+                if (!ObjectUtil.isNull(orderMain.getReturnDate())){
+                    int i = orderMain.getReturnDate().compareTo(DateTimeUtil.getCurrentDateTime());
+                }
+
+                if (orderMain.getStartOrgId()==userIds.getOrgId()
+                        && orderMain.getReturnUserId().equals(userIds.getUserId())
+                        && !ObjectUtil.isNull(orderMain.getReturnDate())
+                        && orderMain.getReturnDate().getTime()<DateTimeUtil.getCurrentDateTime().getTime() ){
                     MessageSendReq sendReq = new MessageSendReq();
                     sendReq.setReceiveUserIds(userIds.getUserId());
                     sendReq.setMsgTitle("物资超期提醒");