Skip to content

Z
zjsgfa_mysql
Commit 7ad87d8b by jiang'yun
Options

修改

parent e1c8e752
Showing with 252 additions and 21 deletions
src/main/java/com/ruoyi/project/zjsgfa/domain/SjZjcsxx.java
...@@ -22,6 +22,38 @@ public class SjZjcsxx extends BaseEntity ...@@ -22,6 +22,38 @@ public class SjZjcsxx extends BaseEntity
@Excel(name = "井号") @Excel(name = "井号")
private String jh; private String jh;
/** 开次 */
@Excel(name = "开次")
private String kc;
/** 井段 */
@Excel(name = "井段")
private String jd;
/** 钻头型号 */
@Excel(name = "钻头型号")
private String ztxh;
/** 厂家 */
@Excel(name = "厂家")
private String cj;
/** 尺寸 */
@Excel(name = "尺寸")
private String cc;
/** 水眼 */
@Excel(name = "水眼")
private String sy;
/** 压降 */
@Excel(name = "压降")
private String yj;
/** 钻井液密度 */
@Excel(name = "钻井液密度")
private String zjymd;
/** 钻进钻压 */ /** 钻进钻压 */
@Excel(name = "钻进钻压") @Excel(name = "钻进钻压")
private String zjzy; private String zjzy;
...@@ -42,10 +74,6 @@ public class SjZjcsxx extends BaseEntity ...@@ -42,10 +74,6 @@ public class SjZjcsxx extends BaseEntity
@Excel(name = "缸套直径") @Excel(name = "缸套直径")
private String gtzj; private String gtzj;
/** 开次 */
@Excel(name = "开次")
private String kc;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
...@@ -66,6 +94,86 @@ public class SjZjcsxx extends BaseEntity ...@@ -66,6 +94,86 @@ public class SjZjcsxx extends BaseEntity
return jh; return jh;
} }
public void setKc(String kc)
{
this.kc = kc;
}
public String getKc()
{
return kc;
}
public void setJd(String jd)
{
this.jd = jd;
}
public String getJd()
{
return jd;
}
public void setZtxh(String ztxh)
{
this.ztxh = ztxh;
}
public String getZtxh()
{
return ztxh;
}
public void setCj(String cj)
{
this.cj = cj;
}
public String getCj()
{
return cj;
}
public void setCc(String cc)
{
this.cc = cc;
}
public String getCc()
{
return cc;
}
public void setSy(String sy)
{
this.sy = sy;
}
public String getSy()
{
return sy;
}
public void setYj(String yj)
{
this.yj = yj;
}
public String getYj()
{
return yj;
}
public void setZjymd(String zjymd)
{
this.zjymd = zjymd;
}
public String getZjymd()
{
return zjymd;
}
public void setZjzy(String zjzy) public void setZjzy(String zjzy)
{ {
this.zjzy = zjzy; this.zjzy = zjzy;
...@@ -116,27 +224,24 @@ public class SjZjcsxx extends BaseEntity ...@@ -116,27 +224,24 @@ public class SjZjcsxx extends BaseEntity
return gtzj; return gtzj;
} }
public void setKc(String kc)
{
this.kc = kc;
}
public String getKc()
{
return kc;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("jh", getJh()) .append("jh", getJh())
.append("kc", getKc())
.append("jd", getJd())
.append("ztxh", getZtxh())
.append("cj", getCj())
.append("cc", getCc())
.append("sy", getSy())
.append("yj", getYj())
.append("zjymd", getZjymd())
.append("zjzy", getZjzy()) .append("zjzy", getZjzy())
.append("zjzs", getZjzs()) .append("zjzs", getZjzs())
.append("zjpl", getZjpl()) .append("zjpl", getZjpl())
.append("zjby", getZjby()) .append("zjby", getZjby())
.append("gtzj", getGtzj()) .append("gtzj", getGtzj())
.append("kc", getKc())
.toString(); .toString();
} }
} }
src/main/java/com/ruoyi/project/zjsgfa/service/impl/SjDjjcServiceImpl.java
...@@ -276,6 +276,16 @@ public class SjDjjcServiceImpl implements ISjDjjcService ...@@ -276,6 +276,16 @@ public class SjDjjcServiceImpl implements ISjDjjcService
sjLjtjzt.setZjjd(it.getJd()); sjLjtjzt.setZjjd(it.getJd());
sjLjtjzt.setCw(it.getCw()); sjLjtjzt.setCw(it.getCw());
sjLjtjzt.setJxzs(it.getJxzs()); sjLjtjzt.setJxzs(it.getJxzs());
//查询厂家
Djjc djjc = new Djjc();
djjc.setJh(it.getLjjh());
djjc.setKc(kc+"");
djjc.setJd(it.getJd());
djjc.setJxzs(it.getJxzs());
Djjc djjc1=djdcService.selectZtsj(djjc);
if(djjc1!=null){
sjLjtjzt.setZjjd(djjc1.getCj());
}
sjLjtjztList.add(sjLjtjzt); sjLjtjztList.add(sjLjtjzt);
}); });
if(collect.size()>0){ if(collect.size()>0){
......
src/main/java/com/ruoyi/project/zt/domain/Djjc.java
...@@ -83,6 +83,8 @@ public class Djjc { ...@@ -83,6 +83,8 @@ public class Djjc {
@Excel(name = "指标") @Excel(name = "指标")
private Double zb; private Double zb;
private String cj;
//所钻地层 //所钻地层
......
src/main/java/com/ruoyi/project/zt/mapper/DjdcInfoMapper.java
...@@ -51,4 +51,6 @@ public interface DjdcInfoMapper { ...@@ -51,4 +51,6 @@ public interface DjdcInfoMapper {
Zsjjz getZsjJz(String jh); Zsjjz getZsjJz(String jh);
Djjc selectZtsj(Djjc djjc);
} }
src/main/java/com/ruoyi/project/zt/service/DjdcService.java
...@@ -55,4 +55,7 @@ public interface DjdcService { ...@@ -55,4 +55,7 @@ public interface DjdcService {
List<DjZqsjfx> getKjsjList(CommonParam param); List<DjZqsjfx> getKjsjList(CommonParam param);
List<Zsjfx> getZsjList(CommonParam param); List<Zsjfx> getZsjList(CommonParam param);
Djjc selectZtsj(Djjc djjc);
} }
src/main/java/com/ruoyi/project/zt/service/impl/DjdcServiceImpl.java
...@@ -1876,6 +1876,11 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1876,6 +1876,11 @@ public class DjdcServiceImpl implements DjdcService {
return list; return list;
} }
@Override
public Djjc selectZtsj(Djjc djjc) {
return djdcInfoMapper.selectZtsj(djjc);
}
/** /**
* 计算斜深 * 计算斜深
* @param a 层位垂深 * @param a 层位垂深
......
src/main/resources/mybatis/zjsgfa/SjZjcsxxMapper.xml
...@@ -7,28 +7,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -7,28 +7,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="SjZjcsxx" id="SjZjcsxxResult"> <resultMap type="SjZjcsxx" id="SjZjcsxxResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="jh" column="jh" /> <result property="jh" column="jh" />
<result property="kc" column="kc" />
<result property="jd" column="jd" />
<result property="ztxh" column="ztxh" />
<result property="cj" column="cj" />
<result property="cc" column="cc" />
<result property="sy" column="sy" />
<result property="yj" column="yj" />
<result property="zjymd" column="zjymd" />
<result property="zjzy" column="zjzy" /> <result property="zjzy" column="zjzy" />
<result property="zjzs" column="zjzs" /> <result property="zjzs" column="zjzs" />
<result property="zjpl" column="zjpl" /> <result property="zjpl" column="zjpl" />
<result property="zjby" column="zjby" /> <result property="zjby" column="zjby" />
<result property="gtzj" column="gtzj" /> <result property="gtzj" column="gtzj" />
<result property="kc" column="kc" />
</resultMap> </resultMap>
<sql id="selectSjZjcsxxVo"> <sql id="selectSjZjcsxxVo">
select id, jh, zjzy, zjzs, zjpl, zjby, gtzj, kc from sj_zjcsxx select id, jh, kc, jd, ztxh, cj, cc, sy, yj, zjymd, zjzy, zjzs, zjpl, zjby, gtzj from sj_zjcsxx
</sql> </sql>
<select id="selectSjZjcsxxList" parameterType="SjZjcsxx" resultMap="SjZjcsxxResult"> <select id="selectSjZjcsxxList" parameterType="SjZjcsxx" resultMap="SjZjcsxxResult">
<include refid="selectSjZjcsxxVo"/> <include refid="selectSjZjcsxxVo"/>
<where> <where>
<if test="jh != null and jh != ''"> and jh = #{jh}</if> <if test="jh != null and jh != ''"> and jh = #{jh}</if>
<if test="kc != null and kc != ''"> and kc = #{kc}</if>
<if test="jd != null and jd != ''"> and jd = #{jd}</if>
<if test="ztxh != null and ztxh != ''"> and ztxh = #{ztxh}</if>
<if test="cj != null and cj != ''"> and cj = #{cj}</if>
<if test="cc != null and cc != ''"> and cc = #{cc}</if>
<if test="sy != null and sy != ''"> and sy = #{sy}</if>
<if test="yj != null and yj != ''"> and yj = #{yj}</if>
<if test="zjymd != null and zjymd != ''"> and zjymd = #{zjymd}</if>
<if test="zjzy != null and zjzy != ''"> and zjzy = #{zjzy}</if> <if test="zjzy != null and zjzy != ''"> and zjzy = #{zjzy}</if>
<if test="zjzs != null and zjzs != ''"> and zjzs = #{zjzs}</if> <if test="zjzs != null and zjzs != ''"> and zjzs = #{zjzs}</if>
<if test="zjpl != null and zjpl != ''"> and zjpl = #{zjpl}</if> <if test="zjpl != null and zjpl != ''"> and zjpl = #{zjpl}</if>
<if test="zjby != null and zjby != ''"> and zjby = #{zjby}</if> <if test="zjby != null and zjby != ''"> and zjby = #{zjby}</if>
<if test="gtzj != null and gtzj != ''"> and gtzj = #{gtzj}</if> <if test="gtzj != null and gtzj != ''"> and gtzj = #{gtzj}</if>
<if test="kc != null and kc != ''"> and kc = #{kc}</if>
</where> </where>
</select> </select>
...@@ -41,21 +55,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -41,21 +55,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into sj_zjcsxx insert into sj_zjcsxx
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="jh != null">jh,</if> <if test="jh != null">jh,</if>
<if test="kc != null">kc,</if>
<if test="jd != null">jd,</if>
<if test="ztxh != null">ztxh,</if>
<if test="cj != null">cj,</if>
<if test="cc != null">cc,</if>
<if test="sy != null">sy,</if>
<if test="yj != null">yj,</if>
<if test="zjymd != null">zjymd,</if>
<if test="zjzy != null">zjzy,</if> <if test="zjzy != null">zjzy,</if>
<if test="zjzs != null">zjzs,</if> <if test="zjzs != null">zjzs,</if>
<if test="zjpl != null">zjpl,</if> <if test="zjpl != null">zjpl,</if>
<if test="zjby != null">zjby,</if> <if test="zjby != null">zjby,</if>
<if test="gtzj != null">gtzj,</if> <if test="gtzj != null">gtzj,</if>
<if test="kc != null">kc,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jh != null">#{jh},</if> <if test="jh != null">#{jh},</if>
<if test="kc != null">#{kc},</if>
<if test="jd != null">#{jd},</if>
<if test="ztxh != null">#{ztxh},</if>
<if test="cj != null">#{cj},</if>
<if test="cc != null">#{cc},</if>
<if test="sy != null">#{sy},</if>
<if test="yj != null">#{yj},</if>
<if test="zjymd != null">#{zjymd},</if>
<if test="zjzy != null">#{zjzy},</if> <if test="zjzy != null">#{zjzy},</if>
<if test="zjzs != null">#{zjzs},</if> <if test="zjzs != null">#{zjzs},</if>
<if test="zjpl != null">#{zjpl},</if> <if test="zjpl != null">#{zjpl},</if>
<if test="zjby != null">#{zjby},</if> <if test="zjby != null">#{zjby},</if>
<if test="gtzj != null">#{gtzj},</if> <if test="gtzj != null">#{gtzj},</if>
<if test="kc != null">#{kc},</if>
</trim> </trim>
</insert> </insert>
...@@ -63,12 +91,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -63,12 +91,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update sj_zjcsxx update sj_zjcsxx
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="jh != null">jh = #{jh},</if> <if test="jh != null">jh = #{jh},</if>
<if test="kc != null">kc = #{kc},</if>
<if test="jd != null">jd = #{jd},</if>
<if test="ztxh != null">ztxh = #{ztxh},</if>
<if test="cj != null">cj = #{cj},</if>
<if test="cc != null">cc = #{cc},</if>
<if test="sy != null">sy = #{sy},</if>
<if test="yj != null">yj = #{yj},</if>
<if test="zjymd != null">zjymd = #{zjymd},</if>
<if test="zjzy != null">zjzy = #{zjzy},</if> <if test="zjzy != null">zjzy = #{zjzy},</if>
<if test="zjzs != null">zjzs = #{zjzs},</if> <if test="zjzs != null">zjzs = #{zjzs},</if>
<if test="zjpl != null">zjpl = #{zjpl},</if> <if test="zjpl != null">zjpl = #{zjpl},</if>
<if test="zjby != null">zjby = #{zjby},</if> <if test="zjby != null">zjby = #{zjby},</if>
<if test="gtzj != null">gtzj = #{gtzj},</if> <if test="gtzj != null">gtzj = #{gtzj},</if>
<if test="kc != null">kc = #{kc},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
src/main/resources/mybatis/zt/DjdcInfoMapper.xml
...@@ -636,4 +636,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -636,4 +636,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT *FROM( select jzmc,t.ZQLXMC,t.ZQLXDM SELECT *FROM( select jzmc,t.ZQLXMC,t.ZQLXDM
from V_ODS_CYQ_JCXX_ZQJZJCXX@ZS t where t.jzmc like CONCAT(#{jh}, '%') )a WHERE ROWNUM &lt;=1 from V_ODS_CYQ_JCXX_ZQJZJCXX@ZS t where t.jzmc like CONCAT(#{jh}, '%') )a WHERE ROWNUM &lt;=1
</select> </select>
<select id="selectZtsj" resultType="com.ruoyi.project.zt.domain.Djjc">
select a.jh,a.jdhzb,a.jdzzb,to_char(b.WJRQ,'YYYY-MM-DD') wjrq,c.kc,c.jd,ksjs,c.JS,xh,
SZDC cw,
JC,
jxzs,
ZTXH,
PZ1,
PZ2,
PZ3,
PZ4,
PZ5,
PZ6,
PZ7,
PZ8,
PZ9,
PZ10,
lx,
Npc,
WPC,
YCMSQK,
ZCMSQK,
Qzyy,
zb,pl,LGBY,cc ztcc,cj
from JSBA a
left join jsaa b on a.jh = b.jh
left join (
SELECT
jh,kc,(CASE WHEN kc = 1 THEN 0 ELSE LAG_JS END) ksjs,js, CONCAT( CASE WHEN kc = 1 THEN '0-' ELSE LAG_JS || '-'END,JS) AS jd
FROM (
SELECT
jh, ROW_NUMBER() OVER (PARTITION BY jh ORDER BY js) AS kc,
JS,
LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS
FROM JSDB
) t) c on a.jh=c.jh
left join (
select jh,xh,
SZDC,
JC,
jxzs,
ZTXH,
PZ1,
PZ2,
PZ3,
PZ4,
PZ5,
PZ6,
PZ7,
PZ8,
PZ9,
PZ10,
lx,
Npc,
WPC,
YCMSQK,
ZCMSQK,
Qzyy,
zzjs,
ROUND(jc / case when (JCSJHJ / 24) =0 then 1 else (JCSJHJ / 24) end , 2) zb
,pl,LGBY,cc,cj
from JSHA
order by xh
) d on a.JH=d.jh and d.zzjs>ksjs and d.zzjs &lt;=js
where 1=1
and a.jh=#{jh} and kc =#{kc} and c.jd=#{jd} and JXZS=#{jxzs}
</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