修改

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

@@ -101,4 +101,7 @@ public class MxglpzController extends BaseController
     {
         return toAjax(mxglpzService.deleteMxglpzByIds(ids));
     }
+
+
+
 }

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

@@ -15,6 +15,7 @@ import com.deepoove.poi.data.PictureType;
 import com.deepoove.poi.data.Pictures;
 import com.deepoove.poi.plugin.table.LoopColumnTableRenderPolicy;
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.zjsgfa.common.constant.Constants;
 import com.zjsgfa.common.utils.StringUtils;
 import com.zjsgfa.common.utils.bean.BeanUtils;
@@ -294,8 +295,7 @@ public class SjDjjcController extends BaseController
     @PreAuthorize("@ss.hasPermi('designInformation:sjDjjc:add')")
     @Log(title = "设计信息-井基础信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody SjDjjc sjDjjc)
-    {
+    public AjaxResult add(@RequestBody SjDjjc sjDjjc) throws Exception {
         int i = sjDjjcService.insertSjDjjc(sjDjjc);
         if(i==3){
             return AjaxResult.error("该井号已存在！");
@@ -311,7 +311,7 @@ public class SjDjjcController extends BaseController
     @PreAuthorize("@ss.hasPermi('designInformation:sjDjjc:edit')")
     @Log(title = "设计信息-井基础信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody SjDjjc sjDjjc)
+    public AjaxResult edit(@RequestBody SjDjjc sjDjjc)  throws Exception
     {
         return toAjax(sjDjjcService.updateSjDjjc(sjDjjc));
     }

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

@@ -83,6 +83,8 @@ public class SgfambKcSggy extends BaseEntity
     @Excel(name = "钻井工程措施")
     private String zjgccs;
 
+    private String fxts;
+
     /** 创建人 */
     @Excel(name = "创建人")
     private String createdBy;

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

@@ -58,4 +58,7 @@ public interface MxglpzMapper
      * @return 结果
      */
     public int deleteMxglpzByIds(Long[] ids);
+
+    Mxglpz selectMxglpzByName(String ffmc);
+
 }

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

@@ -2,6 +2,7 @@ package com.zjsgfa.project.zjsgfa.service;
 
 import java.util.List;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.zjsgfa.framework.web.domain.AjaxResult;
 import com.zjsgfa.project.zjsgfa.domain.SjDjjc;
 import com.zjsgfa.project.zt.domain.CommonParam;
@@ -36,7 +37,7 @@ public interface ISjDjjcService
      * @param sjDjjc 设计信息-井基础信息
      * @return 结果
      */
-    public int insertSjDjjc(SjDjjc sjDjjc);
+    public int insertSjDjjc(SjDjjc sjDjjc) throws Exception;
 
     /**
      * 修改设计信息-井基础信息
@@ -44,7 +45,7 @@ public interface ISjDjjcService
      * @param sjDjjc 设计信息-井基础信息
      * @return 结果
      */
-    public int updateSjDjjc(SjDjjc sjDjjc);
+    public int updateSjDjjc(SjDjjc sjDjjc) throws Exception ;
 
     /**
      * 批量删除设计信息-井基础信息

src/main/java/com/zjsgfa/project/zt/controller/DjdcController.java

@@ -7,6 +7,7 @@ import com.zjsgfa.framework.web.domain.AjaxResult;
 import com.zjsgfa.project.zt.domain.*;
 import com.zjsgfa.project.zt.domain.vo.JsgaVo;
 import com.zjsgfa.project.zt.service.DjdcService;
+import org.apache.ibatis.annotations.Param;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -359,6 +360,35 @@ public class DjdcController {
     }
 
 
+    /**
+     * 计算邻井复杂情况
+     * @return
+     */
+    @GetMapping("/jsljfzqk")
+    public String jsljfzqk(CommonParam param) {
+        return djdcService.jsljfzqk(param);
+    }
+
+    /**
+     * 计算具体位置
+     * @return
+     */
+    @GetMapping("/jsjtwz")
+    public String jsjtwz(CommonParam param) {
+        return djdcService.jsjtwz(param);
+    }
+
+    /**
+     * 计算馆陶组距底深
+     * @return
+     */
+    @GetMapping("/jsgtzjds")
+    public String jsgtzjds(CommonParam param) {
+        return djdcService.jsgtzjds(param);
+    }
+
+
+
     public void exportZqshfx(HttpServletResponse response,List<DjZqsjfx> list)throws IOException {
         Workbook exl = null;
         OutputStream out = null;

src/main/java/com/zjsgfa/project/zt/domain/Jsqa.java

@@ -27,5 +27,9 @@ public class Jsqa {
     private Double zjjjss;
     private Double js;
 
+    private String cw;
+    private String sjhd;
+    private Double bfb;
+
     private List<String> jhs;
 }

src/main/java/com/zjsgfa/project/zt/mapper/DjdcInfoMapper.java

@@ -61,4 +61,8 @@ public interface DjdcInfoMapper {
 
     List<Jskd> getJskdList(CommonParam param);
 
+    Jsqa jsljfzqk(CommonParam param);
+
+    Double jsgtzjds(CommonParam param);
+
 }

src/main/java/com/zjsgfa/project/zt/service/DjdcService.java

@@ -66,4 +66,11 @@ public interface DjdcService {
 
     List<Jskd> getJskdList(CommonParam param);
 
+    String jsljfzqk(CommonParam param);
+
+
+    String jsjtwz(CommonParam param);
+
+    String jsgtzjds(CommonParam param);
+
 }

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

@@ -1970,6 +1970,32 @@ public class DjdcServiceImpl implements DjdcService {
         return jskdList;
     }
 
+    @Override
+    public String jsljfzqk(CommonParam param) {
+        String jh = param.getJh();
+//        if(StringUtils.isNotEmpty(param.getJh())){
+//            String[] jhs = param.getJh().split(",");
+//            param.setJhs(jhs);
+//        }
+        Jsqa jsqa=djdcInfoMapper.jsljfzqk(param);
+        String s="";
+        if(jsqa!=null){
+            s="邻井在"+jsqa.getJs()+"m"+jsqa.getCw()+"（层厚"+jsqa.getSjhd()+"m）距顶部"+jsqa.getBfb()+"%处发生"+jsqa.getFzqk();
+        }
+        return s;
+    }
+
+    @Override
+    public String jsjtwz(CommonParam param) {
+        return null;
+    }
+
+    @Override
+    public String jsgtzjds(CommonParam param) {
+        Double s=djdcInfoMapper.jsgtzjds(param);
+        return s+"";
+    }
+
     /**
      * 计算斜深
      * @param a 层位垂深

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

@@ -38,6 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectMxglpzVo"/>
         where id = #{id}
     </select>
+    <select id="selectMxglpzByName" resultType="com.zjsgfa.project.zjsgfa.domain.Mxglpz">
+        select * from mxglpz where ffmc = #{ffmc} limit 1
+    </select>
 
     <insert id="insertMxglpz" parameterType="Mxglpz" useGeneratedKeys="true" keyProperty="id">
         insert into mxglpz

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

@@ -29,11 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="zjzhtjid"    column="zjzhtjid"    />
         <result property="sgcstjid"    column="sgcstjid"    />
         <result property="tjmc"    column="tjmc"    />
+        <result property="fxts"    column="fxts"    />
     </resultMap>
 
     <sql id="selectSgfambKcSggyVo">
         select id, zbid, kc, ksjs, jsjs, ztxh, zjzy, zjzs, zjpl, zjby, zjzh, zjzhzysx, gjfx, gjyh, zjycs,
-               zjgccs, created_by, created_time, update_by, update_time, zttjid,zjzhtjid,sgcstjid,tjmc from sgfamb_kc_sggy
+               zjgccs, created_by, created_time, update_by, update_time, zttjid,zjzhtjid,sgcstjid,tjmc,fxts from sgfamb_kc_sggy
     </sql>
 
     <select id="selectSgfambKcSggyList" parameterType="SgfambKcSggy" resultMap="SgfambKcSggyResult">
@@ -105,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zjzhtjid != null">zjzhtjid,</if>
             <if test="sgcstjid != null">sgcstjid,</if>
             <if test="tjmc != null">tjmc,</if>
+            <if test="fxts != null">fxts,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="zbid != null">#{zbid},</if>
@@ -130,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zjzhtjid != null">#{zjzhtjid},</if>
             <if test="sgcstjid != null">#{sgcstjid},</if>
             <if test="tjmc != null">#{tjmc},</if>
+            <if test="fxts != null">#{fxts},</if>
          </trim>
     </insert>
 
@@ -159,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sgcstjid != null">sgcstjid = #{sgcstjid},</if>
             <if test="zjzhtjid != null">zjzhtjid = #{zjzhtjid},</if>
             <if test="tjmc != null">tjmc = #{tjmc},</if>
+            <if test="fxts != null">fxts = #{fxts},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -802,47 +802,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		SELECT
 		a.*,
 		c.cw gldc,
-		LEAD(a.jx) OVER (PARTITION BY a.jh ORDER BY a.dc) AS nextjx,
-		LEAD(a.dc) OVER (PARTITION BY a.jh ORDER BY a.dc) AS nextdc,
+		LEAD(a.jx) OVER (PARTITION BY a.jh ORDER BY a.xh) AS nextjx,
+		LEAD(a.dc) OVER (PARTITION BY a.jh ORDER BY a.xh) AS nextdc,
 		-- 计算井斜变化率
 		CASE
-		WHEN LEAD(a.dc) OVER (PARTITION BY a.jh ORDER BY a.dc) IS NOT NULL
-		THEN (LEAD(a.jx) OVER (PARTITION BY a.jh ORDER BY a.dc) - a.jx)
-		/ LEAD(a.dc) OVER (PARTITION BY a.jh ORDER BY a.dc) * 30
+		WHEN LEAD(a.dc) OVER (PARTITION BY a.jh ORDER BY a.xh) IS NOT NULL
+		THEN (LEAD(a.jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - a.jx)
+		/ LEAD(a.dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30
 		ELSE NULL
 		END AS jxbhl,
 		-- 根据井斜变化率进行分类
 		CASE
-		WHEN LEAD(dc) OVER (PARTITION BY a.jh ORDER BY dc) IS NULL THEN NULL
+		WHEN LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) IS NULL THEN NULL
 		-- 自然增：大于0且小于0.1
-		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY dc) - jx)
-		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY dc) * 30 > 0
-		AND (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY dc) - jx)
-		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY dc) * 30
+		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
+		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30 > 0
+		AND (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
+		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30
 		<
 		0.1
 		THEN '自然增'
 		-- 自然降：小于0且大于-0.1
-		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY dc) - jx)
-		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY dc) * 30
+		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
+		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30
 		<
 		0
-		AND (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY dc) - jx)
-		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY dc) * 30 > -0.1
+		AND (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
+		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30 > -0.1
 		THEN '自然降'
 		-- 人工增：大于1
-		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY dc) - jx)
-		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY dc) * 30 > 1
+		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
+		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30 > 1
 		THEN '人工增'
 		-- 人工降：小于-1
-		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY dc) - jx)
-		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY dc) * 30
+		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
+		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30
 		<
 		-1
 		THEN '人工降'
 		-- 其他情况（如0.1~1之间或-1~-0.1之间）
 		ELSE null
-		END AS zrzjx
+		END AS zrzjx,d.gynr glzxd
 		FROM jskd a
 
 		left join (
@@ -851,6 +851,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		LAG(SJDJSD2, 1, 0) OVER (PARTITION BY jh ORDER BY SJDJSD2) AS ksjs,
 		SJDJSD2,CW
 		FROM jsbb) c on a.JH=c.JH and NVL(a.LJCZJS,0)>=c.ksjs and NVL(a.LJCZJS,0) < c.SJDJSD2
+		left join jskc d on a.JH=d.jh and a.xh=d.xh
 		where 1=1
 		<if test="jhs!=null">
 			and a.jh in
@@ -861,4 +862,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		ORDER BY a.jh, a.xh
 	</select>
+    <select id="jsljfzqk" resultType="com.zjsgfa.project.zt.domain.Jsqa">
+		select a.jh,a.FZQK,a.js, cw,c.SJHD,ROUND(a.js/max(j.XJS)*100,1) bfb
+		from JSQA a
+		left join  (
+		SELECT
+		jh,
+		LAG(SJDJSD, 1, 0) OVER (PARTITION BY jh ORDER BY SJDJSD) AS ksjs,
+		SJDJSD,CW,SJHD
+		FROM jsbb) c on a.JH=c.JH and a.js>=c.ksjs and a.js &lt; c.SJDJSD
+															  left join JSKD J on a.JH = J.JH
+															  where a.JH = #{jh}
+															  and JS =  #{js} group by a.JH,a.FZQK,a.JS, cw, c.SJHD
+	</select>
+	<select id="jsgtzjds" resultType="java.lang.Double">
+		WITH max_value_cte AS (
+			-- 计算全表中SJDJSD的最大值
+			SELECT MAX("SJDJSD") AS max_value
+			FROM JSbb where  JH=#{jh}
+		),
+			 guantao_value_cte AS (
+				 -- 计算馆陶组的SJDJSD值
+				 SELECT "SJDJSD" AS guantao_value
+				 FROM JSbb
+				 WHERE cw = '馆陶组' and JH=#{jh}
+			 )
+		SELECT max_value - guantao_value AS result
+		FROM max_value_cte, guantao_value_cte
+	</select>
 </mapper>
\ No newline at end of file