Skip to content

Z
zjsgfa_mysql
Commit ec004008 by jiang'yun
Options

修改

parent ed08fcdd
Showing with 254 additions and 276 deletions
pom.xml
...@@ -311,6 +311,12 @@ ...@@ -311,6 +311,12 @@
</dependency> </dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.15.3</version> <!-- 最新版本 -->
</dependency>
</dependencies> </dependencies>
<build> <build>
......
src/main/java/com/zjsgfa/project/zjsgfa/controller/CxtjController.java
...@@ -43,7 +43,7 @@ public class CxtjController extends BaseController ...@@ -43,7 +43,7 @@ public class CxtjController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(Cxtj cxtj) public TableDataInfo list(Cxtj cxtj)
{ {
startPage(); // startPage();
cxtj.setCreatedBy(SecurityUtils.getUsername()); cxtj.setCreatedBy(SecurityUtils.getUsername());
List<Cxtj> list = cxtjService.selectCxtjList(cxtj); List<Cxtj> list = cxtjService.selectCxtjList(cxtj);
return getDataTable(list); return getDataTable(list);
......
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java
...@@ -2322,8 +2322,10 @@ public class SjDjjcController extends BaseController ...@@ -2322,8 +2322,10 @@ public class SjDjjcController extends BaseController
dataModel.put("jh", jh); dataModel.put("jh", jh);
dataModel.put("jb", sjDjjc.getJb()); dataModel.put("jb", sjDjjc.getJb());
dataModel.put("jx", sjDjjc.getJx()); dataModel.put("jx", sjDjjc.getJx());
dataModel.put("jkhzb", sjDjjc.getJkhzb()); DecimalFormat df = new DecimalFormat("0"); // 或使用"#,###"等格式
dataModel.put("jkzzb", sjDjjc.getJkzzb()); String str = df.format(sjDjjc.getJkhzb());
dataModel.put("jkhzb", df.format(sjDjjc.getJkhzb()));
dataModel.put("jkzzb", df.format(sjDjjc.getJkzzb()));
dataModel.put("gzwz", sjDjjc.getGzwz()); dataModel.put("gzwz", sjDjjc.getGzwz());
dataModel.put("wzcw", sjDjjc.getWzcw()); dataModel.put("wzcw", sjDjjc.getWzcw());
dataModel.put("ztmd", sjDjjc.getZtmd()); dataModel.put("ztmd", sjDjjc.getZtmd());
...@@ -2702,6 +2704,19 @@ public class SjDjjcController extends BaseController ...@@ -2702,6 +2704,19 @@ public class SjDjjcController extends BaseController
sjFdsgcsTsgj.setJh(jh); sjFdsgcsTsgj.setJh(jh);
sjFdsgcsTsgj.setKc(kc); sjFdsgcsTsgj.setKc(kc);
List<SjFdsgcsTsgj> sjFdsgcsTsgjList = sjFdsgcsTsgjMapper.selectSjFdsgcsTsgjList(sjFdsgcsTsgj); List<SjFdsgcsTsgj> sjFdsgcsTsgjList = sjFdsgcsTsgjMapper.selectSjFdsgcsTsgjList(sjFdsgcsTsgj);
if(sjFdsgcsTsgjList.size()==0){
SjFdsgcsTsgj sjFdsgcsTsgj1 =new SjFdsgcsTsgj();
sjFdsgcsTsgj1.setJh("-");
sjFdsgcsTsgj1.setKc("-");
sjFdsgcsTsgj1.setGgxh("-");
sjFdsgcsTsgj1.setGjmc("-");
sjFdsgcsTsgj1.setGgxh("-");
sjFdsgcsTsgj1.setSl("-");
sjFdsgcsTsgj1.setYqxg("-");
sjFdsgcsTsgj1.setYjazwz("-");
sjFdsgcsTsgj1.setXnzb("-");
sjFdsgcsTsgj1.setRemark("-");
}
map.put("sjFdsgcsTsgjList", sjFdsgcsTsgjList); map.put("sjFdsgcsTsgjList", sjFdsgcsTsgjList);
SjZtxx sjZtxx=new SjZtxx(); SjZtxx sjZtxx=new SjZtxx();
sjZtxx.setJh(jh); sjZtxx.setJh(jh);
......
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjFdsgcsTsgj.java
package com.zjsgfa.project.zjsgfa.domain; package com.zjsgfa.project.zjsgfa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.zjsgfa.framework.aspectj.lang.annotation.Excel; import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
...@@ -11,6 +12,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity; ...@@ -11,6 +12,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity;
* @author * @author
* @date 2025-08-06 * @date 2025-08-06
*/ */
@Data
public class SjFdsgcsTsgj extends BaseEntity public class SjFdsgcsTsgj extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,7 +38,7 @@ public class SjFdsgcsTsgj extends BaseEntity ...@@ -36,7 +38,7 @@ public class SjFdsgcsTsgj extends BaseEntity
/** 数量 */ /** 数量 */
@Excel(name = "数量") @Excel(name = "数量")
private Double sl; private String sl;
/** 性能指标 */ /** 性能指标 */
@Excel(name = "性能指标") @Excel(name = "性能指标")
...@@ -100,15 +102,7 @@ public class SjFdsgcsTsgj extends BaseEntity ...@@ -100,15 +102,7 @@ public class SjFdsgcsTsgj extends BaseEntity
return ggxh; return ggxh;
} }
public void setSl(Double sl)
{
this.sl = sl;
}
public Double getSl()
{
return sl;
}
public void setXnzb(String xnzb) public void setXnzb(String xnzb)
{ {
...@@ -148,7 +142,6 @@ public class SjFdsgcsTsgj extends BaseEntity ...@@ -148,7 +142,6 @@ public class SjFdsgcsTsgj extends BaseEntity
.append("kc", getKc()) .append("kc", getKc())
.append("gjmc", getGjmc()) .append("gjmc", getGjmc())
.append("ggxh", getGgxh()) .append("ggxh", getGgxh())
.append("sl", getSl())
.append("xnzb", getXnzb()) .append("xnzb", getXnzb())
.append("yjazwz", getYjazwz()) .append("yjazwz", getYjazwz())
.append("yqxg", getYqxg()) .append("yqxg", getYqxg())
......
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjLjjw.java
package com.zjsgfa.project.zjsgfa.domain; package com.zjsgfa.project.zjsgfa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.zjsgfa.framework.aspectj.lang.annotation.Excel; import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
...@@ -11,6 +12,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity; ...@@ -11,6 +12,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity;
* @author * @author
* @date 2025-07-22 * @date 2025-07-22
*/ */
@Data
public class SjLjjw extends BaseEntity public class SjLjjw extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -94,6 +96,9 @@ public class SjLjjw extends BaseEntity ...@@ -94,6 +96,9 @@ public class SjLjjw extends BaseEntity
@Excel(name = "井底纵距离") @Excel(name = "井底纵距离")
private Double jdzjl; private Double jdzjl;
private String lb1;
private String lb2;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
......
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjQkztfx.java
package com.zjsgfa.project.zjsgfa.domain; package com.zjsgfa.project.zjsgfa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.zjsgfa.framework.aspectj.lang.annotation.Excel; import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
...@@ -11,6 +12,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity; ...@@ -11,6 +12,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity;
* @author * @author
* @date 2025-07-22 * @date 2025-07-22
*/ */
@Data
public class SjQkztfx extends BaseEntity public class SjQkztfx extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -82,6 +84,8 @@ public class SjQkztfx extends BaseEntity ...@@ -82,6 +84,8 @@ public class SjQkztfx extends BaseEntity
@Excel(name = "起出井深中位数") @Excel(name = "起出井深中位数")
private Double qsjsZw; private Double qsjsZw;
private String lb;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
......
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjZjcsxx.java
...@@ -83,6 +83,21 @@ public class SjZjcsxx extends BaseEntity ...@@ -83,6 +83,21 @@ public class SjZjcsxx extends BaseEntity
@Excel(name = "缸套直径") @Excel(name = "缸套直径")
private String gtzj; private String gtzj;
/** 刀翼 */
@Excel(name = "刀翼")
private String dy;
/** 复合片 */
@Excel(name = "复合片")
private String ffp;
/** 复合片齿形 */
@Excel(name = "复合片齿形")
private String ffpcx;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
......
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjZtgjsj.java
package com.zjsgfa.project.zjsgfa.domain; package com.zjsgfa.project.zjsgfa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.zjsgfa.framework.aspectj.lang.annotation.Excel; import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
...@@ -11,6 +12,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity; ...@@ -11,6 +12,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity;
* @author * @author
* @date 2025-07-22 * @date 2025-07-22
*/ */
@Data
public class SjZtgjsj extends BaseEntity public class SjZtgjsj extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -60,11 +62,11 @@ public class SjZtgjsj extends BaseEntity ...@@ -60,11 +62,11 @@ public class SjZtgjsj extends BaseEntity
/** 钻井液密度 */ /** 钻井液密度 */
@Excel(name = "钻井液密度") @Excel(name = "钻井液密度")
private Double zjymd; private String zjymd;
/** 排量 */ /** 排量 */
@Excel(name = "排量") @Excel(name = "排量")
private Double pl; private String pl;
/** 泵压 */ /** 泵压 */
@Excel(name = "泵压") @Excel(name = "泵压")
...@@ -82,196 +84,4 @@ public class SjZtgjsj extends BaseEntity ...@@ -82,196 +84,4 @@ public class SjZtgjsj extends BaseEntity
@Excel(name = "指标") @Excel(name = "指标")
private Double zb; private Double zb;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setJh(String jh)
{
this.jh = jh;
}
public String getJh()
{
return jh;
}
public void setLjjh(String ljjh)
{
this.ljjh = ljjh;
}
public String getLjjh()
{
return ljjh;
}
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 setZtcc(Double ztcc)
{
this.ztcc = ztcc;
}
public Double getZtcc()
{
return ztcc;
}
public void setZtxh(String ztxh)
{
this.ztxh = ztxh;
}
public String getZtxh()
{
return ztxh;
}
public void setPz(String pz)
{
this.pz = pz;
}
public String getPz()
{
return pz;
}
public void setMxqk(String mxqk)
{
this.mxqk = mxqk;
}
public String getMxqk()
{
return mxqk;
}
public void setQzyy(String qzyy)
{
this.qzyy = qzyy;
}
public String getQzyy()
{
return qzyy;
}
public void setCw(String cw)
{
this.cw = cw;
}
public String getCw()
{
return cw;
}
public void setZjymd(Double zjymd)
{
this.zjymd = zjymd;
}
public Double getZjymd()
{
return zjymd;
}
public void setPl(Double pl)
{
this.pl = pl;
}
public Double getPl()
{
return pl;
}
public void setLgby(Double lgby)
{
this.lgby = lgby;
}
public Double getLgby()
{
return lgby;
}
public void setJc(Double jc)
{
this.jc = jc;
}
public Double getJc()
{
return jc;
}
public void setJxzs(Double jxzs)
{
this.jxzs = jxzs;
}
public Double getJxzs()
{
return jxzs;
}
public void setZb(Double zb)
{
this.zb = zb;
}
public Double getZb()
{
return zb;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("jh", getJh())
.append("ljjh", getLjjh())
.append("kc", getKc())
.append("jd", getJd())
.append("ztcc", getZtcc())
.append("ztxh", getZtxh())
.append("pz", getPz())
.append("mxqk", getMxqk())
.append("qzyy", getQzyy())
.append("cw", getCw())
.append("zjymd", getZjymd())
.append("pl", getPl())
.append("lgby", getLgby())
.append("jc", getJc())
.append("jxzs", getJxzs())
.append("zb", getZb())
.toString();
}
} }
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFdsgcsServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl; package com.zjsgfa.project.zjsgfa.service.impl;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.time.LocalDate;
import java.util.Arrays; import java.time.format.DateTimeFormatter;
import java.util.Comparator; import java.util.*;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.Base64;
import com.zjsgfa.common.utils.DateUtils;
import com.zjsgfa.common.utils.StringUtils; import com.zjsgfa.common.utils.StringUtils;
import com.zjsgfa.project.zjsgfa.domain.*; import com.zjsgfa.project.zjsgfa.domain.*;
import com.zjsgfa.project.zjsgfa.mapper.*; import com.zjsgfa.project.zjsgfa.mapper.*;
...@@ -138,24 +138,18 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -138,24 +138,18 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
List<String> strs=new ArrayList<>(); List<String> strs=new ArrayList<>();
sjFdsgcs2.forEach(item->{ sjFdsgcs2.forEach(item->{
if(StringUtils.isNotEmpty(item.getGjyh())){
if(item.getKc().equals(sjFdsgcs.getKc())){ if(item.getKc().equals(sjFdsgcs.getKc())){
strs.add("<p>"+item.getKc()+"</p>:"+s); strs.add("<p>"+item.getKc()+"</p>:"+s);
}else { }else {
strs.add("<p>"+item.getKc()+"</p>:"+item.getGjyh()); strs.add("<p>"+item.getKc()+"</p>:"+item.getGjyh());
} }
}
}); });
if(sjSggyGjsbxnyqs.size()>0){ if(sjSggyGjsbxnyqs.size()>0){
SjSggyGjsbxnyq sjSggyGjsbxnyq1 = sjSggyGjsbxnyqs.get(0); SjSggyGjsbxnyq sjSggyGjsbxnyq1 = sjSggyGjsbxnyqs.get(0);
// String sjyh=sjFdsgcs.getKc()+"："+s;
// String[] split = sjSggyGjsbxnyq1.getSjyh().split("；");
// List<String> collect = Arrays.stream(split).distinct().collect(Collectors.toList());
// collect.add(sjyh);
// sjSggyGjsbxnyq1.setSjyh(String.join("；",collect));
sjSggyGjsbxnyq1.setSjyh(String.join("；",strs.stream().distinct().collect(Collectors.toList()))); sjSggyGjsbxnyq1.setSjyh(String.join("；",strs.stream().distinct().collect(Collectors.toList())));
sjSggyGjsbxnyqMapper.updateSjSggyGjsbxnyq(sjSggyGjsbxnyq1); sjSggyGjsbxnyqMapper.updateSjSggyGjsbxnyq(sjSggyGjsbxnyq1);
...@@ -195,20 +189,47 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -195,20 +189,47 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
if(StringUtils.isNotEmpty(sjFdsgcs.getZjzh())){ if(StringUtils.isNotEmpty(sjFdsgcs.getZjzh())){
String s = new String(Base64.decode(sjFdsgcs.getZjzh()), StandardCharsets.UTF_8); String s = new String(Base64.decode(sjFdsgcs.getZjzh()), StandardCharsets.UTF_8);
sjFdsgcs.setZjzh(s); sjFdsgcs.setZjzh(s);
// //查询井段信息
SjJsjg sjJsjg = new SjJsjg();
sjJsjg.setJh(sjFdsgcs.getJh());
List<SjJsjg> sjJsjgList = sjJsjgMapper.selectSjJsjgList(sjJsjg);
double ksjs=0;
String jd ="";
for(int i=0;i<sjJsjgList.size();i++) {
SjJsjg sjJsjg1 = sjJsjgList.get(i);
if(sjFdsgcs.getKc().equals(sjJsjg1.getKc())){
if (i == 0) {
ksjs = 0;
} else {
ksjs = sjJsjgList.get(i - 1).getJs();
}
jd=ksjs+"-"+sjJsjg1.getJs();
}
}
SjSggyZjzhcs sjSggyZjzhcs= new SjSggyZjzhcs(); SjSggyZjzhcs sjSggyZjzhcs= new SjSggyZjzhcs();
sjSggyZjzhcs.setJh(sjFdsgcs.getJh()); sjSggyZjzhcs.setJh(sjFdsgcs.getJh());
sjSggyZjzhcs.setKc(sjFdsgcs.getKc()); sjSggyZjzhcs.setKc(sjFdsgcs.getKc());
SjSggyZjzhcs sjSggyZjzhcs1 = sjSggyZjzhcsMapper.selectSjSggyZjzhcsByZjzhcs(sjSggyZjzhcs); SjSggyZjzhcs sjSggyZjzhcs1 = sjSggyZjzhcsMapper.selectSjSggyZjzhcsByZjzhcs(sjSggyZjzhcs);
if(sjSggyZjzhcs1!=null){ if(sjSggyZjzhcs1!=null){
sjSggyZjzhcs1.setZjjg(s); sjSggyZjzhcs1.setZjjg(s);
sjSggyZjzhcs1.setJd(jd);
sjSggyZjzhcsMapper.updateSjSggyZjzhcs(sjSggyZjzhcs1); sjSggyZjzhcsMapper.updateSjSggyZjzhcs(sjSggyZjzhcs1);
}else {
sjSggyZjzhcs1=new SjSggyZjzhcs();
sjSggyZjzhcs1.setJh(sjFdsgcs.getJh());
sjSggyZjzhcs1.setKc(sjFdsgcs.getKc());
sjSggyZjzhcs1.setJd(jd);
sjSggyZjzhcs1.setZjjg(s);
sjSggyZjzhcsMapper.insertSjSggyZjzhcs(sjSggyZjzhcs1);
} }
} }
if(StringUtils.isNotEmpty(sjFdsgcs.getZjzhzysx())){ if(StringUtils.isNotEmpty(sjFdsgcs.getZjzhzysx())){
String s = new String(Base64.decode(sjFdsgcs.getZjzhzysx()), StandardCharsets.UTF_8); String s = new String(Base64.decode(sjFdsgcs.getZjzhzysx()), StandardCharsets.UTF_8);
sjFdsgcs.setZjzhzysx(s); sjFdsgcs.setZjzhzysx(s);
} }
return sjFdsgcsMapper.updateSjFdsgcs(sjFdsgcs); return sjFdsgcsMapper.updateSjFdsgcs(sjFdsgcs);
} }
...@@ -276,17 +297,6 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -276,17 +297,6 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
commonParam.setJhs(jhs); commonParam.setJhs(jhs);
commonParam.setFw(sjJygjGdsjgdcsList.get(0).getFw()); commonParam.setFw(sjJygjGdsjgdcsList.get(0).getFw());
djZqsjfxList = djdcInfoMapper.getjskd(commonParam); djZqsjfxList = djdcInfoMapper.getjskd(commonParam);
//如果获取的方位相同的井列表不为空
// if (djZqsjfxList.size() > 0){
// ///获取所有井的造斜规律数据
// CommonParam commonParam1 = new CommonParam();
// String[] jhs2=new String[djZqsjfxList.size()];
// for (int i = 0; i < djZqsjfxList.size(); i++) {
// jhs2[i]=djZqsjfxList.get(i).getJh();
// }
// commonParam1.setJhs(jhs2);
// jskdList= djdcService.getJskdList(commonParam1);
// }
} }
...@@ -340,9 +350,9 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -340,9 +350,9 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
zyfx=zyfx+"<p>邻井风险<p>"; zyfx=zyfx+"<p>邻井风险<p>";
List<String> fzqk=new ArrayList<>(); List<String> fzqk=new ArrayList<>();
//查询一趟钻率 //查询一趟钻率
int kc1=i+1;
List<SjQkztfx> collect2 = sjQkztfxes.stream().filter(it -> StringUtils.isNotEmpty(it.getKc())).collect(Collectors.toList()); List<SjQkztfx> collect2 = sjQkztfxes.stream().filter(it -> StringUtils.isNotEmpty(it.getKc())).collect(Collectors.toList());
List<SjQkztfx> collect1 = collect2.stream().filter(it -> it.getKc().equals(kc1 + "")).collect(Collectors.toList()); List<SjQkztfx> collect1 = collect2.stream().filter(it -> it.getKc().equals(kc + "")).collect(Collectors.toList());
SjQkztfx sjQkztfx1 = collect1.stream().max(Comparator.comparing(SjQkztfx::getYtzl)).get(); SjQkztfx sjQkztfx1 = collect1.stream().max(Comparator.comparing(SjQkztfx::getYtzl)).get();
Double ytzl=0.0; Double ytzl=0.0;
if(sjQkztfx1!=null){ if(sjQkztfx1!=null){
...@@ -439,10 +449,10 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -439,10 +449,10 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
sjFdsgcs.setJdqk(previousDepth+"-"+cs+","+sjFdsgcsDcyxList.get(0).getDcmc()+"-"+sjFdsgcsDcyxList.get(sjFdsgcsDcyxList.size()-1).getDcmc()); sjFdsgcs.setJdqk(previousDepth+"-"+cs+","+sjFdsgcsDcyxList.get(0).getDcmc()+"-"+sjFdsgcsDcyxList.get(sjFdsgcsDcyxList.size()-1).getDcmc());
} }
} }
sjFdsgcs.setGjyh(gjyh); sjFdsgcs.setGjfx(gjyh);
sjFdsgcsMapper.insertSjFdsgcs(sjFdsgcs); sjFdsgcsMapper.insertSjFdsgcs(sjFdsgcs);
}else { }else {
sjFdsgcs1.setGjyh(gjyh); sjFdsgcs1.setGjfx(gjyh);
//查询是否有复杂情况 //查询是否有复杂情况
if(collect.size()>0){ if(collect.size()>0){
Jsqa jsqa= new Jsqa(); Jsqa jsqa= new Jsqa();
...@@ -551,8 +561,19 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -551,8 +561,19 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
param.setJkhzb(sjDjjc.getJkhzb()); param.setJkhzb(sjDjjc.getJkhzb());
param.setJkzzb(sjDjjc.getJkzzb()); param.setJkzzb(sjDjjc.getJkzzb());
param.setJl(3000.0); param.setJl(3000.0);
param.setWjsjks("2020"); // 获取当前日期
param.setWjsjjs("2025"); LocalDate currentDate = LocalDate.now();
// 获取四年前的日期
LocalDate fourYearsAgo = currentDate.minusYears(4);
// 定义格式化器
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy");
// 格式化日期
String formattedDate = fourYearsAgo.format(formatter);
param.setWjsjks(formattedDate);
param.setWjsjjs(DateUtils.parseDateToStr("yyyy", new Date()));
List<Ljjw> ljjwList=djdcService.getLjjwList2(param); List<Ljjw> ljjwList=djdcService.getLjjwList2(param);
List<String> ljjhlist = ljjwList.stream().limit(20).map(Ljjw::getJh).collect(Collectors.toList()); List<String> ljjhlist = ljjwList.stream().limit(20).map(Ljjw::getJh).collect(Collectors.toList());
collect.addAll(ljjhlist); collect.addAll(ljjhlist);
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjJsjgServiceImpl.java
...@@ -119,7 +119,7 @@ public class SjJsjgServiceImpl implements ISjJsjgService ...@@ -119,7 +119,7 @@ public class SjJsjgServiceImpl implements ISjJsjgService
Double maxY =0.0; Double maxY =0.0;
Double maxX =0.0; Double maxX =0.0;
if(sjJygjGdsjgdcsList.size()>0){ if(sjJygjGdsjgdcsList.size()>0){
maxY = sjJygjGdsjgdcsList.stream().map(SjJygjGdsjgdcs::getCs).max(Double::compare).get(); maxY = sjJygjGdsjgdcsList.stream().map(SjJygjGdsjgdcs::getJs).max(Double::compare).get();
maxX = sjJygjGdsjgdcsList.stream().map(SjJygjGdsjgdcs::getSpy).max(Double::compare).get(); maxX = sjJygjGdsjgdcsList.stream().map(SjJygjGdsjgdcs::getSpy).max(Double::compare).get();
} }
...@@ -130,7 +130,7 @@ public class SjJsjgServiceImpl implements ISjJsjgService ...@@ -130,7 +130,7 @@ public class SjJsjgServiceImpl implements ISjJsjgService
List zxList = new ArrayList<>(); List zxList = new ArrayList<>();
for(int i=0;i<sjJygjGdsjgdcsList.size();i++){ for(int i=0;i<sjJygjGdsjgdcsList.size();i++){
SjJygjGdsjgdcs jg=sjJygjGdsjgdcsList.get(i); SjJygjGdsjgdcs jg=sjJygjGdsjgdcsList.get(i);
Double cs1 = jg.getCs(); Double cs1 = jg.getJs();
Double spy1 = jg.getSpy(); Double spy1 = jg.getSpy();
//填充中心线 //填充中心线
Map zxmap =new HashMap(); Map zxmap =new HashMap();
...@@ -177,7 +177,7 @@ public class SjJsjgServiceImpl implements ISjJsjgService ...@@ -177,7 +177,7 @@ public class SjJsjgServiceImpl implements ISjJsjgService
for (int k = 0; k < collect.size(); k++) { for (int k = 0; k < collect.size(); k++) {
SjJygjGdsjgdcs jg = collect.get(k); SjJygjGdsjgdcs jg = collect.get(k);
double cs1 = jg.getCs(); double cs1 = jg.getJs();
double spy1 = jg.getSpy(); double spy1 = jg.getSpy();
//左侧 //左侧
...@@ -220,7 +220,7 @@ public class SjJsjgServiceImpl implements ISjJsjgService ...@@ -220,7 +220,7 @@ public class SjJsjgServiceImpl implements ISjJsjgService
Map tczbqdmap1 = new HashMap(); Map tczbqdmap1 = new HashMap();
//起始y=水泥返高 //起始y=水泥返高
//起始x //起始x
if (jg.getCs().doubleValue() >= snfg.doubleValue()) { if (jg.getJs().doubleValue() >= snfg.doubleValue()) {
if (i == 0) { if (i == 0) {
tczbqdmap1.put("x", Math.round(xa - 100)); tczbqdmap1.put("x", Math.round(xa - 100));
tczbqdmap1.put("y", y); tczbqdmap1.put("y", y);
...@@ -247,7 +247,7 @@ public class SjJsjgServiceImpl implements ISjJsjgService ...@@ -247,7 +247,7 @@ public class SjJsjgServiceImpl implements ISjJsjgService
Map tczbqdmap2 =new HashMap(); Map tczbqdmap2 =new HashMap();
//起始y=水泥返高 //起始y=水泥返高
//起始x //起始x
if(jg.getCs().doubleValue()>=snfg.doubleValue()){ if(jg.getJs().doubleValue()>=snfg.doubleValue()){
if(i==0){ if(i==0){
tczbqdmap2.put("x",xa2+100); tczbqdmap2.put("x",xa2+100);
tczbqdmap2.put("y",y); tczbqdmap2.put("y",y);
...@@ -296,12 +296,13 @@ public class SjJsjgServiceImpl implements ISjJsjgService ...@@ -296,12 +296,13 @@ public class SjJsjgServiceImpl implements ISjJsjgService
}else { }else {
index=collect.size()/2; index=collect.size()/2;
} }
SjJygjGdsjgdcs dtJygjJg1 = collect.get(index); SjJygjGdsjgdcs dtJygjJg1 = collect.get(collect.size()-1);
Double x= dtJygjJg1.getSpy()+500; Double x= dtJygjJg1.getSpy()+500;
Double y= dtJygjJg1.getCs(); Double y= item.getJs();
Double xa2 = x+item.getZtzj(); // Double y= dtJygjJg1.getCs();
Double xa2 = x;
double[] msqd = {xa2.doubleValue(),y.doubleValue()};//起点 double[] msqd = {xa2.doubleValue(),y.doubleValue()};//起点
double[] mszd ={xa2.doubleValue()+900,y.doubleValue()};//终点 double[] mszd ={xa2.doubleValue()+400,y.doubleValue()};//终点
point.add(msqd); point.add(msqd);
point.add(mszd); point.add(mszd);
} }
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjLjjwServiceImpl.java
...@@ -102,7 +102,7 @@ public class SjLjjwServiceImpl implements ISjLjjwService ...@@ -102,7 +102,7 @@ public class SjLjjwServiceImpl implements ISjLjjwService
List<SjLjjw> sjLjjws = sjLjjwMapper.selectSjLjjwList(sjLjjw); List<SjLjjw> sjLjjws = sjLjjwMapper.selectSjLjjwList(sjLjjw);
Set<String> jhSet = sjLjjws.stream() Set<String> jhSet = sjLjjws.stream()
.map(SjLjjw::getLjjh) // 假设getJh()是获取井号的方法 .map(SjLjjw::getLjjh)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
List<SjLjjw> difference = list.stream() List<SjLjjw> difference = list.stream()
.filter(item -> !jhSet.contains(item.getLjjh())) .filter(item -> !jhSet.contains(item.getLjjh()))
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjZjcsxxServiceImpl.java
...@@ -2,7 +2,10 @@ package com.zjsgfa.project.zjsgfa.service.impl; ...@@ -2,7 +2,10 @@ package com.zjsgfa.project.zjsgfa.service.impl;
import java.util.List; import java.util.List;
import com.zjsgfa.common.utils.StringUtils;
import com.zjsgfa.project.zjsgfa.domain.SjJsjg;
import com.zjsgfa.project.zjsgfa.domain.SjSggyZjzhcs; import com.zjsgfa.project.zjsgfa.domain.SjSggyZjzhcs;
import com.zjsgfa.project.zjsgfa.mapper.SjJsjgMapper;
import com.zjsgfa.project.zjsgfa.mapper.SjSggyZjzhcsMapper; import com.zjsgfa.project.zjsgfa.mapper.SjSggyZjzhcsMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -25,6 +28,10 @@ public class SjZjcsxxServiceImpl implements ISjZjcsxxService ...@@ -25,6 +28,10 @@ public class SjZjcsxxServiceImpl implements ISjZjcsxxService
@Autowired @Autowired
private SjSggyZjzhcsMapper sjSggyZjzhcsMapper; private SjSggyZjzhcsMapper sjSggyZjzhcsMapper;
@Autowired
private SjJsjgMapper sjJsjgMapper;
/** /**
* 查询设计-钻具参数信息 * 查询设计-钻具参数信息
* *
...@@ -58,6 +65,7 @@ public class SjZjcsxxServiceImpl implements ISjZjcsxxService ...@@ -58,6 +65,7 @@ public class SjZjcsxxServiceImpl implements ISjZjcsxxService
@Override @Override
public int insertSjZjcsxx(SjZjcsxx sjZjcsxx) public int insertSjZjcsxx(SjZjcsxx sjZjcsxx)
{ {
return sjZjcsxxMapper.insertSjZjcsxx(sjZjcsxx); return sjZjcsxxMapper.insertSjZjcsxx(sjZjcsxx);
} }
...@@ -70,37 +78,57 @@ public class SjZjcsxxServiceImpl implements ISjZjcsxxService ...@@ -70,37 +78,57 @@ public class SjZjcsxxServiceImpl implements ISjZjcsxxService
@Override @Override
public int updateSjZjcsxx(SjZjcsxx sjZjcsxx) public int updateSjZjcsxx(SjZjcsxx sjZjcsxx)
{ {
SjSggyZjzhcs sjSggyZjzhcs= new SjSggyZjzhcs(); SjSggyZjzhcs sjSggyZjzhcs= new SjSggyZjzhcs();
sjSggyZjzhcs.setJh(sjZjcsxx.getJh()); sjSggyZjzhcs.setJh(sjZjcsxx.getJh());
sjSggyZjzhcs.setKc(sjZjcsxx.getKc()); sjSggyZjzhcs.setKc(sjZjcsxx.getKc());
SjSggyZjzhcs sjSggyZjzhcs1 = sjSggyZjzhcsMapper.selectSjSggyZjzhcsByZjzhcs(sjSggyZjzhcs); SjSggyZjzhcs sjSggyZjzhcs1 = sjSggyZjzhcsMapper.selectSjSggyZjzhcsByZjzhcs(sjSggyZjzhcs);
//查询井段信息
SjJsjg sjJsjg = new SjJsjg();
sjJsjg.setJh(sjZjcsxx.getJh());
List<SjJsjg> sjJsjgList = sjJsjgMapper.selectSjJsjgList(sjJsjg);
double ksjs=0;
String jd ="";
for(int i=0;i<sjJsjgList.size();i++) {
SjJsjg sjJsjg1 = sjJsjgList.get(i);
if(sjZjcsxx.getKc().equals(sjZjcsxx.getKc())){
if (i == 0) {
ksjs = 0;
} else {
ksjs = sjJsjgList.get(i - 1).getJs();
}
jd=ksjs+"-"+sjJsjg1.getJs();
}
}
if(sjSggyZjzhcs1!=null){ if(sjSggyZjzhcs1!=null){
sjSggyZjzhcs1.setJd(jd);
sjSggyZjzhcs1.setZtxh(sjZjcsxx.getZtxh()); sjSggyZjzhcs1.setZtxh(sjZjcsxx.getZtxh());
sjSggyZjzhcs1.setCc(sjZjcsxx.getCc()+""); sjSggyZjzhcs1.setCc(sjZjcsxx.getCc());
sjSggyZjzhcs1.setSy(sjZjcsxx.getSy()+""); sjSggyZjzhcs1.setSy(sjZjcsxx.getSy());
sjSggyZjzhcs1.setZjymd(sjZjcsxx.getZjymd()+""); sjSggyZjzhcs1.setZjymd(sjZjcsxx.getZjymd());
sjSggyZjzhcs1.setZjpl(sjZjcsxx.getZjpl()+"");
sjSggyZjzhcs1.setCj(sjZjcsxx.getCj()); sjSggyZjzhcs1.setCj(sjZjcsxx.getCj());
sjSggyZjzhcs1.setYj(sjZjcsxx.getYj()); sjSggyZjzhcs1.setYj(sjZjcsxx.getYj());
sjSggyZjzhcs1.setZjzy(sjZjcsxx.getZjzy()); sjSggyZjzhcs1.setZjzy(StringUtils.isNotEmpty(sjZjcsxx.getZjzysx())?sjZjcsxx.getZjzy()+"-"+sjZjcsxx.getZjzysx():sjZjcsxx.getZjzy());
sjSggyZjzhcs1.setZjzs(sjZjcsxx.getZjzs()); sjSggyZjzhcs1.setZjzs(StringUtils.isNotEmpty(sjZjcsxx.getZjzssx())?sjZjcsxx.getZjzs()+"-"+sjZjcsxx.getZjzssx():sjZjcsxx.getZjzs());
sjSggyZjzhcs1.setZjby(sjZjcsxx.getZjby()); sjSggyZjzhcs1.setZjby(StringUtils.isNotEmpty(sjZjcsxx.getZjbysx())?sjZjcsxx.getZjby()+"-"+sjZjcsxx.getZjbysx():sjZjcsxx.getZjby());
sjSggyZjzhcs1.setZjpl(StringUtils.isNotEmpty(sjZjcsxx.getZjplsx() )?sjZjcsxx.getZjpl()+"-"+sjZjcsxx.getZjplsx() :sjZjcsxx.getZjpl());
sjSggyZjzhcsMapper.updateSjSggyZjzhcs(sjSggyZjzhcs1); sjSggyZjzhcsMapper.updateSjSggyZjzhcs(sjSggyZjzhcs1);
}else { }else {
sjSggyZjzhcs1=new SjSggyZjzhcs(); sjSggyZjzhcs1=new SjSggyZjzhcs();
sjSggyZjzhcs1.setJh(sjZjcsxx.getJh()); sjSggyZjzhcs1.setJh(sjZjcsxx.getJh());
sjSggyZjzhcs1.setKc(sjZjcsxx.getKc()); sjSggyZjzhcs1.setKc(sjZjcsxx.getKc());
sjSggyZjzhcs1.setJd(sjZjcsxx.getJd()); sjSggyZjzhcs1.setJd(jd);
sjSggyZjzhcs1.setZtxh(sjZjcsxx.getZtxh()); sjSggyZjzhcs1.setZtxh(sjZjcsxx.getZtxh());
sjSggyZjzhcs1.setCc(sjZjcsxx.getCc()+""); sjSggyZjzhcs1.setCc(sjZjcsxx.getCc());
sjSggyZjzhcs1.setSy(sjZjcsxx.getSy()+""); sjSggyZjzhcs1.setSy(sjZjcsxx.getSy());
sjSggyZjzhcs1.setZjymd(sjZjcsxx.getZjymd()+""); sjSggyZjzhcs1.setZjymd(sjZjcsxx.getZjymd());
sjSggyZjzhcs1.setZjpl(sjZjcsxx.getZjpl()+"");
sjSggyZjzhcs1.setCj(sjZjcsxx.getCj()); sjSggyZjzhcs1.setCj(sjZjcsxx.getCj());
sjSggyZjzhcs1.setYj(sjZjcsxx.getYj()); sjSggyZjzhcs1.setYj(sjZjcsxx.getYj());
sjSggyZjzhcs1.setZjzy(sjZjcsxx.getZjzy()); sjSggyZjzhcs1.setZjzy(StringUtils.isNotEmpty(sjZjcsxx.getZjzysx())?sjZjcsxx.getZjzy()+"-"+sjZjcsxx.getZjzysx():sjZjcsxx.getZjzy());
sjSggyZjzhcs1.setZjzs(sjZjcsxx.getZjzs()); sjSggyZjzhcs1.setZjzs(StringUtils.isNotEmpty(sjZjcsxx.getZjzssx())?sjZjcsxx.getZjzs()+"-"+sjZjcsxx.getZjzssx():sjZjcsxx.getZjzs());
sjSggyZjzhcs1.setZjby(sjZjcsxx.getZjby()); sjSggyZjzhcs1.setZjby(StringUtils.isNotEmpty(sjZjcsxx.getZjbysx())?sjZjcsxx.getZjby()+"-"+sjZjcsxx.getZjbysx():sjZjcsxx.getZjby());
sjSggyZjzhcs1.setZjpl(StringUtils.isNotEmpty(sjZjcsxx.getZjplsx() )?sjZjcsxx.getZjpl()+"-"+sjZjcsxx.getZjplsx() :sjZjcsxx.getZjpl());
sjSggyZjzhcsMapper.updateSjSggyZjzhcs(sjSggyZjzhcs1); sjSggyZjzhcsMapper.updateSjSggyZjzhcs(sjSggyZjzhcs1);
} }
int i = sjZjcsxxMapper.updateSjZjcsxx(sjZjcsxx); int i = sjZjcsxxMapper.updateSjZjcsxx(sjZjcsxx);
......
src/main/java/com/zjsgfa/project/zt/domain/DjZqsjfx.java
...@@ -66,4 +66,6 @@ public class DjZqsjfx { ...@@ -66,4 +66,6 @@ public class DjZqsjfx {
private Double hj; private Double hj;
private Double fw;
} }
src/main/java/com/zjsgfa/project/zt/domain/Djjc.java
...@@ -64,7 +64,7 @@ public class Djjc { ...@@ -64,7 +64,7 @@ public class Djjc {
private Double zjymd; private Double zjymd;
//排量 //排量
@Excel(name = "排量") @Excel(name = "排量")
private Double pl; private String pl;
//泵压 //泵压
@Excel(name = "泵压") @Excel(name = "泵压")
private Double lgby; private Double lgby;
......
src/main/java/com/zjsgfa/project/zt/domain/TimePointPair.java
...@@ -30,7 +30,8 @@ public class TimePointPair { ...@@ -30,7 +30,8 @@ public class TimePointPair {
// 判断两个时间点之间是否跨天 // 判断两个时间点之间是否跨天
public boolean isCrossDay() { public boolean isCrossDay() {
return drillingTime.isBefore(previousTime); boolean before = drillingTime.isBefore(previousTime);
return before;
} }
public boolean isCrossDay2() { public boolean isCrossDay2() {
......
src/main/java/com/zjsgfa/project/zt/service/impl/DjdcServiceImpl.java
...@@ -340,7 +340,7 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -340,7 +340,7 @@ public class DjdcServiceImpl implements DjdcService {
"，是否跨天：" + pair.isCrossDay()); "，是否跨天：" + pair.isCrossDay());
String formattedTime = pair.getDrillingTime().format(DateTimeFormatter.ISO_LOCAL_TIME); String formattedTime = pair.getDrillingTime().format(DateTimeFormatter.ISO_LOCAL_TIME);
if( pair.isCrossDay()){ if( !pair.isCrossDay()){
zwsj= DateUtils.parseDateToStr("yyyy-MM-dd",jswaZwsj.getRq()) +" "+formattedTime; zwsj= DateUtils.parseDateToStr("yyyy-MM-dd",jswaZwsj.getRq()) +" "+formattedTime;
}else { }else {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
...@@ -697,6 +697,19 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -697,6 +697,19 @@ public class DjdcServiceImpl implements DjdcService {
DecimalFormat df = new DecimalFormat("#.00"); DecimalFormat df = new DecimalFormat("#.00");
for (DjZjzhfx item:list){ for (DjZjzhfx item:list){
String zjzh = item.getZjzh(); String zjzh = item.getZjzh();
String kc =item.getKc();
if(kc.equals("1")){
kc="一开";
}else if(kc.equals("2")){
kc="二开";
}else if(kc.equals("3")){
kc="三开";
}else if(kc.equals("4")){
kc="四开";
}else if(kc.equals("5")){
kc="五开";
}
item.setKc(kc);
// if(StringUtils.isNotEmpty(zjzh)){ // if(StringUtils.isNotEmpty(zjzh)){
// Map<String,Object> map=new HashMap<>(); // Map<String,Object> map=new HashMap<>();
// map.put("prompt",zjzh+" 这是一个钻具组合信息，请把这个钻具组合信息拆分成竖表，" + // map.put("prompt",zjzh+" 这是一个钻具组合信息，请把这个钻具组合信息拆分成竖表，" +
...@@ -1581,6 +1594,21 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1581,6 +1594,21 @@ public class DjdcServiceImpl implements DjdcService {
param.setJhs(jhs); param.setJhs(jhs);
} }
List<Jsha> jshaList=djdcInfoMapper.getFdcsList(param); List<Jsha> jshaList=djdcInfoMapper.getFdcsList(param);
jshaList.forEach(item -> {
String kc =item.getKc();
if(kc.equals("1")){
kc="一开";
}else if(kc.equals("2")){
kc="二开";
}else if(kc.equals("3")){
kc="三开";
}else if(kc.equals("4")){
kc="四开";
}else if(kc.equals("5")){
kc="五开";
}
item.setKc(kc);
});
return jshaList; return jshaList;
} }
...@@ -1956,6 +1984,22 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1956,6 +1984,22 @@ public class DjdcServiceImpl implements DjdcService {
} }
List<LjGzbj> gzbjList = djdcInfoMapper.getGzbjList(param); List<LjGzbj> gzbjList = djdcInfoMapper.getGzbjList(param);
List<LjGzbj> collect = gzbjList.stream().filter(it -> it.getZb() != null).collect(Collectors.toList()); List<LjGzbj> collect = gzbjList.stream().filter(it -> it.getZb() != null).collect(Collectors.toList());
for(LjGzbj item:collect){
String kc =item.getKc();
if(kc.equals("1")){
kc="一开";
}else if(kc.equals("2")){
kc="二开";
}else if(kc.equals("3")){
kc="三开";
}else if(kc.equals("4")){
kc="四开";
}else if(kc.equals("5")){
kc="五开";
}
item.setKc(kc);
}
return collect; return collect;
} }
...@@ -1983,6 +2027,7 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1983,6 +2027,7 @@ public class DjdcServiceImpl implements DjdcService {
List<String> collect = Arrays.stream(split).distinct().collect(Collectors.toList()); List<String> collect = Arrays.stream(split).distinct().collect(Collectors.toList());
item.setClgk(String.join(",",collect)); item.setClgk(String.join(",",collect));
} }
} }
......
src/main/resources/mybatis/zjsgfa/SjLjjwMapper.xml
...@@ -25,10 +25,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -25,10 +25,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="jdzzb" column="jdzzb" /> <result property="jdzzb" column="jdzzb" />
<result property="jdhjl" column="jdhjl" /> <result property="jdhjl" column="jdhjl" />
<result property="jdzjl" column="jdzjl" /> <result property="jdzjl" column="jdzjl" />
<result property="lb1" column="lb1" />
<result property="lb2" column="lb2" />
</resultMap> </resultMap>
<sql id="selectSjLjjwVo"> <sql id="selectSjLjjwVo">
select id, jh, ljjh, jx, wjjs, wjczjs, wzcw, kc, zjzq, wjzq, jkjl, jdjl, jkhzb, jkzzb, jkhjl, jkzjl, jdhzb, jdzzb, jdhjl, jdzjl from sj_ljjw select id, jh, ljjh, jx, wjjs, wjczjs, wzcw, kc, zjzq, wjzq, jkjl, jdjl, jkhzb, jkzzb, jkhjl, jkzjl, jdhzb, jdzzb, jdhjl, jdzjl,lb2, lb1 from sj_ljjw
</sql> </sql>
<select id="selectSjLjjwList" parameterType="SjLjjw" resultMap="SjLjjwResult"> <select id="selectSjLjjwList" parameterType="SjLjjw" resultMap="SjLjjwResult">
...@@ -83,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -83,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jdzzb != null">jdzzb,</if> <if test="jdzzb != null">jdzzb,</if>
<if test="jdhjl != null">jdhjl,</if> <if test="jdhjl != null">jdhjl,</if>
<if test="jdzjl != null">jdzjl,</if> <if test="jdzjl != null">jdzjl,</if>
<if test="lb1 != null">lb1,</if>
<if test="lb2 != null">lb2,</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>
...@@ -104,6 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -104,6 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jdzzb != null">#{jdzzb},</if> <if test="jdzzb != null">#{jdzzb},</if>
<if test="jdhjl != null">#{jdhjl},</if> <if test="jdhjl != null">#{jdhjl},</if>
<if test="jdzjl != null">#{jdzjl},</if> <if test="jdzjl != null">#{jdzjl},</if>
<if test="lb1 != null">#{lb1},</if>
<if test="lb2 != null">#{lb2},</if>
</trim> </trim>
</insert> </insert>
<insert id="insertSjLjjwBatch"> <insert id="insertSjLjjwBatch">
...@@ -112,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -112,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( (
jh, ljjh, jx, wjjs, wjczjs, wzcw, kc, zjzq, wjzq, jh, ljjh, jx, wjjs, wjczjs, wzcw, kc, zjzq, wjzq,
jkjl, jdjl, jkhzb, jkzzb, jkhjl, jkzjl, jkjl, jdjl, jkhzb, jkzzb, jkhjl, jkzjl,
jdhzb, jdzzb, jdhjl, jdzjl jdhzb, jdzzb, jdhjl, jdzjl,lb1,lb2
) )
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
...@@ -135,7 +141,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -135,7 +141,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item.jdhzb}, #{item.jdhzb},
#{item.jdzzb}, #{item.jdzzb},
#{item.jdhjl}, #{item.jdhjl},
#{item.jdzjl} #{item.jdzjl},
#{item.lb1},
#{item.lb2}
) )
</foreach> </foreach>
</insert> </insert>
...@@ -162,6 +170,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -162,6 +170,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jdzzb != null">jdzzb = #{jdzzb},</if> <if test="jdzzb != null">jdzzb = #{jdzzb},</if>
<if test="jdhjl != null">jdhjl = #{jdhjl},</if> <if test="jdhjl != null">jdhjl = #{jdhjl},</if>
<if test="jdzjl != null">jdzjl = #{jdzjl},</if> <if test="jdzjl != null">jdzjl = #{jdzjl},</if>
<if test="lb1 != null">lb1 = #{lb1},</if>
<if test="lb2 != null">lb2 = #{lb2},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
src/main/resources/mybatis/zjsgfa/SjQkztfxMapper.xml
...@@ -22,10 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -22,10 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="jxzsZw" column="jxzs_zw" /> <result property="jxzsZw" column="jxzs_zw" />
<result property="jxzsMax" column="jxzs_max" /> <result property="jxzsMax" column="jxzs_max" />
<result property="qsjsZw" column="qsjs_zw" /> <result property="qsjsZw" column="qsjs_zw" />
<result property="lb" column="lb" />
</resultMap> </resultMap>
<sql id="selectSjQkztfxVo"> <sql id="selectSjQkztfxVo">
select id, jh, kc, ztxh, cj, cc, ztsl, ytzl, etzl, stzl, sitzl, wtzl, jc_zw, jc_max, jxzs_zw, jxzs_max, qsjs_zw from sj_qkztfx select id, jh, kc, ztxh, cj, cc, ztsl, ytzl, etzl, stzl, sitzl, wtzl, jc_zw, jc_max, jxzs_zw, jxzs_max, qsjs_zw,lb from sj_qkztfx
</sql> </sql>
<select id="selectSjQkztfxList" parameterType="SjQkztfx" resultMap="SjQkztfxResult"> <select id="selectSjQkztfxList" parameterType="SjQkztfx" resultMap="SjQkztfxResult">
...@@ -47,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -47,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jxzsZw != null "> and jxzs_zw = #{jxzsZw}</if> <if test="jxzsZw != null "> and jxzs_zw = #{jxzsZw}</if>
<if test="jxzsMax != null "> and jxzs_max = #{jxzsMax}</if> <if test="jxzsMax != null "> and jxzs_max = #{jxzsMax}</if>
<if test="qsjsZw != null "> and qsjs_zw = #{qsjsZw}</if> <if test="qsjsZw != null "> and qsjs_zw = #{qsjsZw}</if>
<if test="lb != null "> and lb = #{lb}</if>
</where> </where>
</select> </select>
...@@ -74,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -74,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jxzsZw != null">jxzs_zw,</if> <if test="jxzsZw != null">jxzs_zw,</if>
<if test="jxzsMax != null">jxzs_max,</if> <if test="jxzsMax != null">jxzs_max,</if>
<if test="qsjsZw != null">qsjs_zw,</if> <if test="qsjsZw != null">qsjs_zw,</if>
<if test="lb != null">lb,</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>
...@@ -92,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -92,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jxzsZw != null">#{jxzsZw},</if> <if test="jxzsZw != null">#{jxzsZw},</if>
<if test="jxzsMax != null">#{jxzsMax},</if> <if test="jxzsMax != null">#{jxzsMax},</if>
<if test="qsjsZw != null">#{qsjsZw},</if> <if test="qsjsZw != null">#{qsjsZw},</if>
<if test="lb != null">#{lb},</if>
</trim> </trim>
</insert> </insert>
<insert id="insertSjQkztfxBatch"> <insert id="insertSjQkztfxBatch">
...@@ -99,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -99,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( (
jh, kc, ztxh, cj, cc, ztsl, jh, kc, ztxh, cj, cc, ztsl,
ytzl, etzl, stzl, sitzl, wtzl, ytzl, etzl, stzl, sitzl, wtzl,
jc_zw, jc_max, jxzs_zw, jxzs_max, qsjs_zw jc_zw, jc_max, jxzs_zw, jxzs_max, qsjs_zw,lb
) )
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
...@@ -119,7 +124,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -119,7 +124,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item.jcMax}, #{item.jcMax},
#{item.jxzsZw}, #{item.jxzsZw},
#{item.jxzsMax}, #{item.jxzsMax},
#{item.qsjsZw} #{item.qsjsZw},
#{item.lb}
) )
</foreach> </foreach>
...@@ -144,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -144,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jxzsZw != null">jxzs_zw = #{jxzsZw},</if> <if test="jxzsZw != null">jxzs_zw = #{jxzsZw},</if>
<if test="jxzsMax != null">jxzs_max = #{jxzsMax},</if> <if test="jxzsMax != null">jxzs_max = #{jxzsMax},</if>
<if test="qsjsZw != null">qsjs_zw = #{qsjsZw},</if> <if test="qsjsZw != null">qsjs_zw = #{qsjsZw},</if>
<if test="lb != null">lb = #{lb},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
src/main/resources/mybatis/zjsgfa/SjZjcsxxMapper.xml
...@@ -24,10 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -24,10 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="zjzssx" column="zjzssx" /> <result property="zjzssx" column="zjzssx" />
<result property="zjplsx" column="zjplsx" /> <result property="zjplsx" column="zjplsx" />
<result property="zjbysx" column="zjbysx" /> <result property="zjbysx" column="zjbysx" />
<result property="dy" column="dy" />
<result property="ffp" column="ffp" />
<result property="ffpcx" column="ffpcx" />
</resultMap> </resultMap>
<sql id="selectSjZjcsxxVo"> <sql id="selectSjZjcsxxVo">
select id, jh, kc, jd, ztxh, cj, cc, sy, yj, zjymd, zjzy, zjzs, zjpl, zjby, gtzj,zjzysx, zjzssx, zjplsx, zjbysx from sj_zjcsxx select id, jh, kc, jd, ztxh, cj, cc, sy, yj, zjymd, zjzy, zjzs, zjpl, zjby, gtzj,zjzysx, zjzssx, zjplsx, zjbysx, dy, ffp, ffpcx from sj_zjcsxx
</sql> </sql>
<select id="selectSjZjcsxxList" parameterType="SjZjcsxx" resultMap="SjZjcsxxResult"> <select id="selectSjZjcsxxList" parameterType="SjZjcsxx" resultMap="SjZjcsxxResult">
...@@ -80,6 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -80,6 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zjzssx != null">zjzssx,</if> <if test="zjzssx != null">zjzssx,</if>
<if test="zjplsx != null">zjplsx,</if> <if test="zjplsx != null">zjplsx,</if>
<if test="zjbysx != null">zjbysx,</if> <if test="zjbysx != null">zjbysx,</if>
<if test="dy != null">dy,</if>
<if test="ffp != null">ffp,</if>
<if test="ffpcx != null">ffpcx,</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>
...@@ -100,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -100,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zjzssx != null">#{zjzssx},</if> <if test="zjzssx != null">#{zjzssx},</if>
<if test="zjplsx != null">#{zjplsx},</if> <if test="zjplsx != null">#{zjplsx},</if>
<if test="zjbysx != null">#{zjbysx},</if> <if test="zjbysx != null">#{zjbysx},</if>
<if test="dy != null">#{dy},</if>
<if test="ffp != null">#{ffp},</if>
<if test="ffpcx != null">#{ffpcx},</if>
</trim> </trim>
</insert> </insert>
...@@ -123,7 +132,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -123,7 +132,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zjzysx != null">zjzysx = #{zjzysx},</if> <if test="zjzysx != null">zjzysx = #{zjzysx},</if>
<if test="zjzssx != null">zjzssx = #{zjzssx},</if> <if test="zjzssx != null">zjzssx = #{zjzssx},</if>
<if test="zjplsx != null">zjplsx = #{zjplsx},</if> <if test="zjplsx != null">zjplsx = #{zjplsx},</if>
<if test="zjbysx != null">zjbysx = #{zjbysx}</if> <if test="zjbysx != null">zjbysx = #{zjbysx},</if>
<if test="dy != null">dy = #{dy},</if>
<if test="ffp != null ">ffp = #{ffp},</if>
<if test="ffpcx != null ">ffpcx = #{ffpcx},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
src/main/resources/mybatis/zjsgfa/SjZtcsxxMapper.xml
...@@ -9,9 +9,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -9,9 +9,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="jh" column="jh" /> <result property="jh" column="jh" />
<result property="lb" column="lb" /> <result property="lb" column="lb" />
<result property="ztxh" column="ztxh" /> <result property="ztxh" column="ztxh" />
<result property="sy" column="sy" />
<result property="dy" column="dy" /> <result property="dy" column="dy" />
<result property="ffp" column="ffp" /> <result property="ffp" column="ffp" />
<result property="sy" column="sy" />
<result property="ffpcx" column="ffpcx" /> <result property="ffpcx" column="ffpcx" />
<result property="kc" column="kc" /> <result property="kc" column="kc" />
</resultMap> </resultMap>
......
src/main/resources/mybatis/zt/DjdcInfoMapper.xml
...@@ -618,7 +618,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -618,7 +618,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</if> </if>
)jsha )jsha
on jsha.jh=ss.jh and jsha.zzjs between ss.lag_js and ss.js on jsha.jh=ss.jh and jsha.QSJS >= ss.lag_js and jsha.ZZJS &lt;=ss.js
)ss where kc is not null and ztxh is not null )ss where kc is not null and ztxh is not null
group by ss.kc,ss.ztxh,ss.cc,ss.cj group by ss.kc,ss.ztxh,ss.cc,ss.cj
</select> </select>
...@@ -902,7 +902,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -902,7 +902,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LAG(SJDJSD2, 1, 0) OVER (PARTITION BY jh ORDER BY SJDJSD2) AS ksjs, LAG(SJDJSD2, 1, 0) OVER (PARTITION BY jh ORDER BY SJDJSD2) AS ksjs,
SJDJSD2,CW SJDJSD2,CW
FROM jsbb) c on a.JH=c.JH and NVL(a.LJCZJS,0)>=c.ksjs and NVL(a.LJCZJS,0) &lt; c.SJDJSD2 FROM jsbb) c on a.JH=c.JH and NVL(a.LJCZJS,0)>=c.ksjs and NVL(a.LJCZJS,0) &lt; c.SJDJSD2
left join jskc d on a.JH=d.jh and a.xh=d.xh left join jskc d on a.JH=d.jh and a.xjs>=d.ksjs and a.XJS &lt;d.jsjs
where 1=1 where 1=1
<if test="jhs!=null"> <if test="jhs!=null">
and a.jh in and a.jh in
...@@ -1023,6 +1023,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -1023,6 +1023,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.jkhzb - #{jkhzb} &lt; #{jl} and a.jkhzb - #{jkhzb} &lt; #{jl}
AND a.jkzzb - #{jkzzb} &lt; #{jl} AND a.jkzzb - #{jkzzb} &lt; #{jl}
and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs} and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs}
<if test="qk!=null and qk!=''">
and b.qk like CONCAT(CONCAT('%', #{qk}), '%')
</if>
order by jkjl asc order by jkjl asc
</select> </select>
<select id="getJswaSum" resultType="com.zjsgfa.project.zt.domain.vo.JswaVo"> <select id="getJswaSum" resultType="com.zjsgfa.project.zt.domain.vo.JswaVo">
......
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