Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
This commit is contained in:
commit
b742bda01f
@ -281,13 +281,19 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
|
|||||||
List<SysRecipesPlan> addList = new ArrayList<>();
|
List<SysRecipesPlan> addList = new ArrayList<>();
|
||||||
List<SysRecipesPlan> updateList = new ArrayList<>();
|
List<SysRecipesPlan> updateList = new ArrayList<>();
|
||||||
List<Long> delList = new ArrayList<>();
|
List<Long> delList = new ArrayList<>();
|
||||||
|
SysRecipesPlan tmpPlan;
|
||||||
for (SysRecipesPlan plan : oldRecipesPlanList) {
|
for (SysRecipesPlan plan : oldRecipesPlanList) {
|
||||||
if (index < newSize) {
|
if (index < newSize) {
|
||||||
plan.setStartDate(newRecipesPlanList.get(index).getStartDate());
|
tmpPlan = newRecipesPlanList.get(index);
|
||||||
plan.setEndDate(newRecipesPlanList.get(index).getEndDate());
|
plan.setStartDate(tmpPlan.getStartDate());
|
||||||
plan.setPauseDate(newRecipesPlanList.get(index).getPauseDate());
|
plan.setEndDate(tmpPlan.getEndDate());
|
||||||
plan.setStartNumDay(newRecipesPlanList.get(index).getStartNumDay());
|
plan.setPauseDate(tmpPlan.getPauseDate());
|
||||||
plan.setEndNumDay(newRecipesPlanList.get(index).getEndNumDay());
|
plan.setStartNumDay(tmpPlan.getStartNumDay());
|
||||||
|
plan.setEndNumDay(tmpPlan.getEndNumDay());
|
||||||
|
plan.setSmsSend(tmpPlan.getSmsSend());
|
||||||
|
plan.setSubscribed(tmpPlan.getSubscribed());
|
||||||
|
plan.setSubSend(tmpPlan.getSubSend());
|
||||||
|
plan.setRemark(tmpPlan.getRemark());
|
||||||
updateList.add(plan);
|
updateList.add(plan);
|
||||||
} else {
|
} else {
|
||||||
delList.add(plan.getId());
|
delList.add(plan.getId());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user