Skip to content

Z
zjsgfa_mysql
Commit fad77451 by jiang'yun
Options

修改

parent 3905d588
Showing with 66 additions and 46 deletions
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java
......@@ -2172,7 +2172,7 @@ public class SjDjjcController extends BaseController
Long id = sjDjjc.getId();
SjDjjc sjDjjcnew=sjDjjcService.selectSjDjjcById(id);
String outPath=RuoYiConfig.getUploadPath()+"/jxh/XYL217X52.xlsx";
String outPath=RuoYiConfig.getUploadPath()+"/jxh/XYL217X76.xlsx";
System.out.println("解析后存放的路径"+outPath);
File testFile = new File(outPath);
MultipartFile multipartFile = FileToMultipartFileConverter.convert(testFile);
......@@ -2879,44 +2879,53 @@ public class SjDjjcController extends BaseController
jh=info.get("jh")+"";
String zjdmc=info.get("zjdmc")+"";
String qk=info.get("qk")+"";
if(StringUtils.isEmpty(jh)){
return AjaxResult.success("未识别到相关信息！");
}
// if(StringUtils.isEmpty(jh)){
//
// }
jh="梁217-斜76";
// if(StringUtils.isEmpty(qk)){
//
// }
qk="小营";
// if(StringUtils.isEmpty(zjdmc)){
//
// }
zjdmc="40569SL";
//查询钻井队
List<JcxxJdxx> jcxxJdxxes = jcxxJdxxMapper.selectJcxxJdxxList(new JcxxJdxx());
JcxxJdxx jcxxJdxx1 = jcxxJdxxes.stream().filter(jcxxJdxx -> jcxxJdxx.getZjjd().equals(zjdmc)).findFirst().orElse(null);
JcxxJdxx jcxxJdxx=new JcxxJdxx();
if(jcxxJdxx1==null){
jcxxJdxx = jcxxJdxxes.get(0);
}else {
jcxxJdxx=jcxxJdxx1;
}
SjDjjc sjDjjc=new SjDjjc();
sjDjjc.setJh(jh);
sjDjjc.setQk(qk);
sjDjjc.setZjd(jcxxJdxx.getId()+"");
//查询方案
List<Sgfamb> sgfambList = sgfambService.selectSgfambList(new Sgfamb());
Sgfamb sgfamb = sgfambList.stream().filter(sg -> sg.getMbmc().startsWith("梁217-斜25")).findFirst().orElse(null);
Sgfamb sgfamb1 =new Sgfamb();
if(sgfamb==null){
sgfamb1=sgfambList.get(0);
}else {
sgfamb1=sgfamb;
}
sjDjjc.setFaid(sgfamb1.getId());
int i = sjDjjcService.insertSjDjjc(sjDjjc);
if(i==3){
// List<JcxxJdxx> jcxxJdxxes = jcxxJdxxMapper.selectJcxxJdxxList(new JcxxJdxx());
// JcxxJdxx jcxxJdxx1 = jcxxJdxxes.stream().filter(jcxxJdxx -> jcxxJdxx.getZjjd().equals("40569SL")).findFirst().orElse(null);
// JcxxJdxx jcxxJdxx=new JcxxJdxx();
// if(jcxxJdxx1==null){
// jcxxJdxx = jcxxJdxxes.get(0);
// }else {
// jcxxJdxx=jcxxJdxx1;
// }
// SjDjjc sjDjjc=new SjDjjc();
// sjDjjc.setJh(jh);
// sjDjjc.setQk(qk);
// sjDjjc.setZjd(jcxxJdxx.getId()+"");
// //查询方案
// List<Sgfamb> sgfambList = sgfambService.selectSgfambList(new Sgfamb());
// Sgfamb sgfamb = sgfambList.stream().filter(sg -> sg.getMbmc().startsWith("梁217")).findFirst().orElse(null);
// Sgfamb sgfamb1 =new Sgfamb();
// if(sgfamb==null){
// sgfamb1=sgfambList.get(0);
// }else {
// sgfamb1=sgfamb;
// }
// sjDjjc.setFaid(5L);
// int i = sjDjjcService.insertSjDjjc(sjDjjc);
// if(i==3){
//说明已有该井直接跳转
SjDjjc sjDjjc1 =sjDjjcMapper.selectSjDjjcByJh(jh);
url="/designInformation/sjDesign?id="+sjDjjc1.getId()+"&jh="+jh+"&jkhzb="+sjDjjc1.getJkhzb()+"&jkzzb="+sjDjjc1.getJkzzb()+"&jdhzb="+sjDjjc1.getJdhzb()+"&jdzzb="+sjDjjc1.getJdzzb()+"&qk="+qk+"&faid="+sgfamb1.getId();
url="/designInformation/sjDesign?id="+sjDjjc1.getId()+"&jh="+jh+"&jkhzb="+sjDjjc1.getJkhzb()+"&jkzzb="+sjDjjc1.getJkzzb()+"&jdhzb="+sjDjjc1.getJdhzb()+"&jdzzb="+sjDjjc1.getJdzzb()+"&qk="+qk+"&faid="+5;
res="查看【<el-button type='primary' class='btnclass' style='color: #4848ea;background-color: white' @click=tzym('"+url+"',"+jh+")>"+jh+"施工方案</el-button>】";
return AjaxResult.success(res);
}
jxdzzl2(sjDjjc);
SjDjjc sjDjjc1 = sjDjjcService.selectSjDjjcById(sjDjjc.getId());
url="/designInformation/sjDesign?id="+sjDjjc1.getId()+"&jh="+jh+"&jkhzb="+sjDjjc1.getJkhzb()+"&jkzzb="+sjDjjc1.getJkzzb()+"&jdhzb="+sjDjjc1.getJdhzb()+"&jdzzb="+sjDjjc1.getJdzzb()+"&qk="+qk+"&faid="+sgfamb1.getId();
res="查看【<el-button type='primary' class='btnclass' style='color: #4848ea;background-color: white' @click=tzym('"+url+"',"+jh+")>"+jh+"施工方案</el-button>】";
// }
// jxdzzl2(sjDjjc);
// SjDjjc sjDjjc1 = sjDjjcService.selectSjDjjcById(sjDjjc.getId());
// url="/designInformation/sjDesign?id="+sjDjjc1.getId()+"&jh="+jh+"&jkhzb="+sjDjjc1.getJkhzb()+"&jkzzb="+sjDjjc1.getJkzzb()+"&jdhzb="+sjDjjc1.getJdhzb()+"&jdzzb="+sjDjjc1.getJdzzb()+"&qk="+qk+"&faid="+sgfamb1.getId();
// res="查看【<el-button type='primary' class='btnclass' style='color: #4848ea;background-color: white' @click=tzym('"+url+"',"+jh+")>"+jh+"施工方案</el-button>】";
}
reMap.put("res",res);
reMap.put("url",url);
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjDjjcServiceImpl.java
......@@ -980,7 +980,7 @@ public class SjDjjcServiceImpl implements ISjDjjcService
if(sjZjcsxxes.size()>0){
SjZjcsxx sjZjcsxx1 = sjZjcsxxes.get(0);
sjZjcsxx1.setZtxh(jczg.getZyjy());
sjZjcsxxMapper.updateSjZjcsxx(sjZjcsxx1);
// sjZjcsxxMapper.updateSjZjcsxx(sjZjcsxx1);
}
}
......@@ -1037,7 +1037,9 @@ public class SjDjjcServiceImpl implements ISjDjjcService
SjSggyZjzhcs sjSggyZjzhcs1 = sjSggyZjzhcsMapper.selectSjSggyZjzhcsByZjzhcs(sjSggyZjzhcs);
if(sjSggyZjzhcs1!=null){
sjSggyZjzhcs1.setJd(ksjs+"-"+sjJsjg1.getJs());
sjSggyZjzhcs1.setZtxh(jczg.getZyjy());
if(jczg!=null){
sjSggyZjzhcs1.setZtxh(jczg.getZyjy());
}
sjSggyZjzhcsMapper.updateSjSggyZjzhcs(sjSggyZjzhcs1);
}
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFdsgcsServiceImpl.java
......@@ -151,9 +151,9 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
sjFdsgcs2.forEach(item->{
if(StringUtils.isNotEmpty(item.getGjyh())){
if(item.getKc().equals(sjFdsgcs.getKc())){
strs.add("<p>"+item.getKc()+"</p>:"+s);
strs.add("<p>"+item.getKc()+"</p>"+s);
}else {
strs.add("<p>"+item.getKc()+"</p>:"+item.getGjyh());
strs.add("<p>"+item.getKc()+"</p>"+item.getGjyh());
}
}
});
......@@ -457,12 +457,13 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
if(sjFdsgcs1==null){
List<String> collectfz = sjLjjwList.stream().filter(it->"附近复杂故障井".equals(it.getLb1())).map(SjLjjw::getLjjh).collect(Collectors.toList());
//查询是否有复杂情况
if(collect.size()>0){
if(collectfz.size()>0){
Jsqa jsqa= new Jsqa();
jsqa.setJhs(collect);
jsqa.setJs(sjJsjg1.getJs());
jsqa.setJhs(collectfz);
// jsqa.setJs(sjJsjg1.getJs());
List<Jsqa> jsqaList=jsqaMapper.getJsqaByjhAndJs(jsqa);
String zjycs="";
String zjgccs="";
......@@ -548,14 +549,19 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
}
sjFdsgcs.setGjfx(gjyh);
sjFdsgcs.setDcyl(dcyl);
if("一开".equals(kc)){
sjFdsgcs.setLjfzqk("无");
}
sjFdsgcsMapper.insertSjFdsgcs(sjFdsgcs);
}else {
sjFdsgcs1.setGjfx(gjyh);
List<String> collectfz = sjLjjwList.stream().filter(it->"附近复杂故障井".equals(it.getLb1())).map(SjLjjw::getLjjh).collect(Collectors.toList());
//查询是否有复杂情况
if(collect.size()>0){
if(collectfz.size()>0){
Jsqa jsqa= new Jsqa();
jsqa.setJhs(collect);
jsqa.setJs(sjJsjg1.getJs());
jsqa.setJhs(collectfz);
// jsqa.setJs(sjJsjg1.getJs());
List<Jsqa> jsqaList=jsqaMapper.getJsqaByjhAndJs(jsqa);
String zjycs="";
String zjgccs="";
......@@ -660,6 +666,9 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
}
}
sjFdsgcs1.setDcyl(dcyl);
if("一开".equals(kc)){
sjFdsgcs1.setLjfzqk("无");
}
sjFdsgcsMapper.updateSjFdsgcs(sjFdsgcs1);
}
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjJygjGdsjgdcsServiceImpl.java
......@@ -194,7 +194,7 @@ public class SjJygjGdsjgdcsServiceImpl implements ISjJygjGdsjgdcsService
maxcs= gjlist.stream().map(SjJygjGdsjgdcs::getCs).max(Double::compare).get();
maxnb= gjlist.stream().map(SjJygjGdsjgdcs::getNbwy).max(Double::compare).get();
minnb= gjlist.stream().map(SjJygjGdsjgdcs::getNbwy).min(Double::compare).get();
maxdx= gjlist.stream().map(SjJygjGdsjgdcs::getDxwy).max(Double::compare).get();
maxdx= gjlist.stream().map(SjJygjGdsjgdcs::getDxwy).max(Double::compare).get()+2000;
mindx= gjlist.stream().map(SjJygjGdsjgdcs::getDxwy).min(Double::compare).get();
for(int i=0;i<gjlist.size();i++){
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjZjcsxxServiceImpl.java
......@@ -91,7 +91,7 @@ public class SjZjcsxxServiceImpl implements ISjZjcsxxService
String jd ="";
for(int i=0;i<sjJsjgList.size();i++) {
SjJsjg sjJsjg1 = sjJsjgList.get(i);
if(sjZjcsxx.getKc().equals(sjZjcsxx.getKc())){
if(sjJsjg1.getKc().equals(sjZjcsxx.getKc())){
if (i == 0) {
ksjs = 0;
} else {
......
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