Merge branch 'master' into 淮海科技

src/main/java/thyyxxk/webserver/service/executeItem/GenerateYzService.java

@@ -76,7 +76,7 @@ public class GenerateYzService {
         return list;
     }
 
-    private long betweenDay(Date beginDate, Date endDate, boolean isReset,boolean isAbs){
+    private static long betweenDay(Date beginDate, Date endDate, boolean isReset,boolean isAbs){
         if (isReset) {
             beginDate = DateUtil.beginOfDay(beginDate);
             endDate = DateUtil.beginOfDay(endDate);
@@ -421,13 +421,13 @@ public class GenerateYzService {
                         }
                         //检查隔日一次
                         if(item.getFrequCode().startsWith("QOD") || item.getFrequCode().startsWith("Q0D") || item.getFrequCode().startsWith("Q2D")){
-                            if(betweenDay(item.getStartTime(),occTimeTemp,true,false) != 2){
+                            if(betweenDay(item.getStartTime(),occTimeTemp,true,false) % 2 != 0){
                                 continue;
                             }
                         }
                         int numQd = getQmDFreCode(item.getFrequCode());
                         if(numQd > 0){
-                            if(betweenDay(item.getStartTime(),occTimeTemp,true,false) != numQd){
+                            if(betweenDay(item.getStartTime(),occTimeTemp,true,false) % numQd != 0 ){
                                 continue;
                             }
                         }