1

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

@@ -15,6 +15,7 @@ import com.junmp.v2.job.api.JobAction;
 import com.junmp.v2.message.api.MessageApi;
 import com.junmp.v2.message.api.bean.req.MessageReq;
 import com.junmp.v2.message.api.bean.req.MessageSendReq;
+import com.junmp.v2.sys.user.entity.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -70,21 +71,18 @@ public class InvOverDueMsg implements JobAction {
         }
         List<Long> uniqueOrgIDsList = new ArrayList<>(uniqueOrgIDs);
         //查询组织机构下面的所有仓管员的useId
-        List<InvExpireReq> userIdsList=inventoryMapper.selectUserListByOrgs(uniqueOrgIDsList);
+//        List<InvExpireReq> userIdsList=inventoryMapper.selectUserListByOrgs(uniqueOrgIDsList);
         //并且查询出该领用单的领用人，再将消息推送给领用人
-
+        List<String> userIdsList=new ArrayList<>();
         for (OrderMain orderMain:list) {
-            for (InvExpireReq userIds:userIdsList) {
-                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())
+//                if (!ObjectUtil.isNull(orderMain.getReturnDate())){
+//                    int i = orderMain.getReturnDate().compareTo(DateTimeUtil.getCurrentDateTime());
+//                }
+            if (!ObjectUtil.isNull(orderMain.getReturnDate())
                     && orderMain.getReturnDate().getTime()<DateTimeUtil.getCurrentDateTime().getTime() ){
                 MessageSendReq sendReq = new MessageSendReq();
-                    sendReq.setReceiveUserIds(userIds.getUserId());
+                sendReq.setReceiveUserIds(orderMain.getReturnUserId());
                 sendReq.setMsgTitle("物资超期提醒");
                 sendReq.setBizType("超期提醒");
                 //设置业务类型
@@ -95,17 +93,18 @@ public class InvOverDueMsg implements JobAction {
                 sendReq.setPriority("0");
                 sendReq.setSendTime(DateTime.now());
                 messageApi.sendMessage(sendReq);
+                userIdsList.add(orderMain.getReturnUserId());
             }
-            }
+
         }
 
         /*推送发送未读数量*/
-        for(InvExpireReq userIds:userIdsList){
+        for(String userIds:userIdsList){
             MessageReq req1 = new MessageReq();
             req1.setReadFlag(0);
-            req1.setReceiveUserId(Long.parseLong(userIds.getUserId()));
+            req1.setReceiveUserId(Long.parseLong(userIds));
             Integer count1 = messageApi.queryCount(req1);
-            messageApi.pushMsgToUser(userIds.getUserId(),count1);
+            messageApi.pushMsgToUser(userIds,count1);
         }
 
     }