Commit 8d1060dd by jiang'yun

修改

parent 4d1768d9
...@@ -269,22 +269,47 @@ public class DjdcController { ...@@ -269,22 +269,47 @@ public class DjdcController {
List<Ljjw> ljjwList2 = djdcService.getLjjwList(param); List<Ljjw> ljjwList2 = djdcService.getLjjwList(param);
ExcelUtil<Ljjw> util = new ExcelUtil<Ljjw>(Ljjw.class); ExcelUtil<Ljjw> util = new ExcelUtil<Ljjw>(Ljjw.class);
util.exportExcel(response, ljjwList2, "Sheet1"); util.exportExcel(response, ljjwList2, "Sheet1");
break;
case "exportZqshfx": case "exportZqshfx":
//导出周期分析 //导出周期分析
List<DjZqsjfx> zqshfxList = djdcService.getZqshfxList(param); List<DjZqsjfx> zqshfxList = djdcService.getZqshfxList(param);
exportZqshfx(response,zqshfxList); exportZqshfx(response,zqshfxList);
break;
case "exportZtgjsj": case "exportZtgjsj":
//导出钻头关键数据 //导出钻头关键数据
List<Djjc> djjcList = djdcService.getDjjcList(param); List<Djjc> djjcList = djdcService.getDjjcList(param);
ExcelUtil<Djjc> utilzt = new ExcelUtil<Djjc>(Djjc.class); ExcelUtil<Djjc> utilzt = new ExcelUtil<Djjc>(Djjc.class);
utilzt.exportExcel(response, djjcList, "Sheet1"); utilzt.exportExcel(response, djjcList, "Sheet1");
break;
case "exportQkztfx": case "exportQkztfx":
//导出区块钻头分析 //导出区块钻头分析
List<DjZtfx> djZtfxList = djdcService.getDjZtfxList(param); List<DjZtfx> djZtfxList = djdcService.getDjZtfxList(param);
ExcelUtil<DjZtfx> utilzqk = new ExcelUtil<DjZtfx>(DjZtfx.class); ExcelUtil<DjZtfx> utilzqk = new ExcelUtil<DjZtfx>(DjZtfx.class);
utilzqk.exportExcel(response, djZtfxList, "Sheet1"); utilzqk.exportExcel(response, djZtfxList, "Sheet1");
break;
case "exportZtdf":
//导出钻头得分
Map<String, Object> map = djdcService.calZtzhdf(param);
List<LjZtzhdf> ztzhdf =(List<LjZtzhdf>) map.get("ztzhdf");
ExcelUtil<LjZtzhdf> utilZtdf = new ExcelUtil<LjZtzhdf>(LjZtzhdf.class);
utilZtdf.exportExcel(response, ztzhdf, "Sheet1");
break;
case "exportZzztdf":
//导出最终钻头得分
Map<String, Object> map2 = djdcService.calZtzhdf(param);
List<LjZtdfzh> ljZtdfzhList =(List<LjZtdfzh>) map2.get("zjzhdf");
ExcelUtil<LjZtdfzh> utilZzztdf = new ExcelUtil<LjZtdfzh>(LjZtdfzh.class);
utilZzztdf.exportExcel(response, ljZtdfzhList, "Sheet1");
break;
case "exportSzfxjg":
//导出实钻分析结果
Map<String, Object> map3 = djdcService.calZtzhdf(param);
List<LjSzfxjg> ljSzfxjgList =(List<LjSzfxjg>) map3.get("szfxjg");
ExcelUtil<LjSzfxjg> utilSzfxjg = new ExcelUtil<LjSzfxjg>(LjSzfxjg.class);
utilSzfxjg.exportExcel(response, ljSzfxjgList, "Sheet1");
break;
default: default:
break;
} }
} }
......
...@@ -22,7 +22,7 @@ public class LjSzfxjg extends BaseEntity ...@@ -22,7 +22,7 @@ public class LjSzfxjg extends BaseEntity
private Long id; private Long id;
/** 功能模块 */ /** 功能模块 */
@Excel(name = "功能模块") // @Excel(name = "功能模块")
private String gnmk; private String gnmk;
/** 分析范围 */ /** 分析范围 */
...@@ -38,7 +38,7 @@ public class LjSzfxjg extends BaseEntity ...@@ -38,7 +38,7 @@ public class LjSzfxjg extends BaseEntity
private String fxxy; private String fxxy;
/** 分析结论 */ /** 分析结论 */
@Excel(name = "分析结论") // @Excel(name = "分析结论")
private String fxjl; private String fxjl;
/** 输出方向 */ /** 输出方向 */
...@@ -62,16 +62,16 @@ public class LjSzfxjg extends BaseEntity ...@@ -62,16 +62,16 @@ public class LjSzfxjg extends BaseEntity
private Double tjpf; private Double tjpf;
/** 详细参数 */ /** 详细参数 */
@Excel(name = "详细参数") // @Excel(name = "详细参数")
private String xxcs; private String xxcs;
/** 创建人 */ /** 创建人 */
@Excel(name = "创建人") // @Excel(name = "创建人")
private String createdBy; private String createdBy;
/** 创建时间 */ /** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") // @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime; private Date createdTime;
public void setId(Long id) public void setId(Long id)
......
...@@ -54,12 +54,12 @@ public class LjZtzhdf extends BaseEntity ...@@ -54,12 +54,12 @@ public class LjZtzhdf extends BaseEntity
private Double zhdf; private Double zhdf;
/** 创建人 */ /** 创建人 */
@Excel(name = "创建人") // @Excel(name = "创建人")
private String createdBy; private String createdBy;
/** 创建时间 */ /** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") // @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime; private Date createdTime;
public void setId(Long id) public void setId(Long id)
......
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.*; import com.ruoyi.project.zt.domain.*;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@Mapper @Mapper
@DataSource(value = DataSourceType.SLAVE)
public interface DjdcInfoMapper { public interface DjdcInfoMapper {
List<DjDcInfo> getList(DjDcInfo info); List<DjDcInfo> getList(DjDcInfo info);
......
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.Jswa; import com.ruoyi.project.zt.domain.Jswa;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@Mapper @Mapper
@DataSource(value = DataSourceType.SLAVE)
public interface JswaMapper { public interface JswaMapper {
......
...@@ -361,25 +361,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -361,25 +361,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.jdzzb, a.jdzzb,
a.jx, a.jx,
a.jb, a.jb,
b.wjjs---井深 b.wjjs,
, b.wjczjs,
b.wjczjs,---垂深 b.wzcw,
b.wzcw,------完钻层位 kc.kc,
kc.kc,----------------开次信息 zjzq.wjzq,
zjzq.wjzq,-----完井周期 zjzq.zjzq,
zjzq.zjzq, -----钻井周期 round(power(power(ABS(a.jkhzb - ${jkhzb}
round(power(power(ABS(a.jkhzb - ${jkhzb}-----传入井口横坐标以及纵坐标 ), 2) + power(ABS(a.jkzzb - ${jkzzb}), 2), 0.5), 2) as jkjl,
), 2) + power(ABS(a.jkzzb - ${jkzzb}), 2), 0.5), 2) as jkjl,--井口距离 round(power(power(ABS(a.jdhzb - ${jdhzb}
round(power(power(ABS(a.jdhzb - ${jdhzb} -----传入井底横坐标以及纵坐标 ), 2) + power(ABS(a.jdzzb - ${jdzzb}), 2), 0.5), 2) as jdjl,
), 2) + power(ABS(a.jdzzb - ${jdzzb}), 2), 0.5), 2) as jdjl,--井底距离 ABS(a.jkzzb - ${jkzzb}) as jkzjl,
ABS(a.jkzzb - ${jkzzb}) as jkzjl,--井口纵距离, ABS(a.jkhzb - ${jkhzb}) as jkhjl,
ABS(a.jkhzb - ${jkhzb}) as jkhjl,--井口横距离 ABS(a.jdzzb - ${jdzzb}) as jdzjl,
ABS(a.jdzzb - ${jdzzb}) as jdzjl,--井底纵距离 ABS(a.jdhzb - ${jdhzb}) as jdhjl
ABS(a.jdhzb - ${jdhzb}) as jdhjl--井底横距离
FROM JSBA a FROM JSBA a
left join jsaa b left join jsaa b
on a.jh = b.jh on a.jh = b.jh
-------钻井周期以及完井周期
left join left join
(select jsta.jh, (select jsta.jh,
sum(case when jsta.sgzyxm = '完井作业' then jsta.sjts else 0 end) as wjzq, sum(case when jsta.sgzyxm = '完井作业' then jsta.sjts else 0 end) as wjzq,
...@@ -398,7 +397,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -398,7 +397,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE 1 = 1 WHERE 1 = 1
and a.jh not like '%侧%' and a.jh not like '%侧%'
and ABS(a.jdhzb - #{jdhzb}) &lt; #{jl} -- 按井底坐标选 and ABS(a.jdhzb - #{jdhzb}) &lt; #{jl}
AND ABS(a.jdzzb - #{jdzzb}) &lt; #{jl} AND ABS(a.jdzzb - #{jdzzb}) &lt; #{jl}
and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs} and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs}
...@@ -431,25 +430,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -431,25 +430,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.jdzzb, a.jdzzb,
a.jx, a.jx,
a.jb, a.jb,
b.wjjs---井深 b.wjjs,
, b.wjczjs,
b.wjczjs,---垂深 b.wzcw,
b.wzcw,------完钻层位 kc.kc,
kc.kc,----------------开次信息 zjzq.wjzq,
zjzq.wjzq,-----完井周期 zjzq.zjzq,
zjzq.zjzq, -----钻井周期 round(power(power(ABS(a.jkhzb - ${jkhzb}
round(power(power(ABS(a.jkhzb - ${jkhzb}-----传入井口横坐标以及纵坐标 ), 2) + power(ABS(a.jkzzb - ${jkzzb}), 2), 0.5), 2) as jkjl,
), 2) + power(ABS(a.jkzzb - ${jkzzb}), 2), 0.5), 2) as jkjl,--井口距离 round(power(power(ABS(a.jdhzb - ${jdhzb}
round(power(power(ABS(a.jdhzb - ${jdhzb} -----传入井底横坐标以及纵坐标 ), 2) + power(ABS(a.jdzzb - ${jdzzb}), 2), 0.5), 2) as jdjl,
), 2) + power(ABS(a.jdzzb - ${jdzzb}), 2), 0.5), 2) as jdjl,--井底距离 ABS(a.jkzzb - ${jkzzb}) as jkzjl,
ABS(a.jkzzb - ${jkzzb}) as jkzjl,--井口纵距离, ABS(a.jkhzb - ${jkhzb}) as jkhjl,
ABS(a.jkhzb - ${jkhzb}) as jkhjl,--井口横距离 ABS(a.jdzzb - ${jdzzb}) as jdzjl,
ABS(a.jdzzb - ${jdzzb}) as jdzjl,--井底纵距离 ABS(a.jdhzb - ${jdhzb}) as jdhjl
ABS(a.jdhzb - ${jdhzb}) as jdhjl--井底横距离
FROM JSBA a FROM JSBA a
left join jsaa b left join jsaa b
on a.jh = b.jh on a.jh = b.jh
-------钻井周期以及完井周期
left join left join
(select jsta.jh, (select jsta.jh,
sum(case when jsta.sgzyxm = '完井作业' then jsta.sjts else 0 end) as wjzq, sum(case when jsta.sgzyxm = '完井作业' then jsta.sjts else 0 end) as wjzq,
...@@ -468,7 +465,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -468,7 +465,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE 1 = 1 WHERE 1 = 1
and a.jh not like '%侧%' and a.jh not like '%侧%'
and ABS(a.jdhzb - #{jdhzb}) &lt; #{jl} -- 按井底坐标选 and ABS(a.jdhzb - #{jdhzb}) &lt; #{jl}
AND ABS(a.jdzzb - #{jdzzb}) &lt; #{jl} AND ABS(a.jdzzb - #{jdzzb}) &lt; #{jl}
and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs} and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs}
...@@ -492,7 +489,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -492,7 +489,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
order by jdjl asc order by jdjl asc
) where ROWNUM &lt; =5 ) a order by jh ) where ROWNUM &lt; =5
) a order by jh
</select> </select>
......
...@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectMd" resultType="com.ruoyi.project.zt.domain.Jswa"> <select id="selectMd" resultType="com.ruoyi.project.zt.domain.Jswa">
select * from ( select * from (
select * from JSwA where RJC>0 and jh=#{jh} and js=#{js} ) where ROWNUM=1 select * from JSwA where RJC>0 and jh=#{jh} and js=#{js} ) aa where ROWNUM=1
</select> </select>
<select id="selectZwsj" resultType="com.ruoyi.project.zt.domain.Jswa"> <select id="selectZwsj" resultType="com.ruoyi.project.zt.domain.Jswa">
select *from ( select *from (
...@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="js!=null "> <if test="js!=null ">
and js = #{js} and js = #{js}
</if> </if>
) where ROWNUM =1 ) aa where ROWNUM =1
</select> </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