diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java index d9e435ead..8e5c4bfc5 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java @@ -116,6 +116,10 @@ public class SysRecipesPlan { */ private Integer reviewStatus; + /** 该食谱计划中暂停日期,使用 | 隔开 */ + //@Excel(name = "该食谱计划中暂停日期,使用 | 隔开") + private String pauseDate; + /** * 创建者 */ diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java index b55065f17..7f5469544 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java @@ -185,6 +185,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { || plan.getEndDate().compareTo(newRecipesPlanList.get(index).getEndDate()) != 0){ plan.setStartDate(newRecipesPlanList.get(index).getStartDate()); plan.setEndDate(newRecipesPlanList.get(index).getEndDate()); + plan.setPauseDate(newRecipesPlanList.get(index).getPauseDate()); updateList.add(plan); } }else{ @@ -260,6 +261,8 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { sysRecipesPlan.setStartNumDay(oldStartNumDay); oldStartNumDay += 6; sysRecipesPlan.setEndNumDay(oldStartNumDay); + //暂停日期 + sysRecipesPlan.setPauseDate(pauseResult[3]); //添加暂停范围内的日期 planList.add(sysRecipesPlan); }while (breakFlag); diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml index c8b694550..7dab14631 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml @@ -14,6 +14,7 @@ + @@ -36,7 +37,7 @@ - select id, order_id, cus_id, start_date, end_date, start_num_day, end_num_day, recipes_id, send_flag, send_time, create_time, create_by, update_time, update_by, del_flag, review_status from sys_recipes_plan + select id, order_id, cus_id, start_date, end_date, start_num_day, end_num_day, recipes_id, send_flag, send_time, pause_date, create_time, create_by, update_time, update_by, del_flag, review_status from sys_recipes_plan