修改

src/main/java/com/ruoyi/project/ys/domain/YsqqXmxxSegy.java

 package com.ruoyi.project.ys.domain;
 package com.ruoyi.project.ys.domain;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -72,9 +74,9 @@ public class YsqqXmxxSegy extends BaseEntity
     private String xbsegyName;
     private String xbsegyName;
 
 
     //旧版标注内容
     //旧版标注内容
-    private String jbbznr;
+    private List<YsqqXmxxSegydz> jbbznr;
     /** 新版标注内容 */
     /** 新版标注内容 */
-    private String xbbznr;
+    private List<YsqqXmxxSegydz> xbbznr;
 
 
 
 
     public void setId(Long id)
     public void setId(Long id)

src/main/java/com/ruoyi/project/ys/service/impl/YsqqXmxxServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.ys.service.impl;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.DateUtils;
@@ -138,16 +139,11 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
         List<YsqqXmxxSegydz> ysqqXmxxSegydzs = ysqqXmxxSegydzMapper.selectYsqqXmxxSegydzList(ysqqXmxxSegydz);
         List<YsqqXmxxSegydz> ysqqXmxxSegydzs = ysqqXmxxSegydzMapper.selectYsqqXmxxSegydzList(ysqqXmxxSegydz);
         for(YsqqXmxxSegy segy: segyList){
         for(YsqqXmxxSegy segy: segyList){
             //查询旧版
             //查询旧版
-            YsqqXmxxSegydz jb = ysqqXmxxSegydzs.stream().filter(dz -> dz.getSegyid().toString().equals(segy.getId().toString()) && dz.getLx().equals("旧版")).findFirst().orElse(null);
-            if(jb != null){
-                segy.setJbbznr(jb.getBznr());
-            }
+            List<YsqqXmxxSegydz> jbList = ysqqXmxxSegydzs.stream().filter(dz -> dz.getSegyid().toString().equals(segy.getId().toString()) && dz.getLx().equals("旧版")).collect(Collectors.toList());
+            segy.setJbbznr(jbList);
             //查询新版
             //查询新版
-            YsqqXmxxSegydz xb = ysqqXmxxSegydzs.stream().filter(dz -> dz.getSegyid().toString().equals(segy.getId().toString()) && dz.getLx().equals("新版")).findFirst().orElse(null);
-            if(xb != null){
-                segy.setXbbznr(xb.getBznr());
-            }
-
+            List<YsqqXmxxSegydz> xb = ysqqXmxxSegydzs.stream().filter(dz -> dz.getSegyid().toString().equals(segy.getId().toString()) && dz.getLx().equals("新版")).collect(Collectors.toList());
+            segy.setXbbznr(xb);
         }
         }
 
 
         ysqqXmxx.setYsqqXmxxSegy(segyList);
         ysqqXmxx.setYsqqXmxxSegy(segyList);

src/main/resources/mybatis/ysqqXmxxSegydz/YsqqXmxxSegydzMapper.xml

@@ -74,9 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
          </trim>
     </insert>
     </insert>
     <insert id="insertYsqqXmxxSegydzBatch">
     <insert id="insertYsqqXmxxSegydzBatch">
-        insert into ysqq_xmxx_segydz (xmid, segyid, lx, bznr) values
+        insert into ysqq_xmxx_segydz (xmid, segyid, lx, bznr,ext1) values
         <foreach item="item" index="index" collection="list" separator=",">
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{item.xmid}, #{item.segyid}, #{item.lx}, #{item.bznr})
+            (#{item.xmid}, #{item.segyid}, #{item.lx}, #{item.bznr}, #{item.ext1})
         </foreach>
         </foreach>
     </insert>
     </insert>