Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/util/TestDate.java

@@ -3,6 +3,7 @@

import cn.hutool.core.date.DateTime;
import com.alibaba.fastjson.JSONObject;
import com.iceyyy.workday.WorkUtils;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.Response;
@@ -112,7 +113,7 @@
    }

    /**
     * 判断改日期是否为工作日
     * 判断该日期是否为工作日
     *
     * @param dateTime
     * @return
@@ -130,4 +131,24 @@
        return  true;
    }

    /**
     * 获取该日期的下个工作日是多少
     *
     * @param dateTime
     * @return
     */
    public  DateTime nextWeekDay(DateTime dateTime){
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(dateTime);
        while (true){
          calendar.add(calendar.DATE,1);
          SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
          String dateTimeToday = sdf.format(calendar.getTime());
          if (!WorkUtils.isWorkendDay(dateTimeToday)){
              return new DateTime(calendar);//返回日期
          }
        }

    }

}