Skip to content

Z
zjsgfa_mysql
Commit 9966df28 by jiang'yun
Options

修改

parent ed90faa5
Showing with 30 additions and 23 deletions
src/main/java/com/ruoyi/project/zt/service/impl/DjdcServiceImpl.java
...@@ -219,10 +219,16 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -219,10 +219,16 @@ public class DjdcServiceImpl implements DjdcService {
zjzq=zjzq+it.getSjts(); zjzq=zjzq+it.getSjts();
} }
} }
item.setZjzq(zjzq); item.setZjzq(Double.parseDouble(df.format(zjzq)));
item.setZwzq(zwzq); item.setZwzq(Double.parseDouble(df.format(zwzq)));
Double zjsl=item.getJc()/item.getZjzq(); if(item.getZjzq()>0){
item.setZjsl(Double.parseDouble(df.format(zjsl))); System.out.println(item.getZjzq());
System.out.println(zwzq);
Double zjsl=item.getJc()/item.getZjzq();
System.out.println(zjsl);
item.setZjsl(Double.parseDouble(df.format(zjsl)));
}
//查询钻井日志 //查询钻井日志
Jswa jswa =new Jswa(); Jswa jswa =new Jswa();
jswa.setJh(item.getJh()); jswa.setJh(item.getJh());
...@@ -242,8 +248,8 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -242,8 +248,8 @@ public class DjdcServiceImpl implements DjdcService {
wjycsl=wjycsl+(wa.getSg()+wa.getXl()+wa.getZrtg()+wa.getZztg()+wa.getFzqk()); wjycsl=wjycsl+(wa.getSg()+wa.getXl()+wa.getZrtg()+wa.getZztg()+wa.getFzqk());
} }
} }
item.setZjycsl(zjycsl); item.setZjycsl(Double.parseDouble(df.format(zjycsl)));
item.setWjycsl(wjycsl); item.setWjycsl(Double.parseDouble(df.format(wjycsl)));
} }
......
src/main/resources/application.yml
...@@ -16,7 +16,7 @@ ruoyi: ...@@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为8080 # 服务器的HTTP端口，默认为8080
port: 8091 port: 8089
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
......
src/main/resources/mybatis/zt/DjdcInfoMapper.xml
...@@ -156,8 +156,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -156,8 +156,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ZCMSQK, ZCMSQK,
Qzyy, Qzyy,
zb zb
from HHZJJS.JSBA a from JSBA a
left join HHZJJS.jsaa b on a.jh = b.jh left join jsaa b on a.jh = b.jh
left join ( left join (
SELECT 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 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
...@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
jh, ROW_NUMBER() OVER (PARTITION BY jh ORDER BY js) AS kc, jh, ROW_NUMBER() OVER (PARTITION BY jh ORDER BY js) AS kc,
JS, JS,
LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS
FROM HHZJJS.JSDB FROM JSDB
) t) c on a.jh=c.jh ) t) c on a.jh=c.jh
left join ( left join (
select jh,xh, select jh,xh,
...@@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
Qzyy, Qzyy,
zzjs, zzjs,
ROUND(jc / case when (JCSJHJ / 24) =0 then 1 else (JCSJHJ / 24) end , 2) zb ROUND(jc / case when (JCSJHJ / 24) =0 then 1 else (JCSJHJ / 24) end , 2) zb
from HHZJJS.JSHA from JSHA
order by xh order by xh
) d on a.JH=d.jh and d.zzjs>ksjs and d.zzjs<=js ) d on a.JH=d.jh and d.zzjs>ksjs and d.zzjs<=js
...@@ -217,8 +217,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -217,8 +217,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select a.jh,c.kc,ksjs,c.js select a.jh,c.kc,ksjs,c.js
from HHZJJS.JSBA a from JSBA a
left join HHZJJS.jsaa b on a.jh = b.jh left join jsaa b on a.jh = b.jh
left join ( left join (
SELECT SELECT
jh,kc,(CASE WHEN kc = 1 THEN 0 ELSE LAG_JS END) ksjs,js jh,kc,(CASE WHEN kc = 1 THEN 0 ELSE LAG_JS END) ksjs,js
...@@ -227,7 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -227,7 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
jh, ROW_NUMBER() OVER (PARTITION BY jh ORDER BY js) AS kc, jh, ROW_NUMBER() OVER (PARTITION BY jh ORDER BY js) AS kc,
JS, JS,
LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS
FROM HHZJJS.JSDB FROM JSDB
) t) c on a.jh=c.jh ) t) c on a.jh=c.jh
where 1=1 where 1=1
...@@ -250,7 +250,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -250,7 +250,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getJcAndCw" resultType="com.ruoyi.project.zt.domian.DjZqsjfx"> <select id="getJcAndCw" resultType="com.ruoyi.project.zt.domian.DjZqsjfx">
select jh,sum(jc) jc ,LISTAGG ( SZDC, '- ' ) WITHIN GROUP ( ORDER BY xh ) AS cw select jh,sum(jc) jc ,LISTAGG ( SZDC, '- ' ) WITHIN GROUP ( ORDER BY xh ) AS cw
from HHZJJS.JSHA a from JSHA a
where 1=1 where 1=1
<if test="jh!=null and jh!=''"> <if test="jh!=null and jh!=''">
and a. jh =#{jh} and a. jh =#{jh}
...@@ -271,8 +271,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -271,8 +271,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ksjs, ksjs,
c.JS, c.JS,
d.ZJZH,d.ZJJD d.ZJZH,d.ZJJD
from HHZJJS.JSBA a from JSBA a
left join HHZJJS.jsaa b on a.jh = b.jh left join jsaa b on a.jh = b.jh
left join (SELECT jh, left join (SELECT jh,
kc, kc,
(CASE WHEN kc = 1 THEN 0 ELSE LAG_JS END) ksjs, (CASE WHEN kc = 1 THEN 0 ELSE LAG_JS END) ksjs,
...@@ -282,8 +282,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -282,8 +282,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ROW_NUMBER() OVER (PARTITION BY jh ORDER BY js) AS kc, ROW_NUMBER() OVER (PARTITION BY jh ORDER BY js) AS kc,
JS, JS,
LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS
FROM HHZJJS.JSDB) t) c on a.jh = c.jh FROM JSDB) t) c on a.jh = c.jh
left join HHZJJS.JSFA d on a.JH=d.JH and c.kc=d.XH left join JSFA d on a.JH=d.JH and c.kc=d.XH
where 1 = 1 where 1 = 1
<if test="jdhzb!=null"> <if test="jdhzb!=null">
and ABS(#{jdhzb} - a.jdhzb) &lt; #{jl} and ABS(#{jdhzb} - a.jdhzb) &lt; #{jl}
...@@ -306,7 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -306,7 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select jh, select jh,
nvl(sum(jc),0) jc, nvl(sum(jc),0) jc,
nvl(ROUND(sum(JCSJHJ)/24,2),0) jcsjhj nvl(ROUND(sum(JCSJHJ)/24,2),0) jcsjhj
from HHZJJS.JSHA from JSHA
where jh = #{jh} where jh = #{jh}
and zzjs > #{ksjs} and zzjs > #{ksjs}
and zzjs &lt;= #{js} and zzjs &lt;= #{js}
...@@ -315,7 +315,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -315,7 +315,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="getDjinfoByjh" resultType="com.ruoyi.project.zt.domian.Djjc"> <select id="getDjinfoByjh" resultType="com.ruoyi.project.zt.domian.Djjc">
select JDHZB,JDZZB from HHZJJS.JSBA a where a.JH =#{jh} select JDHZB,JDZZB from JSBA a where a.JH =#{jh}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mybatis/zt/JstaMapper.xml
...@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getList" resultType="com.ruoyi.project.zt.domian.Jsta"> <select id="getList" resultType="com.ruoyi.project.zt.domian.Jsta">
select * select *
from HHZJJS.JSTA a from JSTA a
where 1=1 where 1=1
<if test="jh!=null and jh!=''"> <if test="jh!=null and jh!=''">
and jh =#{jh} and jh =#{jh}
......
src/main/resources/mybatis/zt/JswaMapper.xml
...@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.ruoyi.project.zt.mapper.JswaMapper"> <mapper namespace="com.ruoyi.project.zt.mapper.JswaMapper">
<select id="getList" resultType="com.ruoyi.project.zt.domian.Jswa"> <select id="getList" resultType="com.ruoyi.project.zt.domian.Jswa">
select jh, rq, nvl(js,0) js, nvl(rjc,0) rjc,nvl(sg,0) sg, nvl(xl,0)xl,nvl(zrtg,0) zrtg, nvl(zztg,0)zztg,nvl(fzqk,0) fzqk from HHZJJS.JSWA where 1=1 select jh, rq, nvl(js,0) js, nvl(rjc,0) rjc,nvl(sg,0) sg, nvl(xl,0)xl,nvl(zrtg,0) zrtg, nvl(zztg,0)zztg,nvl(fzqk,0) fzqk from JSWA where 1=1
<if test="jh!=null and jh!=''"> <if test="jh!=null and jh!=''">
and jh =#{jh} and jh =#{jh}
......
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