|
|
@ -71,6 +71,7 @@ import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import java.text.ParseException; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
import java.util.function.Function; |
|
|
@ -2789,4 +2790,53 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit |
|
|
|
return baseDao.selectByOriginId(originId); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 获取固定时间段之间固定时间的集合 |
|
|
|
* @param start 开始时间 |
|
|
|
* @param end 结束时间 |
|
|
|
* @param interval 间隔时间 |
|
|
|
* @author zxc |
|
|
|
* @date 2021/11/22 3:48 下午 |
|
|
|
*/ |
|
|
|
public static List<String> getIntervalTimeList(String start,String end,Integer interval) { |
|
|
|
Date startDate = convertStringToDate("HH:mm", start); |
|
|
|
Date endDate = convertStringToDate("HH:mm", end); |
|
|
|
List<String> list = new ArrayList<>(); |
|
|
|
while (startDate.getTime() <= endDate.getTime()) { |
|
|
|
list.add(convertDateToString("HH:mm", startDate)); |
|
|
|
Calendar calendar = Calendar.getInstance(); |
|
|
|
calendar.setTime(startDate); |
|
|
|
calendar.add(Calendar.MINUTE, interval); |
|
|
|
if (calendar.getTime().getTime() > endDate.getTime()) { |
|
|
|
if (!startDate.equals(endDate)) { |
|
|
|
list.add(convertDateToString("HH:mm", endDate)); |
|
|
|
} |
|
|
|
startDate = calendar.getTime(); |
|
|
|
} else { |
|
|
|
startDate = calendar.getTime(); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
list.remove(list.size() - NumConstant.ONE); |
|
|
|
list.add(list.size(),"24:00"); |
|
|
|
return list; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static Date convertStringToDate(String format, String dateStr) { |
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); |
|
|
|
try { |
|
|
|
Date date = simpleDateFormat.parse(dateStr); |
|
|
|
return date; |
|
|
|
} catch (ParseException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
public static String convertDateToString(String format, Date date) { |
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); |
|
|
|
return simpleDateFormat.format(date); |
|
|
|
} |
|
|
|
} |