项目计划安排

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/mapper/ProjectPlanArrageMapper.java

@@ -23,4 +23,7 @@ public interface ProjectPlanArrageMapper extends BaseMapper<ProjectPlanArrage> {
 
     //根据项目名称查找项目
     List<ProjectQuantity> findListQuantity(@Param("list") List<ProjectPlanArrage> list);
+
+    //主页面删除项目
+    Integer deleteMainAll(@Param("list")List<String> list);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/mapper/xml/ProjectPlanArrageMapper.xml

@@ -266,4 +266,12 @@
 			#{item.projectName}
 		</foreach>
 	</select>
+
+	<delete id="deleteMainAll">
+		delete from xm_project_plan_arrange
+		where id in
+		<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+			#{item}
+		</foreach>
+	</delete>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/service/ProjectPlanArrageService.java

@@ -50,6 +50,12 @@ public class ProjectPlanArrageService extends CrudService<ProjectPlanArrageMappe
         return projectPlanArrageMapper.findListAssignment(projectPlanArrages);
     }
 
+    //主页面删除
+    @Transactional(readOnly = false)
+    public void deleteMainAll(List<String> list){
+        projectPlanArrageMapper.deleteMainAll(list);
+    }
+
     //获取两张表相同的数据
     public List<ProjectPlanArrage> getPlanArrageList(List<ProjectPlanArrage> projectPlanArrageList, List<ProjectAssignment> listAssignment) {
         List<ProjectPlanArrage> planArrages = new ArrayList<ProjectPlanArrage>();

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/web/ProjectDailyPlanController.java

@@ -210,9 +210,16 @@ public class ProjectDailyPlanController extends BaseController {
             //判断书否二次涉电
             boolean flag = false;
             for (ProjectDailyPlan plans:projectPlans){
-                //二次设电项目
-                if (plans.getFlagYesElectricity().equals("1")){
-                    flag = true;
+                for (String s:strings){
+                    if (plans.getId().equals(s)){
+                        if (plans.getFlagYesElectricity().equals("1")){
+                            flag = true;
+                            break;
+                        }
+                        break;
+                    }
+                }
+                if (flag){
                     break;
                 }
             }

src/main/java/com/jeeplus/modules/sg/managementcenter/projectPlanArrage/web/ProjectPlanArrageController.java

@@ -18,6 +18,7 @@ import com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialPr
 import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.entity.ProjectActProclnsAss;
 import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.entity.ProjectAssignment;
 import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.entity.ProjectPlanArrage;
+import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.service.ProjectDailyPlanService;
 import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.service.ProjectPlanActService;
 import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.service.ProjectPlanArrageService;
 import com.jeeplus.modules.sg.managementcenter.projectPlanArrage.util.BookStrapTreeUtil;
@@ -56,6 +57,8 @@ public class ProjectPlanArrageController extends BaseController {
     private ActTaskService actTaskService;
     @Autowired
     private OaNotifyService oaNotifyService;
+    @Autowired
+    private ProjectDailyPlanService projectDailyPlanService;
 
 
     /*
@@ -1193,6 +1196,40 @@ public class ProjectPlanArrageController extends BaseController {
     }
 
 
+    //主页面 删除按钮
+    @ResponseBody
+    @RequestMapping(value = "getDeleteMainAll")
+    public AjaxJson getDeleteMainAll(String ids,String projectNames){
+        AjaxJson ajaxJson = new AjaxJson();
+        try {
+            String comment = URLDecoder.decode(projectNames, "UTF-8");
+            List<String> idList = new ArrayList<String>();
+            List<String> list = new ArrayList<>();
+            if (ids.contains(",")){
+                String[] split = ids.split(",");
+                String[] names = comment.split(",");
+                for (String s:split){
+                    idList.add(s);
+                }
+                for (String name:names){
+                    list.add(name);
+                }
+            }else {
+                list.add(comment);
+                idList.add(ids);
+            }
+            projectDailyPlanService.updateNoMartailDaily(list);
+            projectPlanArrageService.deleteMainAll(idList);
+            ajaxJson.setSuccess(true);
+            ajaxJson.setMsg("退回库成功");
+            return ajaxJson;
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        ajaxJson.setSuccess(false);
+        ajaxJson.setMsg("退回库失败");
+        return ajaxJson;
+    }
 
     //运行单位人员发起流程到配网项目经理
 //    @ResponseBody