修改

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

@@ -193,11 +193,34 @@ public class SjDjjcController extends BaseController
     }
     }
 
 
     @GetMapping("/getList")
     @GetMapping("/getList")
-    public TableDataInfo apiList(SjDjjc sjDjjc)
+    public AjaxResult apiList(SjDjjc sjDjjc)
     {
     {
 //        startPage();
 //        startPage();
+
+
         List<SjDjjc> list = sjDjjcService.selectSjDjjcList(sjDjjc);
         List<SjDjjc> list = sjDjjcService.selectSjDjjcList(sjDjjc);
-        return getDataTable(list);
+        Map<String,Object> map=new HashMap<>();
+
+
+
+        map.put("jh", "井号");
+        map.put("jb", "井别");
+        map.put("jx", "井型");
+        map.put("qk", "区块");
+        map.put("jkhzb", "井口横坐标");
+        map.put("jkzzb", "井口纵坐标");
+        map.put("gzwz", "构造位置");
+        map.put("wzcw", "完钻层位");
+        map.put("ztmd", "钻探目的");
+        map.put("wzyz", "完钻原则");
+        map.put("wjfa", "完井方法");
+        map.put("createdBy", "创建人");
+        map.put("createdTime", "创建时间");
+        map.put("zjgs", "钻井公司");
+        map.put("zjd", "钻井队");
+        map.put("jdhzb", "井底横坐标");
+        map.put("jdzzb", "井底纵坐标");
+        return AjaxResult.success(list,map);
     }
     }
 
 
     /**
     /**

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

 package com.ruoyi.project.zjsgfa.controller;
 package com.ruoyi.project.zjsgfa.controller;
 
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.project.zjsgfa.domain.SjDjjc;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +49,36 @@ public class SjDzfcController extends BaseController
         List<SjDzfc> list = sjDzfcService.selectSjDzfcList(sjDzfc);
         List<SjDzfc> list = sjDzfcService.selectSjDzfcList(sjDzfc);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
+    @GetMapping("/getList")
+    public AjaxResult apiList(SjDzfc sjDzfc)
+    {
+        Map<String,Object> map=new HashMap<>();
+        List<SjDzfc> list = sjDzfcService.selectSjDzfcList(sjDzfc);
+
+
+        map.put("dcJ", "界");
+        map.put("dcX", "系");
+        map.put("dcT", "统");
+        map.put("dcZ", "组");
+        map.put("dcD", "段");
+        map.put("sjjh", "设计井号");
+        map.put("sjdcs", "底垂深");
+        map.put("sjjcgx", "接触关系");
+        map.put("sjhd", "厚度");
+        map.put("sjddsd", "断点深度");
+        map.put("yjjh1", "依据井号1");
+        map.put("yjdcs1", "依据底深1");
+        map.put("yjjcgx1", "接触关系1");
+        map.put("yjhyjd1", "含油井段1");
+        map.put("yjddsd1", "断点深度1");
+        map.put("sjyxts", "设计井岩性提示");
+        map.put("yjjh2", "依据井号2");
+        map.put("yjdcs2", "依据底深2");
+        map.put("yjjcgx2", "接触关系2");
+        map.put("yjhyjd2", "含油井段2");
+        map.put("yjddsd2", "断点深度2");
+        return AjaxResult.success(list,map);
+    }
 
 
     /**
     /**
      * 导出地质分层列表
      * 导出地质分层列表

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.controller;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
@@ -9,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.project.zjsgfa.domain.SjDjjc;
 import com.ruoyi.project.zjsgfa.domain.SjDjjc;
+import com.ruoyi.project.zjsgfa.domain.SjDzfc;
 import com.ruoyi.project.zjsgfa.domain.SjJsjgt;
 import com.ruoyi.project.zjsgfa.domain.SjJsjgt;
 import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -49,9 +51,28 @@ public class SjJsjgController extends BaseController
     {
     {
 //        startPage();
 //        startPage();
         List<SjJsjg> list = sjJsjgService.selectSjJsjgList(sjJsjg);
         List<SjJsjg> list = sjJsjgService.selectSjJsjgList(sjJsjg);
+        
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 
+    @GetMapping("/getList")
+    public AjaxResult apiList(SjJsjg sjJsjg) {
+        Map<String, Object> map = new HashMap<>();
+        List<SjJsjg> list = sjJsjgService.selectSjJsjgList(sjJsjg);
+
+
+
+        map.put("jh", "井号");
+        map.put("kc", "开次");
+        map.put("ztzj", "钻头直径");
+        map.put("js", "井深");
+        map.put("ttwj", "套管外径");
+        map.put("ttds", "套管顶深");
+        map.put("ttxs", "套管下深");
+        map.put("snfg", "水泥返高");
+        return AjaxResult.success( list,map);
+    }
+
     /**
     /**
      * 导出设计信息-井身结构列表
      * 导出设计信息-井身结构列表
      */
      */

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

 package com.ruoyi.project.zjsgfa.controller;
 package com.ruoyi.project.zjsgfa.controller;
 
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
@@ -49,6 +50,29 @@ public class SjJygjGdsjgdcsController extends BaseController
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 
+    @GetMapping("/getList")
+    public AjaxResult getList(SjJygjGdsjgdcs sjJygjGdsjgdcs)
+    {
+//        startPage();
+        List<SjJygjGdsjgdcs> list = sjJygjGdsjgdcsService.selectSjJygjGdsjgdcsList(sjJygjGdsjgdcs);
+        Map<String, Object> map = new HashMap<>();
+        map.put("jh", "井号");
+        map.put("js", "井深");
+        map.put("jx", "井斜");
+        map.put("fw", "方位");
+        map.put("bhfw", "闭合方位");
+        map.put("cs", "垂深");
+        map.put("bhj", "闭合距");
+        map.put("nbwy", "南北位移");
+        map.put("dxwy", "东西位移");
+        map.put("zxl", "造斜率");
+        map.put("fwbhl", "方位变化率");
+        map.put("qjbhl", "全角变化率");
+        map.put("gjm", "工具面");
+        map.put("spy", "视平移");
+        return AjaxResult.success(list,map);
+    }
+
     /**
     /**
      * 导出设计信息-井眼轨迹_轨道设计各点参数列表
      * 导出设计信息-井眼轨迹_轨道设计各点参数列表
      */
      */

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

 package com.ruoyi.project.zjsgfa.controller;
 package com.ruoyi.project.zjsgfa.controller;
 
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +48,25 @@ public class SjTgTgxnsjController extends BaseController
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 
+    @GetMapping("/getList")
+    public AjaxResult getList(SjTgTgxnsj sjTgTgxnsj)
+    {
+//        startPage();
+        List<SjTgTgxnsj> list = sjTgTgxnsjService.selectSjTgTgxnsjList(sjTgTgxnsj);
+        Map<String, Object> map = new HashMap<>();
+        map.put("jh", "井号");
+        map.put("wj", "外径");
+        map.put("gj", "钢级");
+        map.put("bh", "壁厚");
+        map.put("kx", "扣型");
+        map.put("mmzl", "每米重量");
+        map.put("jgwj", "接箍外径");
+        map.put("klqd", "抗拉强度");
+        map.put("kjqd", "抗挤强度");
+        map.put("knyqd", "抗内压强度");
+        return AjaxResult.success(list,map);
+    }
+
     /**
     /**
      * 导出设计信息-套管性能数据列表
      * 导出设计信息-套管性能数据列表
      */
      */

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

 package com.ruoyi.project.zjsgfa.controller;
 package com.ruoyi.project.zjsgfa.controller;
 
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +48,25 @@ public class SjTgTgzController extends BaseController
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 
+    @GetMapping("/getList")
+    public AjaxResult getList(SjTgTgz sjTgTgz)
+    {
+//        startPage();
+        List<SjTgTgz> list = sjTgTgzService.selectSjTgTgzList(sjTgTgz);
+        Map<String, Object> map = new HashMap<>();
+        map.put("jh", "井号");
+        map.put("kc", "开次");
+        map.put("jd", "井段");
+        map.put("wj", "外径");
+        map.put("gj", "钢级");
+        map.put("bh", "壁厚");
+        map.put("kx", "扣型");
+        map.put("zjsknj", "最佳上扣扭矩");
+        map.put("cd", "长度");
+        map.put("zjymd", "钻井液密度");
+        return AjaxResult.success(list,map);
+    }
+
     /**
     /**
      * 导出设计信息-套管柱数据列表
      * 导出设计信息-套管柱数据列表
      */
      */

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

 package com.ruoyi.project.zjsgfa.controller;
 package com.ruoyi.project.zjsgfa.controller;
 
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
@@ -47,6 +48,22 @@ public class SjZjyFdxnbController extends BaseController
         return AjaxResult.success(list);
         return AjaxResult.success(list);
     }
     }
 
 
+    @GetMapping("/getList")
+    public AjaxResult getList(SjZjyFdxnb sjZjyFdxnb)
+    {
+//        startPage();
+        Map<String, Object> list = sjZjyFdxnbService.selectSjZjyFdxnbList(sjZjyFdxnb);
+        Map<String, Object> map = new HashMap<>();
+        List<String> wellSegments=( List<String> ) list.get("jds");
+        map.put("项目","项目");
+        for(String s:wellSegments){
+            map.put(s,s);
+        }
+
+
+        return AjaxResult.success(list,map);
+    }
+
     /**
     /**
      * 导出设计信息-分段钻井液性能设计列表
      * 导出设计信息-分段钻井液性能设计列表
      */
      */

src/main/java/com/ruoyi/project/zt/service/impl/DjdcServiceImpl.java

@@ -1852,7 +1852,11 @@ public class DjdcServiceImpl implements DjdcService {
             //查询日报数据
             //查询日报数据
             Zsjrb zsjrb=djdcInfoMapper.getZsjrbList(zsjfx.getJh());
             Zsjrb zsjrb=djdcInfoMapper.getZsjrbList(zsjfx.getJh());
             if(zsjrb!=null){
             if(zsjrb!=null){
-                BeanUtils.copyProperties(zsjrb,zsjfx);
+                zsjfx.setCwmc(zsjrb.getCwmc());
+                zsjfx.setSdfw(zsjrb.getSdfw());
+                zsjfx.setJkyl(zsjrb.getYy());
+                zsjfx.setRzl(zsjrb.getPzl());
+                zsjfx.setRzl(zsjrb.getPzl());
                 if(zsjrb.getScsc()>0){
                 if(zsjrb.getScsc()>0){
                     zsjfx.setSftz("否");
                     zsjfx.setSftz("否");
                 }else {
                 }else {