修改

pom.xml

@@ -201,16 +201,16 @@
             <artifactId>poi-ooxml</artifactId>
             <artifactId>poi-ooxml</artifactId>
             <version>5.2.5</version>
             <version>5.2.5</version>
         </dependency>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>5.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml-schemas</artifactId>
-            <version>4.1.2</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi</artifactId>-->
+<!--            <version>5.2.3</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi-ooxml-schemas</artifactId>-->
+<!--            <version>4.1.2</version>-->
+<!--        </dependency>-->
 
 
         <!-- velocity代码生成使用模板 -->
         <!-- velocity代码生成使用模板 -->
         <dependency>
         <dependency>

src/main/java/com/ruoyi/project/zjsgfa/controller/SjLjjwController.java

@@ -41,7 +41,7 @@ public class SjLjjwController extends BaseController
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SjLjjw sjLjjw)
     public TableDataInfo list(SjLjjw sjLjjw)
     {
     {
-        startPage();
+//        startPage();
         List<SjLjjw> list = sjLjjwService.selectSjLjjwList(sjLjjw);
         List<SjLjjw> list = sjLjjwService.selectSjLjjwList(sjLjjw);
         return getDataTable(list);
         return getDataTable(list);
     }
     }

src/main/java/com/ruoyi/project/zjsgfa/controller/SjQkztfxController.java

@@ -41,7 +41,7 @@ public class SjQkztfxController extends BaseController
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SjQkztfx sjQkztfx)
     public TableDataInfo list(SjQkztfx sjQkztfx)
     {
     {
-        startPage();
+//        startPage();
         List<SjQkztfx> list = sjQkztfxService.selectSjQkztfxList(sjQkztfx);
         List<SjQkztfx> list = sjQkztfxService.selectSjQkztfxList(sjQkztfx);
         return getDataTable(list);
         return getDataTable(list);
     }
     }

src/main/java/com/ruoyi/project/zjsgfa/controller/SjSzfxjgController.java

@@ -41,7 +41,7 @@ public class SjSzfxjgController extends BaseController
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SjSzfxjg sjSzfxjg)
     public TableDataInfo list(SjSzfxjg sjSzfxjg)
     {
     {
-        startPage();
+//        startPage();
         List<SjSzfxjg> list = sjSzfxjgService.selectSjSzfxjgList(sjSzfxjg);
         List<SjSzfxjg> list = sjSzfxjgService.selectSjSzfxjgList(sjSzfxjg);
         return getDataTable(list);
         return getDataTable(list);
     }
     }

src/main/java/com/ruoyi/project/zjsgfa/controller/SjZqfxController.java

@@ -41,7 +41,7 @@ public class SjZqfxController extends BaseController
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SjZqfx sjZqfx)
     public TableDataInfo list(SjZqfx sjZqfx)
     {
     {
-        startPage();
+//        startPage();
         List<SjZqfx> list = sjZqfxService.selectSjZqfxList(sjZqfx);
         List<SjZqfx> list = sjZqfxService.selectSjZqfxList(sjZqfx);
         return getDataTable(list);
         return getDataTable(list);
     }
     }

src/main/java/com/ruoyi/project/zjsgfa/controller/SjZtgjsjController.java

@@ -41,7 +41,7 @@ public class SjZtgjsjController extends BaseController
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SjZtgjsj sjZtgjsj)
     public TableDataInfo list(SjZtgjsj sjZtgjsj)
     {
     {
-        startPage();
+//        startPage();
         List<SjZtgjsj> list = sjZtgjsjService.selectSjZtgjsjList(sjZtgjsj);
         List<SjZtgjsj> list = sjZtgjsjService.selectSjZtgjsjList(sjZtgjsj);
         return getDataTable(list);
         return getDataTable(list);
     }
     }

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

@@ -127,12 +127,15 @@ public class SjDjjcServiceImpl implements ISjDjjcService
     @Override
     @Override
     public AjaxResult saveLjzl(CommonParam param) throws Exception {
     public AjaxResult saveLjzl(CommonParam param) throws Exception {
         String jh = param.getSjjh();
         String jh = param.getSjjh();
+        String ljjh = param.getJh();
         SjDjjc sjDjjc = sjDjjcMapper.selectSjDjjcByJh(jh);
         SjDjjc sjDjjc = sjDjjcMapper.selectSjDjjcByJh(jh);
         param.setQk(sjDjjc.getQk());
         param.setQk(sjDjjc.getQk());
         param.setJkhzb(sjDjjc.getJkhzb());
         param.setJkhzb(sjDjjc.getJkhzb());
         param.setJkzzb(sjDjjc.getJkzzb());
         param.setJkzzb(sjDjjc.getJkzzb());
         param.setJdhzb(sjDjjc.getJdhzb());
         param.setJdhzb(sjDjjc.getJdhzb());
         param.setJdzzb(sjDjjc.getJdzzb());
         param.setJdzzb(sjDjjc.getJdzzb());
+        param.setJh(null);
+
         //保存邻井
         //保存邻井
         List<Ljjw> ljjwList = djdcService.getLjjwList(param);
         List<Ljjw> ljjwList = djdcService.getLjjwList(param);
         List<SjLjjw> sjLjjwList=new ArrayList<>();
         List<SjLjjw> sjLjjwList=new ArrayList<>();
@@ -152,6 +155,7 @@ public class SjDjjcServiceImpl implements ISjDjjcService
         param.setJkzzb(null);
         param.setJkzzb(null);
         param.setJdhzb(null);
         param.setJdhzb(null);
         param.setJdzzb(null);
         param.setJdzzb(null);
+        param.setJh(ljjh);
         //周期分析
         //周期分析
         List<DjZqsjfx> zqshfxList = djdcService.getZqshfxList(param);
         List<DjZqsjfx> zqshfxList = djdcService.getZqshfxList(param);
         List<SjZqfx> sjZqfxList=new ArrayList<>();
         List<SjZqfx> sjZqfxList=new ArrayList<>();
@@ -160,6 +164,16 @@ public class SjDjjcServiceImpl implements ISjDjjcService
             BeanUtils.copyProperties(item,sjZqfx);
             BeanUtils.copyProperties(item,sjZqfx);
             sjZqfx.setJh(jh);
             sjZqfx.setJh(jh);
             sjZqfx.setLjjh(item.getJh());
             sjZqfx.setLjjh(item.getJh());
+            sjZqfx.setCw(item.getCw());
+            sjZqfx.setZjzq(item.getZjzq());
+            sjZqfx.setZjycsl(item.getZjycsl());
+            sjZqfx.setZjsczq(item.getZjsczq());
+            sjZqfx.setZjsl(item.getZjsl());
+            sjZqfx.setZwzq(item.getZwzq());
+            sjZqfx.setWjycsl(item.getWjycsl());
+            sjZqfx.setWjsczq(item.getWjsczq());
+            sjZqfx.setZjycms(item.getZjycms());
+            sjZqfx.setWjycms(item.getWjycms());
             sjZqfxList.add(sjZqfx);
             sjZqfxList.add(sjZqfx);
         });
         });
         if(sjZqfxList.size()>0){
         if(sjZqfxList.size()>0){
@@ -203,7 +217,7 @@ public class SjDjjcServiceImpl implements ISjDjjcService
         for(int i=0;i<sjJsjgList.size();i++){
         for(int i=0;i<sjJsjgList.size();i++){
             SjInfo sjInfo =new SjInfo();
             SjInfo sjInfo =new SjInfo();
             sjInfo.setKc((i+1)+"");
             sjInfo.setKc((i+1)+"");
-            sjInfo.setZtcc(sjJsjgList.get(0).getZtzj());
+            sjInfo.setZtcc(sjJsjgList.get(i).getZtzj());
             sjInfoList.add(sjInfo);
             sjInfoList.add(sjInfo);
         }
         }
         param.setSj(sjInfoList);
         param.setSj(sjInfoList);
@@ -218,7 +232,6 @@ public class SjDjjcServiceImpl implements ISjDjjcService
         if(sjSzfxjgList.size()>0){
         if(sjSzfxjgList.size()>0){
             sjSzfxjgMapper.deleteSjSzfxjgByJh(jh);
             sjSzfxjgMapper.deleteSjSzfxjgByJh(jh);
             sjSzfxjgMapper.insertSjSzfxjgBatch(sjSzfxjgList);
             sjSzfxjgMapper.insertSjSzfxjgBatch(sjSzfxjgList);
-
         }
         }
         return AjaxResult.success();
         return AjaxResult.success();
     }
     }

src/main/java/com/ruoyi/project/zjsgfa/service/impl/SjJsjgServiceImpl.java

@@ -113,8 +113,13 @@ public class SjJsjgServiceImpl implements ISjJsjgService
         List<SjJygjGdsjgdcs> sjJygjGdsjgdcsList = sjJygjGdsjgdcsMapper.selectSjJygjGdsjgdcsList(sjJygjGdsjgdcs);
         List<SjJygjGdsjgdcs> sjJygjGdsjgdcsList = sjJygjGdsjgdcsMapper.selectSjJygjGdsjgdcsList(sjJygjGdsjgdcs);
 
 
         Map jsJgmap =new HashMap();
         Map jsJgmap =new HashMap();
-        Double maxY = sjJygjGdsjgdcsList.stream().map(SjJygjGdsjgdcs::getCs).max(Double::compare).get();
-        Double maxX = sjJygjGdsjgdcsList.stream().map(SjJygjGdsjgdcs::getSpy).max(Double::compare).get();
+        Double maxY =0.0;
+        Double maxX =0.0;
+        if(sjJygjGdsjgdcsList.size()>0){
+            maxY = sjJygjGdsjgdcsList.stream().map(SjJygjGdsjgdcs::getCs).max(Double::compare).get();
+            maxX = sjJygjGdsjgdcsList.stream().map(SjJygjGdsjgdcs::getSpy).max(Double::compare).get();
+        }
+
         jsJgmap.put("maxY",Math.ceil(maxY+500));
         jsJgmap.put("maxY",Math.ceil(maxY+500));
         jsJgmap.put("maxX",Math.ceil(maxX+1000));
         jsJgmap.put("maxX",Math.ceil(maxX+1000));