|
@@ -90,12 +90,14 @@ public class ProjectPlanWeeklyController extends BaseController {
|
|
|
planWeekly.setUser(byUserId);
|
|
|
planWeekly.setOffice(byUserId.getOffice());
|
|
|
model.addAttribute("projectPlanWeekly", planWeekly);
|
|
|
+ model.addAttribute("weeklyStatus",planWeekly.getWeeklyStatus());
|
|
|
}else {
|
|
|
ProjectPlanWeekly projectPlanWeeklyUpdate = projectPlanWeeklyService.get(projectPlanWeekly.getId());
|
|
|
User byUserId = UserUtils.getByUserId(projectPlanWeeklyUpdate.getCreateBy().getId());
|
|
|
projectPlanWeeklyUpdate.setUser(byUserId);
|
|
|
projectPlanWeeklyUpdate.setOffice(byUserId.getOffice());
|
|
|
model.addAttribute("projectPlanWeekly", projectPlanWeeklyUpdate);
|
|
|
+ model.addAttribute("weeklyStatus",projectPlanWeeklyUpdate.getWeeklyStatus());
|
|
|
}
|
|
|
return "modules/projectplanweekly/projectPlanWeeklyView";
|
|
|
}
|