Skip to content

Z
zjsgfa_mysql
Commit 34704701 by jiang'yun
Options

修改

parent 4a360a85
Showing with 185 additions and 7 deletions
src/main/java/com/ruoyi/project/zjsgfa/domain/SjDjjc.java
...@@ -100,6 +100,48 @@ public class SjDjjc extends BaseEntity ...@@ -100,6 +100,48 @@ public class SjDjjc extends BaseEntity
private String zt; private String zt;
/** 设计状态（未定稿/定稿） */
@Excel(name = "设计状态", readConverterExp = "未=定稿/定稿")
private String sjzt;
/** 邻井资料状态（未定稿/定稿） */
@Excel(name = "邻井资料状态", readConverterExp = "未=定稿/定稿")
private String ljzlzt;
/** 工程地质分析状态（未定稿/定稿） */
@Excel(name = "工程地质分析状态", readConverterExp = "未=定稿/定稿")
private String dzfxzt;
/** 施工风险提示状态（未定稿/定稿） */
@Excel(name = "施工风险提示状态", readConverterExp = "未=定稿/定稿")
private String fxtszt;
/** 施工概要提示状态（未定稿/定稿） */
@Excel(name = "施工概要提示状态", readConverterExp = "未=定稿/定稿")
private String sggyzt;
/** 分段施工措施状态（未定稿/定稿） */
@Excel(name = "分段施工措施状态", readConverterExp = "未=定稿/定稿")
private String fdsgzt;
/** 井控状态（未定稿/定稿） */
@Excel(name = "井控状态", readConverterExp = "未=定稿/定稿")
private String jkzt;
/** HSE状态（未定稿/定稿） */
@Excel(name = "HSE状态", readConverterExp = "未=定稿/定稿")
private String hsezt;
/** 计划进度状态（未定稿/定稿） */
@Excel(name = "计划进度状态", readConverterExp = "未=定稿/定稿")
private String jhjdzt;
/** 附录状态（未定稿/定稿） */
@Excel(name = "附录状态", readConverterExp = "未=定稿/定稿")
private String flzt;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
......
src/main/java/com/ruoyi/project/zt/domain/CommonParam.java
...@@ -64,5 +64,6 @@ public class CommonParam { ...@@ -64,5 +64,6 @@ public class CommonParam {
private String dc;
} }
src/main/java/com/ruoyi/project/zt/domain/LjDcyx.java
...@@ -20,6 +20,7 @@ public class LjDcyx { ...@@ -20,6 +20,7 @@ public class LjDcyx {
* 底界深度 * 底界深度
*/ */
private Double djsd2; private Double djsd2;
/** /**
* 地层名称 * 地层名称
*/ */
...@@ -41,5 +42,8 @@ public class LjDcyx { ...@@ -41,5 +42,8 @@ public class LjDcyx {
*/ */
private String yqcmc; private String yqcmc;
private Double yxdjsd1;
private Double yxdjsd2;
} }
src/main/java/com/ruoyi/project/zt/mapper/LjQueryMapper.java
...@@ -18,4 +18,7 @@ public interface LjQueryMapper { ...@@ -18,4 +18,7 @@ public interface LjQueryMapper {
* @return * @return
*/ */
List<LjDcyx> getDcyxList(CommonParam param); List<LjDcyx> getDcyxList(CommonParam param);
List<LjDcyx> getDcyxList2(CommonParam commonParam);
} }
src/main/java/com/ruoyi/project/zt/service/impl/DjdcServiceImpl.java
...@@ -80,6 +80,9 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -80,6 +80,9 @@ public class DjdcServiceImpl implements DjdcService {
@Autowired @Autowired
private SjJygjGdsjgdcsMapper sjJygjGdsjgdcsMapper; private SjJygjGdsjgdcsMapper sjJygjGdsjgdcsMapper;
@Autowired
private SjDcfxTsyxMapper sjDcfxTsyxMapper;
@Override @Override
public List<DjDcInfo> getList(DjDcInfo info) { public List<DjDcInfo> getList(DjDcInfo info) {
return djdcInfoMapper.getList(info); return djdcInfoMapper.getList(info);
...@@ -1576,10 +1579,11 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1576,10 +1579,11 @@ public class DjdcServiceImpl implements DjdcService {
jhList.addAll(sjDzfcs.stream().map(SjDzfc::getYjjh2).distinct().collect(Collectors.toList())); jhList.addAll(sjDzfcs.stream().map(SjDzfc::getYjjh2).distinct().collect(Collectors.toList()));
//优先设计 //优先设计
List<LjDcyx> dcyxList =new ArrayList<>(); List<LjDcyx> dcyxList =new ArrayList<>();
CommonParam commonParam =new CommonParam();
if(jhList.size()>0){ if(jhList.size()>0){
//根据井号去录井查询岩性 //根据井号去录井查询岩性
Object[] stringArray = jhList.toArray(); Object[] stringArray = jhList.toArray();
CommonParam commonParam =new CommonParam();
String[] stringArray2 = Arrays.copyOf(stringArray, stringArray.length, String[].class); String[] stringArray2 = Arrays.copyOf(stringArray, stringArray.length, String[].class);
commonParam.setJhs(stringArray2); commonParam.setJhs(stringArray2);
dcyxList = ljQueryMapper.getDcyxList(commonParam); dcyxList = ljQueryMapper.getDcyxList(commonParam);
...@@ -1592,7 +1596,6 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1592,7 +1596,6 @@ public class DjdcServiceImpl implements DjdcService {
List<SjLjjw> sjLjjwList = sjLjjwMapper.selectSjLjjwList(sjLjjw); List<SjLjjw> sjLjjwList = sjLjjwMapper.selectSjLjjwList(sjLjjw);
jhList.addAll(sjLjjwList.stream().map(SjLjjw::getLjjh).collect(Collectors.toList())); jhList.addAll(sjLjjwList.stream().map(SjLjjw::getLjjh).collect(Collectors.toList()));
Object[] stringArray = jhList.toArray(); Object[] stringArray = jhList.toArray();
CommonParam commonParam =new CommonParam();
String[] stringArray2 = Arrays.copyOf(stringArray, stringArray.length, String[].class); String[] stringArray2 = Arrays.copyOf(stringArray, stringArray.length, String[].class);
commonParam.setJhs(stringArray2); commonParam.setJhs(stringArray2);
dcyxList = ljQueryMapper.getDcyxList(commonParam); dcyxList = ljQueryMapper.getDcyxList(commonParam);
...@@ -1608,13 +1611,51 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1608,13 +1611,51 @@ public class DjdcServiceImpl implements DjdcService {
} }
final String dc=dcD; final String dc=dcD;
ljDzfc.setDzfc(dc); ljDzfc.setDzfc(dc);
List<String> yxts = dcyxList.stream().filter(dcyx -> dcyx.getDcmc().equals(dc)).map(LjDcyx::getYxmc).filter(StringUtils::isNotEmpty).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); List<LjDcyx> dzList = dcyxList.stream().filter(dcyx -> dcyx.getDcmc().equals(dc)).collect(Collectors.toList());
List<String> yqcts = dcyxList.stream().filter(dcyx -> dcyx.getDcmc().equals(dc)).map(LjDcyx::getYqcmc).filter(StringUtils::isNotEmpty).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); List<String> yxts =dzList.stream().map(LjDcyx::getYxmc).filter(StringUtils::isNotEmpty).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
List<String> yqcts = dzList.stream().map(LjDcyx::getYqcmc).filter(StringUtils::isNotEmpty).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
if(yxts.size()>0){ if(yxts.size()>0){
ljDzfc.setYxts(String.join( ",",yxts)); ljDzfc.setYxts(String.join( ",",yxts));
List<String> collect = tsyxclxxes.stream().filter(tsyxclxx -> tsyxclxx.getTsyx().indexOf(ljDzfc.getYxts()) != -1).map(Tsyxclxx::getWt).collect(Collectors.toList()); //查询特殊岩性
commonParam.setDc(dc);
List<LjDcyx> dcyxList2 = ljQueryMapper.getDcyxList2(commonParam);
List<String> collect=new ArrayList<>();
List<LjDcyx> ljDcyxes1=new ArrayList<>();
for(LjDcyx ljDcyx:dcyxList2){
for(Tsyxclxx tsyxclxx:tsyxclxxes){
if(ljDcyx.getYxmc().contains(tsyxclxx.getTsyx())){
collect.add(tsyxclxx.getWt());
ljDcyxes1.add(ljDcyx);
}
}
}
if(collect.size()>0){ if(collect.size()>0){
ljDzfc.setGzts(String.join( ",",collect)); ljDzfc.setGzts(String.join( ",",collect.stream().distinct().collect(Collectors.toList())));
}
Map<String, List<LjDcyx>> map = ljDcyxes1.stream().collect(
Collectors.groupingBy(
LjDcyx::getYxmc
));
for(String key:map.keySet()){
List<LjDcyx> ljDcyxes = map.get(key);
LjDcyx ljDcyx = ljDcyxes.stream().min(Comparator.comparing(LjDcyx::getYxdjsd1)).orElse(null);
if(ljDcyx!=null){
Double yxdjsd1 = ljDcyx.getYxdjsd1();
Double djsd1 = ljDcyx.getDjsd1();
Double aaa=yxdjsd1-djsd1;
Double bb=aaa/ljDcyx.getHd();
SjDcfxTsyx sjDcfxTsyx=new SjDcfxTsyx();
sjDcfxTsyx.setJh(param.getJh());
sjDcfxTsyx.setCw(ljDcyx.getDcmc());
sjDcfxTsyx.setTsyx(ljDcyx.getYxmc());
Double cc=item.getSjdcs()+(item.getSjdcs()*bb);
sjDcfxTsyx.setJds(Double.parseDouble(String.format("%.2f",cc)));
sjDcfxTsyxMapper.insertSjDcfxTsyx(sjDcfxTsyx);
}
} }
} }
if(yqcts.size()>0){ if(yqcts.size()>0){
......
src/main/resources/mybatis/zjsgfa/SjDjjcMapper.xml
...@@ -26,10 +26,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -26,10 +26,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="jdzzb" column="jdzzb" /> <result property="jdzzb" column="jdzzb" />
<result property="zt" column="zt" /> <result property="zt" column="zt" />
<result property="qk" column="qk" /> <result property="qk" column="qk" />
<result property="sjzt" column="sjzt" />
<result property="ljzlzt" column="ljzlzt" />
<result property="dzfxzt" column="dzfxzt" />
<result property="fxtszt" column="fxtszt" />
<result property="sggyzt" column="sggyzt" />
<result property="fdsgzt" column="fdsgzt" />
<result property="jkzt" column="jkzt" />
<result property="hsezt" column="hsezt" />
<result property="jhjdzt" column="jhjdzt" />
<result property="flzt" column="flzt" />
</resultMap> </resultMap>
<sql id="selectSjDjjcVo"> <sql id="selectSjDjjcVo">
select id, jh, jb, jx, jkhzb, jkzzb, gzwz, wzcw, ztmd, wzyz, wjfa, created_by, created_time, update_by, update_time, zjgs, zjd, jdhzb, jdzzb, zt,qk from sj_djjc select id, jh, jb, jx, jkhzb, jkzzb, gzwz, wzcw, ztmd, wzyz, wjfa, created_by, created_time, update_by, update_time, zjgs, zjd, jdhzb, jdzzb, zt, qk, sjzt, ljzlzt, dzfxzt, fxtszt, sggyzt, fdsgzt, jkzt, hsezt, jhjdzt, flzt from sj_djjc
</sql> </sql>
<select id="selectSjDjjcList" parameterType="SjDjjc" resultMap="SjDjjcResult"> <select id="selectSjDjjcList" parameterType="SjDjjc" resultMap="SjDjjcResult">
...@@ -53,6 +63,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -53,6 +63,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jdhzb != null "> and jdhzb = #{jdhzb}</if> <if test="jdhzb != null "> and jdhzb = #{jdhzb}</if>
<if test="jdzzb != null "> and jdzzb = #{jdzzb}</if> <if test="jdzzb != null "> and jdzzb = #{jdzzb}</if>
<if test="zt != null and zt != ''"> and zt = #{zt}</if> <if test="zt != null and zt != ''"> and zt = #{zt}</if>
<if test="sjzt != null and sjzt != ''"> and sjzt = #{sjzt}</if>
<if test="ljzlzt != null and ljzlzt != ''"> and ljzlzt = #{ljzlzt}</if>
<if test="dzfxzt != null and dzfxzt != ''"> and dzfxzt = #{dzfxzt}</if>
<if test="fxtszt != null and fxtszt != ''"> and fxtszt = #{fxtszt}</if>
<if test="sggyzt != null and sggyzt != ''"> and sggyzt = #{sggyzt}</if>
<if test="fdsgzt != null and fdsgzt != ''"> and fdsgzt = #{fdsgzt}</if>
<if test="jkzt != null and jkzt != ''"> and jkzt = #{jkzt}</if>
<if test="hsezt != null and hsezt != ''"> and hsezt = #{hsezt}</if>
<if test="jhjdzt != null and jhjdzt != ''"> and jhjdzt = #{jhjdzt}</if>
<if test="flzt != null and flzt != ''"> and flzt = #{flzt}</if>
</where> </where>
</select> </select>
...@@ -88,6 +108,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -88,6 +108,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jdzzb != null">jdzzb,</if> <if test="jdzzb != null">jdzzb,</if>
<if test="zt != null">zt,</if> <if test="zt != null">zt,</if>
<if test="qk != null">qk,</if> <if test="qk != null">qk,</if>
<if test="sjzt != null">sjzt,</if>
<if test="ljzlzt != null">ljzlzt,</if>
<if test="dzfxzt != null">dzfxzt,</if>
<if test="fxtszt != null">fxtszt,</if>
<if test="sggyzt != null">sggyzt,</if>
<if test="fdsgzt != null">fdsgzt,</if>
<if test="jkzt != null">jkzt,</if>
<if test="hsezt != null">hsezt,</if>
<if test="jhjdzt != null">jhjdzt,</if>
<if test="flzt != null">flzt,</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>
...@@ -110,6 +140,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -110,6 +140,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jdzzb != null">#{jdzzb},</if> <if test="jdzzb != null">#{jdzzb},</if>
<if test="zt != null">#{zt},</if> <if test="zt != null">#{zt},</if>
<if test="qk != null">#{qk},</if> <if test="qk != null">#{qk},</if>
<if test="sjzt != null">#{sjzt},</if>
<if test="ljzlzt != null">#{ljzlzt},</if>
<if test="dzfxzt != null">#{dzfxzt},</if>
<if test="fxtszt != null">#{fxtszt},</if>
<if test="sggyzt != null">#{sggyzt},</if>
<if test="fdsgzt != null">#{fdsgzt},</if>
<if test="jkzt != null">#{jkzt},</if>
<if test="hsezt != null">#{hsezt},</if>
<if test="jhjdzt != null">#{jhjdzt},</if>
<if test="flzt != null">#{flzt},</if>
</trim> </trim>
</insert> </insert>
...@@ -135,6 +175,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -135,6 +175,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jdzzb != null">jdzzb = #{jdzzb},</if> <if test="jdzzb != null">jdzzb = #{jdzzb},</if>
<if test="zt != null">zt = #{zt},</if> <if test="zt != null">zt = #{zt},</if>
<if test="qk != null">qk = #{qk},</if> <if test="qk != null">qk = #{qk},</if>
<if test="sjzt != null">sjzt = #{sjzt},</if>
<if test="ljzlzt != null">ljzlzt = #{ljzlzt},</if>
<if test="dzfxzt != null">dzfxzt = #{dzfxzt},</if>
<if test="fxtszt != null">fxtszt = #{fxtszt},</if>
<if test="sggyzt != null">sggyzt = #{sggyzt},</if>
<if test="fdsgzt != null">fdsgzt = #{fdsgzt},</if>
<if test="jkzt != null">jkzt = #{jkzt},</if>
<if test="hsezt != null">hsezt = #{hsezt},</if>
<if test="jhjdzt != null">jhjdzt = #{jhjdzt},</if>
<if test="flzt != null">flzt = #{flzt},</if>
</trim> </trim>
where jh = #{jh} where jh = #{jh}
</update> </update>
......
src/main/resources/mybatis/zt/LjQueryMapper.xml
...@@ -128,4 +128,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -128,4 +128,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by jh,DJSD1 order by jh,DJSD1
</select> </select>
<select id="getDcyxList2" resultType="com.ruoyi.project.zt.domain.LjDcyx">
SELECT B.jh,
B.djsd1,
B.djsd2,
B.dcmc,
b.HD,
A.ysmc yxmc,a.DJSD1 yxdjsd1,a.DJSD2 yxdjsd2
FROM AZF07 B
LEFT JOIN AZL02 A ON B.jh = A.jh
AND A.djsd1 > B.djsd1
AND A.djsd2 &lt; B.djsd2
WHERE 1 = 1
<if test="jhs!=null">
and
<foreach item="jh" collection="jhs"
open="(" separator=" or " close=")">
B.jh LIKE CONCAT(#{jh}, '%' )
</foreach>
</if>
<if test="dc!=null">
and B.dcmc LIKE CONCAT(#{dc}, '%' )
</if>
AND B.fclx = '解释'
GROUP BY B.jh,
B.djsd1,
B.djsd2,
B.dcmc,
b.HD,
a.ysmc,a.DJSD1,a.DJSD2
ORDER BY a.djsd1
</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