Merge branch 'master' of http://49.232.152.146:6688/jiangyun/dizhen

d1afb415 · wangqi · 1e10afa9 · 58925122 · d1afb415 · d1afb415
Commit d1afb415 authored Nov 03, 2025 by wangqi
8 changed files
--- a/src/main/java/com/ruoyi/project/ys/controller/YsqqXmxxSegydzController.java
+++ b/src/main/java/com/ruoyi/project/ys/controller/YsqqXmxxSegydzController.java
@@ -2,6 +2,8 @@ package com.ruoyi.project.ys.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,6 +48,14 @@ public class YsqqXmxxSegydzController extends BaseController
        return getDataTable(list);
    }
+    @GetMapping("/getList")
+    public TableDataInfo getList(YsqqXmxxSegydz ysqqXmxxSegydz)
+    {
+//        startPage();
+        List<YsqqXmxxSegydz> list = ysqqXmxxSegydzService.selectYsqqXmxxSegydzList(ysqqXmxxSegydz);
+        return getDataTable(list);
+    }
    /**
     * 导出segy文件标注列表
     */
@@ -101,4 +111,15 @@ public class YsqqXmxxSegydzController extends BaseController
    {
        return toAjax(ysqqXmxxSegydzService.deleteYsqqXmxxSegydzByIds(ids));
    }
+    @PostMapping("/addAll")
+    public AjaxResult addAll(@RequestBody YsqqXmxxSegydz ysqqXmxxSegydz)
+    {
+        List<YsqqXmxxSegydz> list = ysqqXmxxSegydz.getList();
+        if(list.size()==0){
+            return AjaxResult.error("数据不能为空！");
+        }
+        return toAjax(ysqqXmxxSegydzService.addAll(ysqqXmxxSegydz));
+    }
 }
--- a/src/main/java/com/ruoyi/project/ys/domain/YsqqXmxxSegy.java
+++ b/src/main/java/com/ruoyi/project/ys/domain/YsqqXmxxSegy.java
@@ -2,6 +2,7 @@ package com.ruoyi.project.ys.domain;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
 * @author ruoyi
 * @date 2025-09-18
 */
+@Data
 public class YsqqXmxxSegy extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
@@ -69,6 +71,12 @@ public class YsqqXmxxSegy extends BaseEntity
    @Excel(name = "新版segy名称")
    private String xbsegyName;
+    //旧版标注内容
+    private String jbbznr;
+    /** 新版标注内容 */
+    private String xbbznr;
    public void setId(Long id)
    {
        this.id = id;

--- a/src/main/java/com/ruoyi/project/ys/domain/YsqqXmxxSegydz.java
+++ b/src/main/java/com/ruoyi/project/ys/domain/YsqqXmxxSegydz.java
 package com.ruoyi.project.ys.domain;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +18,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
 * @author ruoyi
 * @date 2025-09-17
 */
+@Data
 public class YsqqXmxxSegydz extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
@@ -57,6 +63,8 @@ public class YsqqXmxxSegydz extends BaseEntity
    @Excel(name = "备用3")
    private String ext3;
+    private List<YsqqXmxxSegydz> list =new ArrayList<>();
    public void setId(Long id) 
    {
        this.id = id;

--- a/src/main/java/com/ruoyi/project/ys/mapper/YsqqXmxxSegydzMapper.java
+++ b/src/main/java/com/ruoyi/project/ys/mapper/YsqqXmxxSegydzMapper.java
@@ -58,4 +58,10 @@ public interface YsqqXmxxSegydzMapper
     * @return 结果
     */
    public int deleteYsqqXmxxSegydzByIds(Long[] ids);
+    int deleteYsqqXmxxSegydzBySegyId(Long segyid);
+    int insertYsqqXmxxSegydzBatch(List<YsqqXmxxSegydz> list);
 }
--- a/src/main/java/com/ruoyi/project/ys/service/IYsqqXmxxSegydzService.java
+++ b/src/main/java/com/ruoyi/project/ys/service/IYsqqXmxxSegydzService.java
@@ -58,4 +58,8 @@ public interface IYsqqXmxxSegydzService
     * @return 结果
     */
    public int deleteYsqqXmxxSegydzById(Long id);
+    int addAll(YsqqXmxxSegydz ysqqXmxxSegydz);
 }
--- a/src/main/java/com/ruoyi/project/ys/service/impl/YsqqXmxxSegydzServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/ys/service/impl/YsqqXmxxSegydzServiceImpl.java
@@ -92,4 +92,13 @@ public class YsqqXmxxSegydzServiceImpl implements IYsqqXmxxSegydzService
    {
        return ysqqXmxxSegydzMapper.deleteYsqqXmxxSegydzById(id);
    }
+    @Override
+    public int addAll(YsqqXmxxSegydz ysqqXmxxSegydz) {
+        List<YsqqXmxxSegydz> list = ysqqXmxxSegydz.getList();
+        //删除旧数据
+        ysqqXmxxSegydzMapper.deleteYsqqXmxxSegydzBySegyId(list.get(0).getSegyid());
+        return ysqqXmxxSegydzMapper.insertYsqqXmxxSegydzBatch(list);
+    }
 }
--- a/src/main/java/com/ruoyi/project/ys/service/impl/YsqqXmxxServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/ys/service/impl/YsqqXmxxServiceImpl.java
@@ -33,6 +33,10 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
    @Autowired
    private YsqqXmxxSegyMapper ysqqXmxxSegyMapper;
+    @Autowired
+    private YsqqXmxxSegydzMapper ysqqXmxxSegydzMapper;
    /**
     * 查询验收前期-项目信息
     * 
@@ -129,6 +133,23 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
        YsqqXmxxSegy ysqqXmxxSegy = new YsqqXmxxSegy();
        ysqqXmxxSegy.setZbid(id);
        List<YsqqXmxxSegy> segyList = ysqqXmxxSegyMapper.selectYsqqXmxxSegyList(ysqqXmxxSegy);
+        YsqqXmxxSegydz ysqqXmxxSegydz = new YsqqXmxxSegydz();
+        ysqqXmxxSegydz.setXmid(id);
+        List<YsqqXmxxSegydz> ysqqXmxxSegydzs = ysqqXmxxSegydzMapper.selectYsqqXmxxSegydzList(ysqqXmxxSegydz);
+        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());
+            }
+            //查询新版
+            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());
+            }
+        }
        ysqqXmxx.setYsqqXmxxSegy(segyList);
        return ysqqXmxx;
    }

--- a/src/main/resources/mybatis/ysqqXmxxSegydz/YsqqXmxxSegydzMapper.xml
+++ b/src/main/resources/mybatis/ysqqXmxxSegydz/YsqqXmxxSegydzMapper.xml
@@ -73,6 +73,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="ext3 != null">#{ext3},</if>
         </trim>
    </insert>
+    <insert id="insertYsqqXmxxSegydzBatch">
+        insert into ysqq_xmxx_segydz (xmid, segyid, lx, bznr) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.xmid}, #{item.segyid}, #{item.lx}, #{item.bznr})
+        </foreach>
+    </insert>
    <update id="updateYsqqXmxxSegydz" parameterType="YsqqXmxxSegydz">
        update ysqq_xmxx_segydz
@@ -102,4 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            #{id}
        </foreach>
    </delete>
+    <delete id="deleteYsqqXmxxSegydzBySegyId">
+        delete from ysqq_xmxx_segydz where segyid = #{segyid}
+    </delete>
 </mapper>
\ No newline at end of file