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 87629416e..b5bd90305 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 @@ -181,13 +181,12 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { List delList = new ArrayList<>(); for (SysRecipesPlan plan : oldRecipesPlanList) { if(index < newSize){ - if(plan.getStartDate().compareTo(newRecipesPlanList.get(index).getStartDate()) != 0 - || 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); - } + plan.setStartDate(newRecipesPlanList.get(index).getStartDate()); + plan.setEndDate(newRecipesPlanList.get(index).getEndDate()); + plan.setPauseDate(newRecipesPlanList.get(index).getPauseDate()); + plan.setStartNumDay(plan.getStartNumDay()); + plan.setEndNumDay(plan.getEndNumDay()); + updateList.add(plan); }else{ delList.add(plan.getId()); } diff --git a/stdiet-ui/src/components/RecipesPlanDrawer/PlanPauseDrawer/index.vue b/stdiet-ui/src/components/RecipesPlanDrawer/PlanPauseDrawer/index.vue index 7667dbd9a..4e97924ac 100644 --- a/stdiet-ui/src/components/RecipesPlanDrawer/PlanPauseDrawer/index.vue +++ b/stdiet-ui/src/components/RecipesPlanDrawer/PlanPauseDrawer/index.vue @@ -137,6 +137,7 @@ end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" + :picker-options="orderPickerOptions" > @@ -233,7 +234,8 @@ export default { }, orderPickerOptions: { disabledDate(time) { - return time.getTime() < Date.now() - 24 * 60 * 60 * 1000; + //不能添加上月日期的暂停,会影响提成计算 + return time.getTime() < dayjs().startOf('month').valueOf() }, }, };