Merge remote-tracking branch 'origin/master' into master

src/main/java/com/palmnest/service/dinner/service/impl/OrderDinnerServiceImpl.java

@@ -1474,12 +1474,14 @@ public class OrderDinnerServiceImpl implements OrderDinnerService {
 	public AppResultDto exportExcel2(String orgId,String date) {
 		log.info("begin exportExcel2:" + orgId+";date:"+date);
 		String nextDate = "";
+		//系统自动获取，系统判断下一个上菜的日期对应的时间，拿到后取该日期的餐
 		if(StringUtils.isEmpty(date)){
 			date =  DateHelper.formatDate(new Date(),DateHelper.CURRENT_DATE);
+			log.info("begin exportExcel2:" + orgId+";date:"+date);
+			nextDate = mealManager.getNextMealDate(Integer.parseInt(orgId),date,1);
+			log.info("begin exportExcel2:" + orgId+";date:"+date+";nextDate:"+nextDate);
 		}
-		log.info("begin exportExcel2:" + orgId+";date:"+date);
-		nextDate = mealManager.getNextMealDate(Integer.parseInt(orgId),date,1);
-		log.info("begin exportExcel2:" + orgId+";date:"+date+";nextDate:"+nextDate);
+		//手动拿哪一天的餐，指定日期拿餐
 		if(StringUtils.isEmpty(nextDate)){
 			nextDate = date;
 			log.info("begin exportExcel2:" + orgId+";date:"+date+";nextDate2:"+nextDate);