修改

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java

@@ -471,10 +471,10 @@ public class SjDjjcController extends BaseController
                 info.setWzyz(wzyz);
                 String wjff=new DataFormatter().formatCellValue(row.getCell(12));
                 info.setWjfa(wjff);
-                String zjgs=new DataFormatter().formatCellValue(row.getCell(13));
-                info.setZjgs(zjgs);
-                String zjd=new DataFormatter().formatCellValue(row.getCell(14));
-                info.setZjd(zjd);
+//                String zjgs=new DataFormatter().formatCellValue(row.getCell(13));
+//                info.setZjgs(zjgs);
+//                String zjd=new DataFormatter().formatCellValue(row.getCell(14));
+//                info.setZjd(zjd);
                 info.setFaid(sjDjjc1.getFaid());
                 sjDjjcService.updateSjDjjc(info);
             }

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjDjjcServiceImpl.java

@@ -113,6 +113,12 @@ public class SjDjjcServiceImpl implements ISjDjjcService
     @Autowired
     private SjZtcsxxMapper sjZtcsxxMapper;
 
+    @Autowired
+    private JcxxJdxxMapper jcxxJdxxMapper;
+
+    @Autowired
+    private SjFlMapper sjFlMapper;
+
 
 
 
@@ -157,17 +163,22 @@ public class SjDjjcServiceImpl implements ISjDjjcService
             return 3;
         }
         sjDjjc.setCreatedBy(SecurityUtils.getUsername());
-        int i = sjDjjcMapper.insertSjDjjc(sjDjjc);
-
         //施工概要
         SjSggyGjsbxnyq sjSggyGjsbxnyq = new SjSggyGjsbxnyq();
         sjSggyGjsbxnyq.setJh(sjDjjc.getJh());
-        sjSggyGjsbxnyqMapper.insertSjSggyGjsbxnyq2(sjSggyGjsbxnyq);
-        List<String> sjggjyh= new ArrayList<>();
-
-        //匹配高指标井
-
+        if(StringUtils.isNotEmpty(sjDjjc.getZjd())){
+            JcxxJdxx jcxxJdxx = jcxxJdxxMapper.selectJcxxJdxxById(Long.parseLong(sjDjjc.getZjd()));
+            sjDjjc.setZjgs(jcxxJdxx.getZjgs());
+            SjFl sjFl=new SjFl();
+            sjFl.setJh(sjDjjc1.getJh());
+            sjFl.setCreatedBy(SecurityUtils.getUsername());
+            sjFl.setYjlxfs(jcxxJdxx.getYjlxr());
+            sjFlMapper.insertSjFl(sjFl);
+            BeanUtils.copyProperties(jcxxJdxx,sjSggyGjsbxnyq);
+        }
+        int i = sjDjjcMapper.insertSjDjjc(sjDjjc);
 
+        List<String> sjggjyh= new ArrayList<>();
 
 
         //根据方案id查询
@@ -379,7 +390,7 @@ public class SjDjjcServiceImpl implements ISjDjjcService
             }
         }
         sjSggyGjsbxnyq.setSjyh(String.join("；", sjggjyh));
-        sjSggyGjsbxnyqMapper.updateSjSggyGjsbxnyqByjh(sjSggyGjsbxnyq);
+        sjSggyGjsbxnyqMapper.insertSjSggyGjsbxnyq(sjSggyGjsbxnyq);
 
 
         //井口装置
@@ -449,22 +460,10 @@ public class SjDjjcServiceImpl implements ISjDjjcService
     {
         sjDjjc.setUpdateTime(DateUtils.getNowDate());
         sjDjjc.setUpdateBy(SecurityUtils.getUsername());
-        //施工概要
-        SjSggyGjsbxnyq sjSggyGjsbxnyq = new SjSggyGjsbxnyq();
-        sjSggyGjsbxnyq.setJh(sjDjjc.getJh());
-        sjSggyGjsbxnyqMapper.insertSjSggyGjsbxnyq2(sjSggyGjsbxnyq);
+
         List<String> sjggjyh= new ArrayList<>();
         List<SgfambKcSggy> sgfambKcSggyList=sgfambKcSggyMapper.selectSgfambKcSggyListByQk(new SgfambKcSggy());
         List<SgfambKcSggy> collect = sgfambKcSggyList.stream().filter(sgfambKcSggy -> sgfambKcSggy.getZbid().toString().equals(sjDjjc.getFaid().toString())).collect(Collectors.toList());
-//        if(collect.size()==0){
-//            Map<String, List<SgfambKcSggy>> groupedByQk = sgfambKcSggyList.stream()
-//                    .collect(Collectors.groupingBy(SgfambKcSggy::getQk));
-//            for(String s:groupedByQk.keySet()){
-//                collect=groupedByQk.get(s);
-//                break;
-//            }
-//        }
-
         for (SgfambKcSggy sgfambKcSggy : collect) {
             if (sgfambKcSggy != null) {
                 String gjyhxx=sgfambKcSggy.getKc()+"轨迹优化，"+sgfambKcSggy.getGjyh();
@@ -655,12 +654,6 @@ public class SjDjjcServiceImpl implements ISjDjjcService
         }
 
 
-
-
-
-
-        sjSggyGjsbxnyq.setSjyh(String.join("；", sjggjyh));
-        sjSggyGjsbxnyqMapper.updateSjSggyGjsbxnyqByjh(sjSggyGjsbxnyq);
         return sjDjjcMapper.updateSjDjjc(sjDjjc);
     }
 

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFdsgcsServiceImpl.java

@@ -285,7 +285,7 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
         }
         //获取所有井的造斜规律数据
         List<Jskd> jskdList = new ArrayList<>();
-        List<DjZqsjfx> djZqsjfxList=null;
+        List<DjZqsjfx> djZqsjfxList=new ArrayList<>();
         ///如果邻井不为空，则进行造斜率的数据封装
         if (sjLjjwList.size() > 0) {
             Object djdcinfo;
@@ -313,7 +313,7 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
             }
             String gjyh="";
             /////查询符合开次的测斜数据
-            if(djZqsjfxList!=null){
+            if(djZqsjfxList.size()>0){
                 List<Jskd> jskdList_kc =new ArrayList<>();
                 double ksjs=0.0;
                 if (i==0){