周报

src/main/java/com/jeeplus/modules/projectplanweekly/dao/ProjectPlanWeeklyDao.java

@@ -9,6 +9,8 @@ import java.util.List;
 @MyBatisDao
 public interface ProjectPlanWeeklyDao extends CrudDao<ProjectPlanWeekly> {
 
+    public Integer updateWeekly(ProjectPlanWeekly projectPlanWeekly);
+
     public List<ProjectPlanWeekly> findWeekly(ProjectPlanWeekly projectPlanWeekly);
 
     public Integer saveRemarksReason(ProjectPlanWeekly projectPlanWeekly);
@@ -18,4 +20,6 @@ public interface ProjectPlanWeeklyDao extends CrudDao<ProjectPlanWeekly> {
     public Integer sureWeekly(ProjectPlanWeekly projectPlanWeekly);
 
     public Integer sureWeeklyInfo(ProjectPlanWeekly projectPlanWeekly);
+
+    public ProjectPlanWeekly getPlanWeekly(String id);
 }

src/main/java/com/jeeplus/modules/projectplanweekly/service/ProjectPlanWeeklyService.java

@@ -33,10 +33,19 @@ public class ProjectPlanWeeklyService extends CrudService<ProjectPlanWeeklyDao,
         super.delete(projectPlanWeekly);
     }
 
+    @Transactional(readOnly = false)
+    public void updateWeekly(ProjectPlanWeekly projectPlanWeekly){
+        projectPlanWeekly.preUpdate();
+        projectPlanWeeklyDao.updateWeekly(projectPlanWeekly);
+    }
+
     public List<ProjectPlanWeekly> findWeekly(ProjectPlanWeekly projectPlanWeekly){
        return projectPlanWeeklyDao.findWeekly(projectPlanWeekly);
     }
 
+    public ProjectPlanWeekly getPlanWeekly(String id){
+        return  projectPlanWeeklyDao.getPlanWeekly(id);
+    }
     /**
      * 查询分页数据
      * @param page 分页对象

src/main/java/com/jeeplus/modules/projectplanweekly/web/ProjectPlanWeeklyController.java

@@ -59,22 +59,54 @@ public class ProjectPlanWeeklyController extends BaseController {
 
     @RequestMapping(value = "form")
     public String form(ProjectPlanWeekly projectPlanWeekly, HttpServletRequest request,Model model) {
-        projectPlanWeekly.setUser(UserUtils.getUser());
-        projectPlanWeekly.setOffice(UserUtils.getUser().getOffice());
-        Map<String, Date> mondayAndSunday = projectPlanWeeklyService.getMondayAndSunday(new Date());
-        Date mondayDate = mondayAndSunday.get("mondayDate");//本周周一时间
-        Date sundayDate = mondayAndSunday.get("sundayDate");//本周周日时间
-        projectPlanWeekly.setBeginDate(mondayDate);
-        projectPlanWeekly.setEndDate(sundayDate);
-        model.addAttribute("projectControlTable", projectPlanWeekly);
+        if (null!=projectPlanWeekly.getId()&&!projectPlanWeekly.getId().equals("")){
+            ProjectPlanWeekly projectPlanWeeklyUpdate = projectPlanWeeklyService.get(projectPlanWeekly.getId());
+            projectPlanWeeklyUpdate.setUser(UserUtils.getUser());
+            projectPlanWeeklyUpdate.setOffice(UserUtils.getUser().getOffice());
+            model.addAttribute("projectPlanWeekly", projectPlanWeeklyUpdate);
+        }else {
+            projectPlanWeekly.setUser(UserUtils.getUser());
+            projectPlanWeekly.setOffice(UserUtils.getUser().getOffice());
+            Map<String, Date> mondayAndSunday = projectPlanWeeklyService.getMondayAndSunday(new Date());
+            Date mondayDate = mondayAndSunday.get("mondayDate");//本周周一时间
+            Date sundayDate = mondayAndSunday.get("sundayDate");//本周周日时间
+            projectPlanWeekly.setBeginDate(mondayDate);
+            projectPlanWeekly.setEndDate(sundayDate);
+            model.addAttribute("projectPlanWeekly", projectPlanWeekly);
+        }
         return "modules/projectplanweekly/projectPlanWeeklyForm";
     }
 
+    @RequestMapping(value = "view")
+    public String view(ProjectPlanWeekly projectPlanWeekly, HttpServletRequest request,Model model){
+        if (null!=projectPlanWeekly&&!projectPlanWeekly.getProjectId().equals("")){
+            ProjectPlanWeekly planWeekly = projectPlanWeeklyService.getPlanWeekly(projectPlanWeekly.getId());
+            planWeekly.setUser(UserUtils.getUser());
+            planWeekly.setOffice(UserUtils.getUser().getOffice());
+            model.addAttribute("projectPlanWeekly", planWeekly);
+        }else {
+            ProjectPlanWeekly projectPlanWeeklyUpdate = projectPlanWeeklyService.get(projectPlanWeekly.getId());
+            projectPlanWeeklyUpdate.setUser(UserUtils.getUser());
+            projectPlanWeeklyUpdate.setOffice(UserUtils.getUser().getOffice());
+            model.addAttribute("projectPlanWeekly", projectPlanWeeklyUpdate);
+        }
+        return "modules/projectplanweekly/projectPlanWeeklyView";
+    }
+
     @RequestMapping("/save")
     public String save(ProjectPlanWeekly projectPlanWeekly, Model model, RedirectAttributes redirectAttributes){
         projectPlanWeekly.setWeeklyStatus("0");
         projectPlanWeekly.setRemarksStatus("0");
-        projectPlanWeeklyService.save(projectPlanWeekly);
+        try{
+            if (null!=projectPlanWeekly.getId()&&!"".equals(projectPlanWeekly.getId())){
+                projectPlanWeekly.setRemarksReason("");
+                projectPlanWeeklyService.updateWeekly(projectPlanWeekly);
+            }else {
+                projectPlanWeeklyService.save(projectPlanWeekly);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         return "redirect:"+ Global.getAdminPath()+"/projectplan/weekly/?repage";
     }