yuansh hai 5 días
pai
achega
6b9d466be1

+ 8 - 7
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/IncidentTicketJob.java

@@ -93,7 +93,8 @@ public class IncidentTicketJob implements Job {
                 String user_id = m.get("user_id").toString();//用户
                 int minute = (int) m.get("minute");//提醒时间(分钟)
                 int frequency = 1;// (int) m.get("frequency");//提醒次数
-                minute = minute*1440; //客户要求改成天
+//                minute = minute*1440; //客户要求改成天
+                minute = minute*1400; //忽略精度,客户要求改成天
 
                 //首次提醒
                 List<String> ticketList = incidentTicketService.selectTicketList(frequency,order_status,minute,order_type,create_time);
@@ -106,11 +107,11 @@ public class IncidentTicketJob implements Job {
 
                         String msgContent = "<h3>您有"+ticketList.size()+"条("+order_statusText+")的事故单需要处理,请查看</h3><br> <h4><br>"+result+"</h4>";
 
-                        sysBaseAPI.sendSysAnnouncement(loginUser,"admin",userId,"事故处理单提醒",
+                        sysBaseAPI.sendSysAnnouncement(loginUser,"admin",userId,"事故处理单提醒(一级)",
                                 msgContent,
                                 CommonConstant.MSG_CATEGORY_2,new HashMap<>());
 
-                        incidentTicketService.setMsgLog(order_status,userId,null,minute,frequency,msgContent,order_statusText,result);
+                        incidentTicketService.setMsgLog(order_status,userId,null,minute,frequency,msgContent,order_statusText+"(一级)",result);
 
                     }
 
@@ -127,7 +128,7 @@ public class IncidentTicketJob implements Job {
                 user_id = m.get("user_id2").toString();//用户
                 minute = (int) m.get("minute2");//提醒时间(分钟)
                 frequency = 2;// (int) m.get("frequency");//提醒次数
-                minute = minute*1440; //客户要求改成天
+                minute = minute*1400; //忽略精度,客户要求改成天
 
                 List<String> ticketList2 = incidentTicketService.selectTicketList(frequency,order_status,minute,order_type,create_time);
 
@@ -137,13 +138,13 @@ public class IncidentTicketJob implements Job {
 
                     for(String userId:user_id.split(",")){
 
-                        String msgContent = "<h3>您有"+ticketList2.size()+"条("+order_statusText+")的事故单需要处理,请查看</h3><br> <h4><br>"+result+"</h4>";
+                        String msgContent = "<h3>您有"+ticketList2.size()+"条("+order_statusText+")的事故单需要处理,请及时查看</h3><br> <h4><br>"+result+"</h4>";
 
-                        sysBaseAPI.sendSysAnnouncement(loginUser,"admin",userId,"事故处理单提醒",
+                        sysBaseAPI.sendSysAnnouncement(loginUser,"admin",userId,"事故处理单提醒(二级)",
                                 msgContent,
                                 CommonConstant.MSG_CATEGORY_2,new HashMap<>());
 
-                        incidentTicketService.setMsgLog(order_status,userId,null,minute,frequency,msgContent,order_type,result);
+                        incidentTicketService.setMsgLog(order_status,userId,null,minute,frequency,msgContent,order_statusText+"(二级)",result);
 
                     }