修改

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

@@ -246,7 +246,10 @@ public class Jsaa extends BaseEntity
     /** $column.columnComment */
     /** $column.columnComment */
 //    @Excel(name = "设计层位")
 //    @Excel(name = "设计层位")
     private String sjcw;
     private String sjcw;
-
+    //公司
+    private String gs;
+    //钻井编号
+    private String zjbhs;
 
 
     //完井开始日期
     //完井开始日期
     private String wjsjks;
     private String wjsjks;

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

@@ -61,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sjcw"    column="sjcw"    />
         <result property="sjcw"    column="sjcw"    />
         <result property="jx"    column="jx"    />
         <result property="jx"    column="jx"    />
         <result property="jb"    column="jb"    />
         <result property="jb"    column="jb"    />
+        <result property="gs"    column="gs"    />
+        <result property="zjbh"    column="zjbh"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectJsaaVo">
     <sql id="selectJsaaVo">
@@ -117,8 +119,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                djfz,
                djfz,
                cyc,
                cyc,
                czds,
                czds,
-               sjcw,b.jx,b.jb
+               sjcw,b.jx,b.jb,f.GS,f.ZJBH
         from jsaa a left join JSBA b on a.JH = b.JH
         from jsaa a left join JSBA b on a.JH = b.JH
+                    left join  JSFM f on a.jh=f.jh
     </sql>
     </sql>
 
 
     <select id="selectJsaaList" parameterType="Jsaa" resultMap="JsaaResult">
     <select id="selectJsaaList" parameterType="Jsaa" resultMap="JsaaResult">