周报

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

@@ -11,6 +11,8 @@ public interface ProjectPlanWeeklyDao extends CrudDao<ProjectPlanWeekly> {
 
     public Integer updateWeekly(ProjectPlanWeekly projectPlanWeekly);
 
+    public Integer updateInfo(ProjectPlanWeekly projectPlanWeekly);
+
     public List<ProjectPlanWeekly> findWeekly(ProjectPlanWeekly projectPlanWeekly);
 
     //基础员工获取信息

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

@@ -41,6 +41,11 @@ public class ProjectPlanWeeklyService extends CrudService<ProjectPlanWeeklyDao,
         projectPlanWeekly.preUpdate();
         projectPlanWeeklyDao.updateWeekly(projectPlanWeekly);
     }
+    @Transactional(readOnly = false)
+    public void updateInfo(ProjectPlanWeekly projectPlanWeekly){
+        projectPlanWeekly.preUpdate();
+        projectPlanWeeklyDao.updateInfo(projectPlanWeekly);
+    }
 
     public List<ProjectPlanWeekly> findWeekly(ProjectPlanWeekly projectPlanWeekly){
        return projectPlanWeeklyDao.findWeekly(projectPlanWeekly);

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

@@ -66,11 +66,19 @@ public class ProjectPlanWeeklyController extends BaseController {
     @RequestMapping(value = "form")
     public String form(ProjectPlanWeekly projectPlanWeekly, HttpServletRequest request,Model model) {
         if (null!=projectPlanWeekly.getId()&&!projectPlanWeekly.getId().equals("")){
-            ProjectPlanWeekly projectPlanWeeklyUpdate = projectPlanWeeklyService.get(projectPlanWeekly.getId());
-            User byUserId = UserUtils.getByUserId(projectPlanWeeklyUpdate.getCreateBy().getId());
-            projectPlanWeeklyUpdate.setUser(byUserId);
-            projectPlanWeeklyUpdate.setOffice(byUserId.getOffice());
-            model.addAttribute("projectPlanWeekly", projectPlanWeeklyUpdate);
+            if (null!=projectPlanWeekly.getProjectId()&&!projectPlanWeekly.getProjectId().equals("")){
+                ProjectPlanWeekly planWeekly = projectPlanWeeklyService.getPlanWeekly(projectPlanWeekly.getId());
+                User byUserId = UserUtils.getByUserId(planWeekly.getCreateBy().getId());
+                planWeekly.setUser(byUserId);
+                planWeekly.setOffice(byUserId.getOffice());
+                model.addAttribute("projectPlanWeekly", planWeekly);
+            }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);
+            }
         }else {
             projectPlanWeekly.setUser(UserUtils.getUser());
             projectPlanWeekly.setOffice(UserUtils.getUser().getOffice());
@@ -110,8 +118,13 @@ public class ProjectPlanWeeklyController extends BaseController {
         projectPlanWeekly.setRemarksStatus("0");
         try{
             if (null!=projectPlanWeekly.getId()&&!"".equals(projectPlanWeekly.getId())){
-                projectPlanWeekly.setRemarksReason("");
-                projectPlanWeeklyService.updateWeekly(projectPlanWeekly);
+                if (null!=projectPlanWeekly.getProjectId()&&!"".equals(projectPlanWeekly.getProjectId())){
+                    projectPlanWeekly.setRemarksReason("");
+                    projectPlanWeeklyService.updateInfo(projectPlanWeekly);
+                }else {
+                    projectPlanWeekly.setRemarksReason("");
+                    projectPlanWeeklyService.updateWeekly(projectPlanWeekly);
+                }
             }else {
                 projectPlanWeekly.setOfficeId(UserUtils.getUser().getOffice().getId());
                 projectPlanWeekly.setCompanyId(UserUtils.getUser().getCompany().getId());
@@ -145,6 +158,10 @@ public class ProjectPlanWeeklyController extends BaseController {
         return j;
     }
 
+    @RequestMapping(value = "remarksReason")
+    public String getSaveRemarksReasonForm(){
+        return "modules/projectplanweekly/projectPlanWeeklyView";
+    }
     //确认完成周报
     @RequestMapping("/sureWeeklyStatus")
     public String getSureWeeklyStatus(ProjectPlanWeekly projectPlanWeekly){