修改

src/main/java/com/ruoyi/project/zt/controller/JsaaController.java

@@ -41,6 +41,8 @@ public class JsaaController extends BaseController
         return getDataTable(list);
     }
 
+
+
     /**
      * 导出基础数据列表
      */

src/main/java/com/ruoyi/project/zt/controller/JsbaController.java

@@ -6,6 +6,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.zt.domain.Jsaa;
 import com.ruoyi.project.zt.domain.Jsba;
 import com.ruoyi.project.zt.service.IJsbaService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 地质简介基本数据Controller
@@ -40,6 +42,25 @@ public class JsbaController extends BaseController
         return getDataTable(list);
     }
 
+    //查询井型
+    @GetMapping("/selectJxs")
+    public AjaxResult selectJxs(Jsba jsba)
+    {
+
+        List<Jsba> list = jsbaService.selectJsbaList(jsba);
+        List<String> collect = list.stream().map(Jsba::getJx).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+        return AjaxResult.success(collect);
+    }
+
+    //查询井型
+    @GetMapping("/selectJbs")
+    public AjaxResult selectJbs(Jsba jsba)
+    {
+        List<Jsba> list = jsbaService.selectJsbaList(jsba);
+        List<String> collect = list.stream().map(Jsba::getJb).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+        return AjaxResult.success(collect);
+    }
+
     /**
      * 导出地质简介基本数据列表
      */

src/main/java/com/ruoyi/project/zt/domain/CommonParam.java

@@ -14,6 +14,13 @@ public class CommonParam {
     private String path;
     //井号
     private String jh;
+    //井型
+    private List<String> jxs;
+
+    //井别
+    private List<String> jbs;
+    //井深
+    private Double js;
     //区块名称
     private String qk;
 

src/main/java/com/ruoyi/project/zt/mapper/JsbaMapper.java

 package com.ruoyi.project.zt.mapper;
 
+import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
+import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
 import com.ruoyi.project.zt.domain.Jsba;
 
 import java.util.List;
@@ -10,6 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2025-07-10
  */
+@DataSource(value = DataSourceType.SLAVE)
 public interface JsbaMapper 
 {
     /**

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

@@ -73,6 +73,9 @@ public class DjdcServiceImpl implements DjdcService {
     @Autowired
     private TsyxclxxMapper tsyxclxxMapper;
 
+
+    @Autowired
+    private JsbaMapper jsbaMapper;
     @Override
     public List<DjDcInfo> getList(DjDcInfo info) {
         return djdcInfoMapper.getList(info);
@@ -1464,6 +1467,17 @@ public class DjdcServiceImpl implements DjdcService {
 
     @Override
     public List<Ljjw> getLjjwList(CommonParam param) {
+        Jsba jsba = jsbaMapper.selectJsbaByJh(param.getJh());
+        if(jsba!=null){
+            param.setJkhzb(jsba.getJkhzb());
+            param.setJkzzb(jsba.getJkzzb());
+            param.setJdhzb(jsba.getJdhzb());
+            param.setJdzzb(jsba.getJdzzb());
+        }else {
+           return  new ArrayList<>();
+        }
+
+
 
 
         return djdcInfoMapper.getLjjwList(param);

src/main/resources/mybatis/zt/DjdcInfoMapper.xml

@@ -402,6 +402,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND ABS(a.jdzzb - #{jdzzb}) < #{jl}
 
 				and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs}
+			  <if test="qk!=null and qk!=''">
+				  and b.qk like CONCAT(CONCAT('%', #{qk}), '%')
+			  </if>
+			<if test="js!=null">
+				and b.wjjs &lt;= #{js}
+			</if>
+			<if test="jxs != null and jxs.size() > 0">
+				AND a.jx IN
+				<foreach item="item" collection="jxs" open="(" separator="," close=")">
+					#{item}
+				</foreach>
+			</if>
+			<if test="jbs != null and jbs.size() > 0">
+				AND a.jb IN
+				<foreach item="item" collection="jbs" open="(" separator="," close=")">
+					#{item}
+				</foreach>
+			</if>
 			  order by jkjl asc) where ROWNUM &lt;= 5
 		union all
 		select *
@@ -454,6 +472,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				   AND ABS(a.jdzzb - #{jdzzb}) &lt; #{jl}
 
 				   and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs}
+					<if test="qk!=null and qk!=''">
+						and b.qk like CONCAT(CONCAT('%', #{qk}), '%')
+					</if>
+					<if test="js!=null">
+						and b.wjjs &lt;= #{js}
+					</if>
+				<if test="jxs != null and jxs.size() > 0">
+					AND a.jx IN
+					<foreach item="item" collection="jxs" open="(" separator="," close=")">
+						#{item}
+					</foreach>
+				</if>
+			<if test="jbs != null and jbs.size() > 0">
+				AND a.jb IN
+				<foreach item="item" collection="jbs" open="(" separator="," close=")">
+					#{item}
+				</foreach>
+			</if>
 				 order by jdjl asc
 
 			 ) where ROWNUM &lt; =5 ) a order by jh