项目计划安排

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

@@ -396,8 +396,13 @@ public class ProjectPlanArrageService extends CrudService<ProjectPlanArrageMappe
         for (String id:strings){
             for (ProjectPlanArrage planArrage:projectPlans){
                 if (id.equals(planArrage.getId())){
-                    planArrage.setBackToStauts("0");
-                    planArrage.setBackToText(backToText);
+                    if (null!=planArrage.getBackToStauts()&&planArrage.getBackToStauts().equals("2")){
+                        planArrage.setBackToStauts("0");
+                        planArrage.setArrageFlag("0");
+                    }else {
+                        planArrage.setBackToStauts("0");
+                        planArrage.setBackToText(backToText);
+                    }
                     break;
                 }
             }

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

@@ -476,6 +476,9 @@ public class ProjectPlanArrageController extends BaseController {
         for (ProjectPlanArrage projectPlanArrage:list){
             if (entity.getWhetherStatus().equals(projectPlanArrage.getWhetherStatus())&&entity.getArrageFlag().equals(projectPlanArrage.getArrageFlag())){
                 if (name.equals(projectPlanArrage.getConstructionUnit())){
+                    if (null != projectPlanArrage.getBackToStauts() && projectPlanArrage.getBackToStauts().equals("2")) {
+                        projectPlanArrage.setHtmlStatus("2");
+                    }
                     planArrages.add(projectPlanArrage);
                 }
             }