Merge remote-tracking branch 'origin/tl'

src/main/java/com/aps/service/plan/PlanResultService.java

@@ -2097,7 +2097,7 @@ public class PlanResultService {
                 globalParam.setIsCheckSf(c.isValue());
             }
 
-
+            globalParam.setIsCheckSf(true);
         }
         FileHelper.writeLogFile("初始化约束-----------结束-------");
         return  globalParam;

src/test/java/com/aps/demo/PlanResultServiceTest.java

@@ -41,9 +41,9 @@ public class PlanResultServiceTest {
        // nsgaiiUtils.Test();
 
       //  planResultService.execute2("E29F2B3ADA8149F6B916B5119296A92B");//2000
-      // planResultService.execute2("E2CD1FC6FF9B4B19A59FEC7F846D4952");//600
+       planResultService.execute2("E2CD1FC6FF9B4B19A59FEC7F846D4952");//600
       //  planResultService.execute2("EAF3C94B8F3345278F226C94FB0FED86");//bom
-        planResultService.execute2("6D63146BE5C84A78B5AB044327BA55BD");//2000
+      //  planResultService.execute2("6D63146BE5C84A78B5AB044327BA55BD");//2000
      // planResultService.execute2("6D63146BE5C84A78B5AB044327BA55BD");//5000
        // planResultService.execute2("C8B533BD8944405B9A2F8823C575C204");//500
      //   planResultService.execute2("EFDD34E4B5BC434BAEAE6A84DFCD4E7B");//20