Helius
2021-11-01 110a99baa82a748bee993ad01ca03370c9dc0cf2
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
@@ -99,16 +99,21 @@
   public boolean isInWorkTime(Long shopId, Date beginTime, Date endTime) {
      if(beginTime!=null){
         Date minTime = findMinTime(shopId);
         Date maxTime = findMaxTime(shopId);
         minTime.setYear(beginTime.getYear());
         minTime.setMonth(beginTime.getMonth());
         minTime.setDate(beginTime.getDate());
         maxTime.setYear(beginTime.getYear());
         maxTime.setMonth(beginTime.getMonth());
         maxTime.setDate(beginTime.getDate());
         return (
               (DateUtil.isDuringDate(minTime, maxTime, beginTime) || minTime.getTime()==beginTime.getTime()  )
                     && DateUtil.isDuringDate(minTime, maxTime, endTime) || maxTime.getTime()==endTime.getTime() );
         if(minTime!=null){
            Date maxTime = findMaxTime(shopId);
            minTime.setYear(beginTime.getYear());
            minTime.setMonth(beginTime.getMonth());
            minTime.setDate(beginTime.getDate());
            maxTime.setYear(beginTime.getYear());
            maxTime.setMonth(beginTime.getMonth());
            maxTime.setDate(beginTime.getDate());
            return (
                  (DateUtil.isDuringDate(minTime, maxTime, beginTime) || minTime.getTime()==beginTime.getTime()  )
                        && DateUtil.isDuringDate(minTime, maxTime, endTime) || maxTime.getTime()==endTime.getTime() );
         }else {
            return false;
         }
      }else{
         return false;
      }