Enford 5 年之前
父节点
当前提交
b56e2b7f96

+ 4 - 0
src/main/java/com/jeeplus/modules/projectplanweekly/dao/ProjectPlanWeeklyDao.java

@@ -22,4 +22,8 @@ public interface ProjectPlanWeeklyDao extends CrudDao<ProjectPlanWeekly> {
     public Integer sureWeeklyInfo(ProjectPlanWeekly projectPlanWeekly);
 
     public ProjectPlanWeekly getPlanWeekly(String id);
+
+    public Integer deleteWeekly(ProjectPlanWeekly projectPlanWeekly);
+
+    public Integer deleteWeeklyInfo(ProjectPlanWeekly projectPlanWeekly);
 }

+ 12 - 0
src/main/java/com/jeeplus/modules/projectplanweekly/service/ProjectPlanWeeklyService.java

@@ -130,11 +130,23 @@ public class ProjectPlanWeeklyService extends CrudService<ProjectPlanWeeklyDao,
         projectPlanWeekly.preUpdate();
         projectPlanWeeklyDao.sureWeekly(projectPlanWeekly);
     }
+
     //修改周报表状态
     @Transactional(readOnly = false)
     public void sureWeeklyInfo(ProjectPlanWeekly projectPlanWeekly){
         projectPlanWeekly.preUpdate();
         projectPlanWeeklyDao.sureWeeklyInfo(projectPlanWeekly);
     }
+    //删除周报
+    @Transactional(readOnly = false)
+    public void deleteWeekly(ProjectPlanWeekly projectPlanWeekly){
+        projectPlanWeekly.preUpdate();
+        projectPlanWeeklyDao.deleteWeekly(projectPlanWeekly);
+    }
+    @Transactional(readOnly = false)
+    public void deleteWeeklyInfo(ProjectPlanWeekly projectPlanWeekly){
+        projectPlanWeekly.preUpdate();
+        projectPlanWeeklyDao.deleteWeeklyInfo(projectPlanWeekly);
+    }
 
 }

+ 16 - 0
src/main/java/com/jeeplus/modules/projectplanweekly/web/ProjectPlanWeeklyController.java

@@ -150,4 +150,20 @@ public class ProjectPlanWeeklyController extends BaseController {
         }
         return "redirect:"+ Global.getAdminPath()+"/projectplan/weekly/?repage";
     }
+
+    //确认完成周报
+    @RequestMapping("/delete")
+    public String deleteFlag(ProjectPlanWeekly projectPlanWeekly){
+        projectPlanWeekly.setDelFlag("1");
+        try {
+            if (projectPlanWeekly.getProjectId().equals("")){
+                projectPlanWeeklyService.deleteWeekly(projectPlanWeekly);
+            }else {
+                projectPlanWeeklyService.deleteWeeklyInfo(projectPlanWeekly);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return "redirect:"+ Global.getAdminPath()+"/projectplan/weekly/?repage";
+    }
 }