修改

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

@@ -155,12 +155,14 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
                         });
                         });
                         sjFdsgcs.setTzqk(String.join(";",fzqk));
                         sjFdsgcs.setTzqk(String.join(";",fzqk));
                     }else {
                     }else {
-                        sjFdsgcs.setTzqk("结合邻井一开无复杂数据，可实现一趟钻完成");
+                        sjFdsgcs.setTzqk("结合邻井"+kc+"无复杂数据，可实现一趟钻完成");
                     }
                     }
+                }else {
+                    sjFdsgcs.setTzqk("结合邻井"+kc+"无复杂数据，可实现一趟钻完成");
                 }
                 }
                 //井段情况
                 //井段情况
                 double cs = CxszhUtil.getCs(sjJygjGdsjgdcsList, sjJsjg1.getJs());
                 double cs = CxszhUtil.getCs(sjJygjGdsjgdcsList, sjJsjg1.getJs());
-
+                csaa=cs;
                 SjFdsgcsDcyx sjFdsgcsDcyx  =new SjFdsgcsDcyx();
                 SjFdsgcsDcyx sjFdsgcsDcyx  =new SjFdsgcsDcyx();
 
 
                 sjFdsgcsDcyx.setJh(sjFdsgcs.getJh());
                 sjFdsgcsDcyx.setJh(sjFdsgcs.getJh());

src/main/java/com/ruoyi/project/zt/mapper/JsqaMapper.java

 package com.ruoyi.project.zt.mapper;
 package com.ruoyi.project.zt.mapper;
 
 
+import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
+import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
 import com.ruoyi.project.zt.domain.CommonParam;
 import com.ruoyi.project.zt.domain.CommonParam;
 import com.ruoyi.project.zt.domain.Jsqa;
 import com.ruoyi.project.zt.domain.Jsqa;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -7,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
 import java.util.List;
 
 
 @Mapper
 @Mapper
+@DataSource(value = DataSourceType.SLAVE)
 public interface JsqaMapper {
 public interface JsqaMapper {
 
 
 
 

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

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                               yx,
                               yx,
                               bz
                               bz
                           FROM
                           FROM
-                              sj_fdsgcs_dcyx) a where jh=#{jh} and start_depth>=#{kscs} and end_depth < #{jscs}
+                              sj_fdsgcs_dcyx) a where jh=#{jh} and start_depth>=#{kscs} and end_depth <= #{jscs}
     </select>
     </select>
 
 
     <insert id="insertSjFdsgcsDcyx" parameterType="SjFdsgcsDcyx" useGeneratedKeys="true" keyProperty="id">
     <insert id="insertSjFdsgcsDcyx" parameterType="SjFdsgcsDcyx" useGeneratedKeys="true" keyProperty="id">