修改

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjFdsgcsZjfxztController.java

+package com.zjsgfa.project.zjsgfa.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zjsgfa.framework.aspectj.lang.annotation.Log;
+import com.zjsgfa.framework.aspectj.lang.enums.BusinessType;
+import com.zjsgfa.project.zjsgfa.domain.SjFdsgcsZjfxzt;
+import com.zjsgfa.project.zjsgfa.service.ISjFdsgcsZjfxztService;
+import com.zjsgfa.framework.web.controller.BaseController;
+import com.zjsgfa.framework.web.domain.AjaxResult;
+import com.zjsgfa.common.utils.poi.ExcelUtil;
+import com.zjsgfa.framework.web.page.TableDataInfo;
+
+/**
+ * 分段施工措施-专家分析钻头Controller
+ * 
+ * @author ruoyi
+ * @date 2025-12-10
+ */
+@RestController
+@RequestMapping("/system/sjFdsgcsZjfxzt")
+public class SjFdsgcsZjfxztController extends BaseController
+{
+    @Autowired
+    private ISjFdsgcsZjfxztService sjFdsgcsZjfxztService;
+
+    /**
+     * 查询分段施工措施-专家分析钻头列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjfxzt:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SjFdsgcsZjfxzt sjFdsgcsZjfxzt)
+    {
+        startPage();
+        List<SjFdsgcsZjfxzt> list = sjFdsgcsZjfxztService.selectSjFdsgcsZjfxztList(sjFdsgcsZjfxzt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出分段施工措施-专家分析钻头列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjfxzt:export')")
+    @Log(title = "分段施工措施-专家分析钻头", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjFdsgcsZjfxzt sjFdsgcsZjfxzt)
+    {
+        List<SjFdsgcsZjfxzt> list = sjFdsgcsZjfxztService.selectSjFdsgcsZjfxztList(sjFdsgcsZjfxzt);
+        ExcelUtil<SjFdsgcsZjfxzt> util = new ExcelUtil<SjFdsgcsZjfxzt>(SjFdsgcsZjfxzt.class);
+        util.exportExcel(response, list, "分段施工措施-专家分析钻头数据");
+    }
+
+    /**
+     * 获取分段施工措施-专家分析钻头详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjfxzt:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sjFdsgcsZjfxztService.selectSjFdsgcsZjfxztById(id));
+    }
+
+    /**
+     * 新增分段施工措施-专家分析钻头
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjfxzt:add')")
+    @Log(title = "分段施工措施-专家分析钻头", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjFdsgcsZjfxzt sjFdsgcsZjfxzt)
+    {
+        return toAjax(sjFdsgcsZjfxztService.insertSjFdsgcsZjfxzt(sjFdsgcsZjfxzt));
+    }
+
+    /**
+     * 修改分段施工措施-专家分析钻头
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjfxzt:edit')")
+    @Log(title = "分段施工措施-专家分析钻头", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjFdsgcsZjfxzt sjFdsgcsZjfxzt)
+    {
+        return toAjax(sjFdsgcsZjfxztService.updateSjFdsgcsZjfxzt(sjFdsgcsZjfxzt));
+    }
+
+    /**
+     * 删除分段施工措施-专家分析钻头
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjfxzt:remove')")
+    @Log(title = "分段施工措施-专家分析钻头", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjFdsgcsZjfxztService.deleteSjFdsgcsZjfxztByIds(ids));
+    }
+}

src/main/java/com/zjsgfa/project/zjsgfa/domain/Cxtj.java

@@ -45,6 +45,8 @@ public class Cxtj extends BaseEntity
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdTime;
 
+    private String lb;
+
     private String jhlist;
 
     private String sfgk;

src/main/java/com/zjsgfa/project/zjsgfa/domain/SjFdsgcsZjfxzt.java

+package com.zjsgfa.project.zjsgfa.domain;
+
+import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
+import com.zjsgfa.framework.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 分段施工措施-专家分析钻头对象 sj_fdsgcs_zjfxzt
+ * 
+ * @author ruoyi
+ * @date 2025-12-10
+ */
+@Data
+public class SjFdsgcsZjfxzt extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 井号 */
+    @Excel(name = "井号")
+    private String jh;
+
+    /** 开次 */
+    @Excel(name = "开次")
+    private String kc;
+
+    /** 邻井井号 */
+    @Excel(name = "邻井井号")
+    private String ljjh;
+
+    /** 优选依据 */
+    @Excel(name = "优选依据")
+    private String yxyj;
+
+    /** 最优建议 */
+    @Excel(name = "最优建议")
+    private String zyjy;
+
+    /** 其次建议 */
+    @Excel(name = "其次建议")
+    private String qcyj;
+
+    /** 推荐评分 */
+    @Excel(name = "推荐评分")
+    private Double tjpf;
+}

src/main/java/com/zjsgfa/project/zjsgfa/mapper/SjFdsgcsZjfxztMapper.java

+package com.zjsgfa.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SjFdsgcsZjfxzt;
+
+/**
+ * 分段施工措施-专家分析钻头Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-10
+ */
+public interface SjFdsgcsZjfxztMapper 
+{
+    /**
+     * 查询分段施工措施-专家分析钻头
+     * 
+     * @param id 分段施工措施-专家分析钻头主键
+     * @return 分段施工措施-专家分析钻头
+     */
+    public SjFdsgcsZjfxzt selectSjFdsgcsZjfxztById(Long id);
+
+    /**
+     * 查询分段施工措施-专家分析钻头列表
+     * 
+     * @param sjFdsgcsZjfxzt 分段施工措施-专家分析钻头
+     * @return 分段施工措施-专家分析钻头集合
+     */
+    public List<SjFdsgcsZjfxzt> selectSjFdsgcsZjfxztList(SjFdsgcsZjfxzt sjFdsgcsZjfxzt);
+
+    /**
+     * 新增分段施工措施-专家分析钻头
+     * 
+     * @param sjFdsgcsZjfxzt 分段施工措施-专家分析钻头
+     * @return 结果
+     */
+    public int insertSjFdsgcsZjfxzt(SjFdsgcsZjfxzt sjFdsgcsZjfxzt);
+
+    /**
+     * 修改分段施工措施-专家分析钻头
+     * 
+     * @param sjFdsgcsZjfxzt 分段施工措施-专家分析钻头
+     * @return 结果
+     */
+    public int updateSjFdsgcsZjfxzt(SjFdsgcsZjfxzt sjFdsgcsZjfxzt);
+
+    /**
+     * 删除分段施工措施-专家分析钻头
+     * 
+     * @param id 分段施工措施-专家分析钻头主键
+     * @return 结果
+     */
+    public int deleteSjFdsgcsZjfxztById(Long id);
+
+    /**
+     * 批量删除分段施工措施-专家分析钻头
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjFdsgcsZjfxztByIds(Long[] ids);
+}

src/main/java/com/zjsgfa/project/zjsgfa/service/ISjFdsgcsZjfxztService.java

+package com.zjsgfa.project.zjsgfa.service;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SjFdsgcsZjfxzt;
+
+/**
+ * 分段施工措施-专家分析钻头Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-10
+ */
+public interface ISjFdsgcsZjfxztService 
+{
+    /**
+     * 查询分段施工措施-专家分析钻头
+     * 
+     * @param id 分段施工措施-专家分析钻头主键
+     * @return 分段施工措施-专家分析钻头
+     */
+    public SjFdsgcsZjfxzt selectSjFdsgcsZjfxztById(Long id);
+
+    /**
+     * 查询分段施工措施-专家分析钻头列表
+     * 
+     * @param sjFdsgcsZjfxzt 分段施工措施-专家分析钻头
+     * @return 分段施工措施-专家分析钻头集合
+     */
+    public List<SjFdsgcsZjfxzt> selectSjFdsgcsZjfxztList(SjFdsgcsZjfxzt sjFdsgcsZjfxzt);
+
+    /**
+     * 新增分段施工措施-专家分析钻头
+     * 
+     * @param sjFdsgcsZjfxzt 分段施工措施-专家分析钻头
+     * @return 结果
+     */
+    public int insertSjFdsgcsZjfxzt(SjFdsgcsZjfxzt sjFdsgcsZjfxzt);
+
+    /**
+     * 修改分段施工措施-专家分析钻头
+     * 
+     * @param sjFdsgcsZjfxzt 分段施工措施-专家分析钻头
+     * @return 结果
+     */
+    public int updateSjFdsgcsZjfxzt(SjFdsgcsZjfxzt sjFdsgcsZjfxzt);
+
+    /**
+     * 批量删除分段施工措施-专家分析钻头
+     * 
+     * @param ids 需要删除的分段施工措施-专家分析钻头主键集合
+     * @return 结果
+     */
+    public int deleteSjFdsgcsZjfxztByIds(Long[] ids);
+
+    /**
+     * 删除分段施工措施-专家分析钻头信息
+     * 
+     * @param id 分段施工措施-专家分析钻头主键
+     * @return 结果
+     */
+    public int deleteSjFdsgcsZjfxztById(Long id);
+}

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFdsgcsServiceImpl.java

@@ -444,12 +444,19 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
             String dcyl="";
             if(collect4.size()>0){
                 List<String> dcylList=new ArrayList<>();
-                collect4.forEach(zjymdtjb -> {
-                    String aa=zjymdtjb.getCw()+" 密度范围为"+zjymdtjb.getMdMin()+"-"+zjymdtjb.getMdMax()+"，取样垂深在"+zjymdtjb.getQycsMin()+"-"+zjymdtjb.getQycsMax()+"。";
+                dcylList.add("经分析，根据邻井钻井液密度分析出的压力情况如下。：<br/>");
+                Map<String, List<SjFdsgcsDcylZjymdtjb>> collect3 = collect4.stream().collect(Collectors.groupingBy(SjFdsgcsDcylZjymdtjb::getLjjh));
+                for(String key:collect3.keySet()){
+                    String aa="邻井"+key+"：" ;
                     dcylList.add(aa);
-                });
-                String bb= String.join(" ",dcylList);
-                dcyl="经分析，根据邻井钻井液密度分析出的压力情况如下。"+bb;
+                    List<SjFdsgcsDcylZjymdtjb> zjymdtjbList1 = collect3.get(key);
+                    zjymdtjbList1.forEach(zjymdtjb -> {
+                        String bb=zjymdtjb.getCw()+" 密度范围为"+zjymdtjb.getMdMin()+"-"+zjymdtjb.getMdMax()+"，取样垂深在"+zjymdtjb.getQycsMin()+"-"+zjymdtjb.getQycsMax()+"。<br/>";
+                        dcylList.add(bb);
+                    });
+                }
+
+                dcyl= String.join(" ",dcylList);
             }
 
 

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFdsgcsZjfxztServiceImpl.java

+package com.zjsgfa.project.zjsgfa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zjsgfa.project.zjsgfa.mapper.SjFdsgcsZjfxztMapper;
+import com.zjsgfa.project.zjsgfa.domain.SjFdsgcsZjfxzt;
+import com.zjsgfa.project.zjsgfa.service.ISjFdsgcsZjfxztService;
+
+/**
+ * 分段施工措施-专家分析钻头Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-12-10
+ */
+@Service
+public class SjFdsgcsZjfxztServiceImpl implements ISjFdsgcsZjfxztService 
+{
+    @Autowired
+    private SjFdsgcsZjfxztMapper sjFdsgcsZjfxztMapper;
+
+    /**
+     * 查询分段施工措施-专家分析钻头
+     * 
+     * @param id 分段施工措施-专家分析钻头主键
+     * @return 分段施工措施-专家分析钻头
+     */
+    @Override
+    public SjFdsgcsZjfxzt selectSjFdsgcsZjfxztById(Long id)
+    {
+        return sjFdsgcsZjfxztMapper.selectSjFdsgcsZjfxztById(id);
+    }
+
+    /**
+     * 查询分段施工措施-专家分析钻头列表
+     * 
+     * @param sjFdsgcsZjfxzt 分段施工措施-专家分析钻头
+     * @return 分段施工措施-专家分析钻头
+     */
+    @Override
+    public List<SjFdsgcsZjfxzt> selectSjFdsgcsZjfxztList(SjFdsgcsZjfxzt sjFdsgcsZjfxzt)
+    {
+        return sjFdsgcsZjfxztMapper.selectSjFdsgcsZjfxztList(sjFdsgcsZjfxzt);
+    }
+
+    /**
+     * 新增分段施工措施-专家分析钻头
+     * 
+     * @param sjFdsgcsZjfxzt 分段施工措施-专家分析钻头
+     * @return 结果
+     */
+    @Override
+    public int insertSjFdsgcsZjfxzt(SjFdsgcsZjfxzt sjFdsgcsZjfxzt)
+    {
+        return sjFdsgcsZjfxztMapper.insertSjFdsgcsZjfxzt(sjFdsgcsZjfxzt);
+    }
+
+    /**
+     * 修改分段施工措施-专家分析钻头
+     * 
+     * @param sjFdsgcsZjfxzt 分段施工措施-专家分析钻头
+     * @return 结果
+     */
+    @Override
+    public int updateSjFdsgcsZjfxzt(SjFdsgcsZjfxzt sjFdsgcsZjfxzt)
+    {
+        return sjFdsgcsZjfxztMapper.updateSjFdsgcsZjfxzt(sjFdsgcsZjfxzt);
+    }
+
+    /**
+     * 批量删除分段施工措施-专家分析钻头
+     * 
+     * @param ids 需要删除的分段施工措施-专家分析钻头主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjFdsgcsZjfxztByIds(Long[] ids)
+    {
+        return sjFdsgcsZjfxztMapper.deleteSjFdsgcsZjfxztByIds(ids);
+    }
+
+    /**
+     * 删除分段施工措施-专家分析钻头信息
+     * 
+     * @param id 分段施工措施-专家分析钻头主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjFdsgcsZjfxztById(Long id)
+    {
+        return sjFdsgcsZjfxztMapper.deleteSjFdsgcsZjfxztById(id);
+    }
+}

src/main/resources/mybatis/zjsgfa/CxtjMapper.xml

@@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="jhlist"    column="jhlist"    />
         <result property="sfgk"    column="sfgk"    />
+        <result property="lb"    column="lb"    />
     </resultMap>
 
     <sql id="selectCxtjVo">
-        select id, cxtjmc, qk, jh, bz, created_by, created_time, update_by, update_time, jhlist, sfgk from cxtj
+        select id, cxtjmc, qk, jh, bz, created_by, created_time, update_by, update_time, jhlist, sfgk,lb from cxtj
     </sql>
 
     <select id="selectCxtjList" parameterType="Cxtj" resultMap="CxtjResult">
@@ -32,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdBy != null  and createdBy != ''"> and (created_by = #{createdBy} or sfgk='是')</if>
             <if test="createdTime != null "> and created_time = #{createdTime}</if>
             <if test="sfgk != null "> and sfgk = #{sfgk}</if>
+            <if test="lb != null "> and lb = #{lb}</if>
         </where>
         order by created_time desc
     </select>
@@ -54,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="jhlist != null">jhlist,</if>
             <if test="sfgk != null">sfgk,</if>
+            <if test="lb != null">lb,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="cxtjmc != null">#{cxtjmc},</if>
@@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="jhlist != null">#{jhlist},</if>
             <if test="sfgk != null">#{sfgk},</if>
+            <if test="lb != null">#{lb},</if>
          </trim>
     </insert>
 
@@ -82,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="jhlist != null">jhlist = #{jhlist},</if>
             <if test="sfgk != null">sfgk = #{sfgk},</if>
+            <if test="lb != null">lb = #{lb},</if>
         </trim>
         where id = #{id}
     </update>

src/main/resources/mybatis/zjsgfa/SjFdsgcsZjfxztMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zjsgfa.project.zjsgfa.mapper.SjFdsgcsZjfxztMapper">
+    
+    <resultMap type="SjFdsgcsZjfxzt" id="SjFdsgcsZjfxztResult">
+        <result property="id"    column="id"    />
+        <result property="jh"    column="jh"    />
+        <result property="kc"    column="kc"    />
+        <result property="ljjh"    column="ljjh"    />
+        <result property="yxyj"    column="yxyj"    />
+        <result property="zyjy"    column="zyjy"    />
+        <result property="qcyj"    column="qcyj"    />
+        <result property="tjpf"    column="tjpf"    />
+    </resultMap>
+
+    <sql id="selectSjFdsgcsZjfxztVo">
+        select id, jh, kc, ljjh, yxyj, zyjy, qcyj, tjpf from sj_fdsgcs_zjfxzt
+    </sql>
+
+    <select id="selectSjFdsgcsZjfxztList" parameterType="SjFdsgcsZjfxzt" resultMap="SjFdsgcsZjfxztResult">
+        <include refid="selectSjFdsgcsZjfxztVo"/>
+        <where>  
+            <if test="jh != null  and jh != ''"> and jh = #{jh}</if>
+            <if test="kc != null  and kc != ''"> and kc = #{kc}</if>
+            <if test="ljjh != null  and ljjh != ''"> and ljjh = #{ljjh}</if>
+            <if test="yxyj != null  and yxyj != ''"> and yxyj = #{yxyj}</if>
+            <if test="zyjy != null  and zyjy != ''"> and zyjy = #{zyjy}</if>
+            <if test="qcyj != null  and qcyj != ''"> and qcyj = #{qcyj}</if>
+            <if test="tjpf != null "> and tjpf = #{tjpf}</if>
+        </where>
+    </select>
+    
+    <select id="selectSjFdsgcsZjfxztById" parameterType="Long" resultMap="SjFdsgcsZjfxztResult">
+        <include refid="selectSjFdsgcsZjfxztVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSjFdsgcsZjfxzt" parameterType="SjFdsgcsZjfxzt" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_fdsgcs_zjfxzt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jh != null">jh,</if>
+            <if test="kc != null">kc,</if>
+            <if test="ljjh != null">ljjh,</if>
+            <if test="yxyj != null">yxyj,</if>
+            <if test="zyjy != null">zyjy,</if>
+            <if test="qcyj != null">qcyj,</if>
+            <if test="tjpf != null">tjpf,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jh != null">#{jh},</if>
+            <if test="kc != null">#{kc},</if>
+            <if test="ljjh != null">#{ljjh},</if>
+            <if test="yxyj != null">#{yxyj},</if>
+            <if test="zyjy != null">#{zyjy},</if>
+            <if test="qcyj != null">#{qcyj},</if>
+            <if test="tjpf != null">#{tjpf},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSjFdsgcsZjfxzt" parameterType="SjFdsgcsZjfxzt">
+        update sj_fdsgcs_zjfxzt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jh != null">jh = #{jh},</if>
+            <if test="kc != null">kc = #{kc},</if>
+            <if test="ljjh != null">ljjh = #{ljjh},</if>
+            <if test="yxyj != null">yxyj = #{yxyj},</if>
+            <if test="zyjy != null">zyjy = #{zyjy},</if>
+            <if test="qcyj != null">qcyj = #{qcyj},</if>
+            <if test="tjpf != null">tjpf = #{tjpf},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSjFdsgcsZjfxztById" parameterType="Long">
+        delete from sj_fdsgcs_zjfxzt where id = #{id}
+    </delete>
+
+    <delete id="deleteSjFdsgcsZjfxztByIds" parameterType="String">
+        delete from sj_fdsgcs_zjfxzt where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file