Commit 2ec5f500 by jiang'yun

修改

parent 768b170b
...@@ -98,6 +98,28 @@ public class DjdcController { ...@@ -98,6 +98,28 @@ public class DjdcController {
map.put("zjzh","钻具组合明细"); map.put("zjzh","钻具组合明细");
map.put("zb","时效"); map.put("zb","时效");
return AjaxResult.success( djdcService.getZjzhfxList(param),map); return AjaxResult.success( djdcService.getZjzhfxList(param),map);
case "getLjjwList":
//获取邻近井位
map.put("jh","井号");
map.put("jkhzb","井口横坐标");
map.put("jkzzb","井口纵坐标");
map.put("jdhzb","井底横坐标");
map.put("jdzzb","井底纵坐标");
map.put("jx","井型");
map.put("jb","井别");
map.put("wjjs","井深");
map.put("wjczjs","垂深");
map.put("wzcw","完钻层位");
map.put("kc","开次");
map.put("wjzq","完井周期");
map.put("zjzq","钻井周期");
map.put("jkjl","井口距离");
map.put("jdjl","井底距离");
map.put("jkzjl","井口纵距离");
map.put("jkhjl","井口横距离");
map.put("jdzjl","井底纵距离");
map.put("jdhjl","井底横距离");
return AjaxResult.success( djdcService.getLjjwList(param),map);
default: default:
return AjaxResult.success(); return AjaxResult.success();
} }
......
...@@ -14,6 +14,10 @@ public class CommonParam { ...@@ -14,6 +14,10 @@ public class CommonParam {
//结束完井时间 //结束完井时间
private String wjsjjs; private String wjsjjs;
//井口横坐标
private Double jkhzb;
//井口纵坐标
private Double jkzzb;
//井底横坐标 //井底横坐标
private Double jdhzb; private Double jdhzb;
//井底纵坐标 //井底纵坐标
......
package com.ruoyi.project.zt.domian;
import lombok.Data;
/**
* 邻近井位
*/
@Data
public class Ljjw {
//井号
private String jh;
//井口横坐标
private Double jkhzb;
//井口纵坐标
private Double jkzzb;
//井底横坐标
private Double jdhzb;
//井底纵坐标
private Double jdzzb;
//井型
private String jx;
//井别
private String jb;
//井深
private Double wjjs;
//垂深
private Double wjczjs;
//完钻层位
private String wzcw;
//开次
private String kc;
//完井周期
private Double wjzq;
//钻井周期
private Double zjzq;
//井口距离
private Double jkjl;
//井底距离
private Double jdjl;
//井口纵距离,
private Double jkzjl;
//井口横距离
private Double jkhjl;
//井底纵距离
private Double jdzjl;
//井底横距离
private Double jdhjl;
}
...@@ -28,4 +28,7 @@ public interface DjdcInfoMapper { ...@@ -28,4 +28,7 @@ public interface DjdcInfoMapper {
Djjc getDjinfoByjh(String jh); Djjc getDjinfoByjh(String jh);
List<Ljjw> getLjjwList(CommonParam param);
} }
...@@ -19,4 +19,7 @@ public interface DjdcService { ...@@ -19,4 +19,7 @@ public interface DjdcService {
List<DjZjzhfx> getZjzhfxList(CommonParam param); List<DjZjzhfx> getZjzhfxList(CommonParam param);
List<Ljjw> getLjjwList(CommonParam param);
} }
...@@ -367,6 +367,12 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -367,6 +367,12 @@ public class DjdcServiceImpl implements DjdcService {
return list; return list;
} }
@Override
public List<Ljjw> getLjjwList(CommonParam param) {
return djdcInfoMapper.getLjjwList(param);
}
/** /**
......
...@@ -318,4 +318,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -318,4 +318,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select JDHZB,JDZZB from JSBA a where a.JH =#{jh} select JDHZB,JDZZB from JSBA a where a.JH =#{jh}
</select> </select>
<select id="getLjjwList" resultType="com.ruoyi.project.zt.domian.Ljjw">
SELECT a.jh, a.jkhzb, a.jkzzb, a.jdhzb, a.jdzzb,a.jx,a.jb,b.wjjs---井深
,b.wjczjs,---垂深
b.wzcw,------完钻层位
kc.kc,----------------开次信息
zjzq.wjzq,-----完井周期
zjzq.zjzq, -----钻井周期
round(power(power(ABS(a.jkhzb - ${jkhzb}-----传入井口横坐标以及纵坐标
),2)+ power(ABS(a.jkzzb - ${jkzzb}),2),0.5) ,2)as jkjl,--井口距离
round( power(power(ABS(a.jdhzb - ${jdhzb} -----传入井底横坐标以及纵坐标
),2)+ power(ABS(a.jdzzb - ${jdzzb}),2),0.5),2) as jdjl,--井底距离
ABS(a.jkzzb - ${jkzzb}) as jkzjl,--井口纵距离,
ABS(a.jkhzb - ${jkhzb}) as jkhjl,--井口横距离
ABS(a.jdzzb - ${jdzzb}) as jdzjl,--井底纵距离
ABS(a.jdhzb - ${jdhzb} ) as jdhjl--井底横距离
FROM JSBA a
left join jsaa b
on a.jh=b.jh
-------钻井周期以及完井周期
left join
(
select jsta.jh, sum(case when jsta.sgzyxm='完井作业' then jsta.sjts else 0 end ) as wjzq, sum(jsta.sjts)-sum(case when jsta.sgzyxm='完井作业' then jsta.sjts else 0 end ) as zjzq FROM JSTA jsta
where jsta.jd1 is not null or jsta.jd2 is not null
group by jsta.jh) zjzq
on zjzq.jh=a.jh
left join ( select jh,count(*) as kc from jsdb where tgcc not like '%导管%'
group by jh )kc
on a.jh=kc.jh
WHERE
ABS(a.jdhzb - #{jdhzb}) &lt; #{jl} -- 按井底坐标选
AND
ABS(a.jdzzb - #{jdzzb}) &lt; #{jl}
and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs}
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment