Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

食谱计划优化

Browse Source
This commit is contained in:
xiezhijun
2021-03-03 18:17:03 +08:00
parent 77148e9067
commit a20ef83dc4
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java
View File

@ -116,6 +116,10 @@ public class SysRecipesPlan {
*/
private Integer reviewStatus;
/** 该食谱计划中暂停日期，使用 | 隔开 */
//@Excel(name = "该食谱计划中暂停日期，使用 | 隔开")
private String pauseDate;
/**
* 创建者
*/

3
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
View File

@ -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);