1106

src/main/java/com/jeeplus/modules/sg/project/service/ItemService.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.sg.project.service;
 
+import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.project.entity.WbsItem;
 import com.jeeplus.modules.sg.project.entity.WbsProject;
@@ -59,27 +60,48 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
     public Integer deleteItem(String parentId){
         return itemMapper.deleteItem(parentId);
     }
-    //根据项目删除结算
+    //删除项目
     @Transactional(readOnly = false)
-    public Integer deleteCount(String itemId){
-        return itemMapper.deleteCount(itemId);
-    }
-    //根据工程删除 项目
-    @Transactional(readOnly = false)
-    public Integer deleteAdjust(String itemId){
-        return itemMapper.deleteAdjust(itemId);
-    }
-    //根据工程删除 项目
-    @Transactional(readOnly = false)
-    public Integer deleteDetail(String itemId){
-        return itemMapper.deleteDetail(itemId);
+    public AjaxJson deleteItemOne(WbsItem wbsItem){
+        WbsItem wbsItem1 = itemMapper.findItemById(wbsItem.getId());
+        WbsProject wbsProject = projectService.findProjectById(wbsItem1.getProjectId());
+        Integer number = wbsProject.getNumber()-1;
+        wbsProject.setNumber(number);
+        wbsItem.setDelFlag("1");
+        AjaxJson j = new AjaxJson();
+        try {
+            itemMapper.updateItem(wbsItem);
+            projectService.updateProjectNumber(wbsProject);
+            j.setSuccess(true);
+            j.setMsg("删除成功");
+        }catch (Exception e){
+            j.setSuccess(false);
+            j.setMsg("删除失败");
+        }
+        return j;
     }
 
-    public List<WbsItem> findItem(String parentId){
-        return itemMapper.findItem(parentId);
-    }
 
-    public WbsItem findItemById(String id){
-        return itemMapper.findItemById(id);
-    }
+    //    //根据项目删除结算
+//    @Transactional(readOnly = false)
+//    public Integer deleteCount(String itemId){
+//        return itemMapper.deleteCount(itemId);
+//    }
+//    //根据工程删除 项目
+//    @Transactional(readOnly = false)
+//    public Integer deleteAdjust(String itemId){
+//        return itemMapper.deleteAdjust(itemId);
+//    }
+//    //根据工程删除 项目
+//    @Transactional(readOnly = false)
+//    public Integer deleteDetail(String itemId){
+//        return itemMapper.deleteDetail(itemId);
+//    }
+//
+//    public List<WbsItem> findItem(String parentId){
+//        return itemMapper.findItem(parentId);
+//    }
+//    public WbsItem findItemById(String id){
+//        return itemMapper.findItemById(id);
+//    }
 }

src/main/java/com/jeeplus/modules/sg/project/service/ProjectService.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.sg.project.service;
 
+import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
@@ -84,31 +85,46 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
         super.save(wbsProject);
     }
 
-
-
-
     @Transactional(readOnly = false)
     public void updateNum(int number,String id){
         projectMapper.updateNum(number,id);
     }
 
-
     @Transactional(readOnly = false)
     public void delete(WbsProject wbsProject) {
         super.delete(wbsProject);
     }
 
+    //修改工程下项目数量
     @Transactional(readOnly = false)
-    public Integer deleteProject(WbsProject wbsProject){
-        return projectMapper.deleteProject(wbsProject);
-    }
-
-    @Transactional(readOnly = false)
-    public Integer updateProjectNUmber(WbsProject wbsProject){
+    public Integer updateProjectNumber(WbsProject wbsProject){
         return projectMapper.updateProNumber(wbsProject);
     }
 
+    //根据id查找工程
     public WbsProject findProjectById(String id){
         return projectMapper.findProjectById(id);
     }
+
+    @Transactional(readOnly = false)
+    public AjaxJson deleteProject(WbsProject wbsProject){
+        AjaxJson j = new AjaxJson();
+        j.setSuccess(true);
+        j.setMsg("操作成功");
+        try {
+//          List<WbsItem> wbsItems = itemService.findItem(wbsProject.getId());
+//            for (int i = 0; i < wbsItems.size(); i++) {
+//                itemService.deleteCount(wbsItems.get(i).getId());
+//                itemService.deleteAdjust(wbsItems.get(i).getId());
+//                itemService.deleteDetail(wbsItems.get(i).getId());
+//            }
+            itemService.deleteItem(wbsProject.getId());
+            wbsProject.setDelFlag("1");
+            projectMapper.deleteProject(wbsProject);
+        }catch (Exception e){
+            j.setSuccess(false);
+            j.setMsg("删除失败");
+        }
+        return j;
+    }
 }

src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java

@@ -44,8 +44,6 @@ public class ProjectController extends BaseController {
     private OverheadLineService overheadLineService;
     @Autowired
     private SubstationService substationService;
-    @Autowired
-    private ItemService itemService;
 
 
 
@@ -243,23 +241,6 @@ public class ProjectController extends BaseController {
     @RequestMapping("/deleteProject")
     @ResponseBody
     public AjaxJson deleteProject(WbsProject wbsProject){
-        AjaxJson j = new AjaxJson();
-        j.setSuccess(true);
-        j.setMsg("操作成功");
-        try {
-//          List<WbsItem> wbsItems = itemService.findItem(wbsProject.getId());
-//            for (int i = 0; i < wbsItems.size(); i++) {
-//                itemService.deleteCount(wbsItems.get(i).getId());
-//                itemService.deleteAdjust(wbsItems.get(i).getId());
-//                itemService.deleteDetail(wbsItems.get(i).getId());
-//            }
-            itemService.deleteItem(wbsProject.getId());
-            wbsProject.setDelFlag("1");
-            projectService.deleteProject(wbsProject);
-        }catch (Exception e){
-            j.setSuccess(false);
-            j.setMsg("删除失败");
-        }
-        return j;
+      return projectService.deleteProject(wbsProject);
     }
 }

src/main/java/com/jeeplus/modules/sg/project/web/ProjectTemController.java

@@ -221,21 +221,6 @@ public class ProjectTemController extends BaseController {
     @RequestMapping("/deleteItem")
     @ResponseBody
     public AjaxJson deleteItem(WbsItem wbsItem){
-        WbsItem wbsItem1 = itemService.findItemById(wbsItem.getId());
-        WbsProject wbsProject = projectService.findProjectById(wbsItem1.getProjectId());
-        Integer number = wbsProject.getNumber()-1;
-        wbsProject.setNumber(number);
-        wbsItem.setDelFlag("1");
-        AjaxJson j = new AjaxJson();
-        try {
-            itemService.updateItem(wbsItem);
-            projectService.updateProjectNUmber(wbsProject);
-            j.setSuccess(true);
-            j.setMsg("删除成功");
-        }catch (Exception e){
-            j.setSuccess(false);
-            j.setMsg("删除失败");
-        }
-        return j;
+       return  itemService.deleteItemOne(wbsItem);
     }
 }