Skip to content

Z
zjsgfa_mysql
Commit c80cf2be by jiang'yun
Options

修改

parent a10754fc
Showing with 26 additions and 33 deletions
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java
...@@ -471,10 +471,10 @@ public class SjDjjcController extends BaseController ...@@ -471,10 +471,10 @@ public class SjDjjcController extends BaseController
info.setWzyz(wzyz); info.setWzyz(wzyz);
String wjff=new DataFormatter().formatCellValue(row.getCell(12)); String wjff=new DataFormatter().formatCellValue(row.getCell(12));
info.setWjfa(wjff); info.setWjfa(wjff);
String zjgs=new DataFormatter().formatCellValue(row.getCell(13)); // String zjgs=new DataFormatter().formatCellValue(row.getCell(13));
info.setZjgs(zjgs); // info.setZjgs(zjgs);
String zjd=new DataFormatter().formatCellValue(row.getCell(14)); // String zjd=new DataFormatter().formatCellValue(row.getCell(14));
info.setZjd(zjd); // info.setZjd(zjd);
info.setFaid(sjDjjc1.getFaid()); info.setFaid(sjDjjc1.getFaid());
sjDjjcService.updateSjDjjc(info); sjDjjcService.updateSjDjjc(info);
} }
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjDjjcServiceImpl.java
...@@ -113,6 +113,12 @@ public class SjDjjcServiceImpl implements ISjDjjcService ...@@ -113,6 +113,12 @@ public class SjDjjcServiceImpl implements ISjDjjcService
@Autowired @Autowired
private SjZtcsxxMapper sjZtcsxxMapper; private SjZtcsxxMapper sjZtcsxxMapper;
@Autowired
private JcxxJdxxMapper jcxxJdxxMapper;
@Autowired
private SjFlMapper sjFlMapper;
...@@ -157,17 +163,22 @@ public class SjDjjcServiceImpl implements ISjDjjcService ...@@ -157,17 +163,22 @@ public class SjDjjcServiceImpl implements ISjDjjcService
return 3; return 3;
} }
sjDjjc.setCreatedBy(SecurityUtils.getUsername()); sjDjjc.setCreatedBy(SecurityUtils.getUsername());
int i = sjDjjcMapper.insertSjDjjc(sjDjjc);
//施工概要 //施工概要
SjSggyGjsbxnyq sjSggyGjsbxnyq = new SjSggyGjsbxnyq(); SjSggyGjsbxnyq sjSggyGjsbxnyq = new SjSggyGjsbxnyq();
sjSggyGjsbxnyq.setJh(sjDjjc.getJh()); sjSggyGjsbxnyq.setJh(sjDjjc.getJh());
sjSggyGjsbxnyqMapper.insertSjSggyGjsbxnyq2(sjSggyGjsbxnyq); if(StringUtils.isNotEmpty(sjDjjc.getZjd())){
List<String> sjggjyh= new ArrayList<>(); JcxxJdxx jcxxJdxx = jcxxJdxxMapper.selectJcxxJdxxById(Long.parseLong(sjDjjc.getZjd()));
sjDjjc.setZjgs(jcxxJdxx.getZjgs());
//匹配高指标井 SjFl sjFl=new SjFl();
sjFl.setJh(sjDjjc1.getJh());
sjFl.setCreatedBy(SecurityUtils.getUsername());
sjFl.setYjlxfs(jcxxJdxx.getYjlxr());
sjFlMapper.insertSjFl(sjFl);
BeanUtils.copyProperties(jcxxJdxx,sjSggyGjsbxnyq);
}
int i = sjDjjcMapper.insertSjDjjc(sjDjjc);
List<String> sjggjyh= new ArrayList<>();
//根据方案id查询 //根据方案id查询
...@@ -379,7 +390,7 @@ public class SjDjjcServiceImpl implements ISjDjjcService ...@@ -379,7 +390,7 @@ public class SjDjjcServiceImpl implements ISjDjjcService
} }
} }
sjSggyGjsbxnyq.setSjyh(String.join("；", sjggjyh)); sjSggyGjsbxnyq.setSjyh(String.join("；", sjggjyh));
sjSggyGjsbxnyqMapper.updateSjSggyGjsbxnyqByjh(sjSggyGjsbxnyq); sjSggyGjsbxnyqMapper.insertSjSggyGjsbxnyq(sjSggyGjsbxnyq);
//井口装置 //井口装置
...@@ -449,22 +460,10 @@ public class SjDjjcServiceImpl implements ISjDjjcService ...@@ -449,22 +460,10 @@ public class SjDjjcServiceImpl implements ISjDjjcService
{ {
sjDjjc.setUpdateTime(DateUtils.getNowDate()); sjDjjc.setUpdateTime(DateUtils.getNowDate());
sjDjjc.setUpdateBy(SecurityUtils.getUsername()); sjDjjc.setUpdateBy(SecurityUtils.getUsername());
//施工概要
SjSggyGjsbxnyq sjSggyGjsbxnyq = new SjSggyGjsbxnyq();
sjSggyGjsbxnyq.setJh(sjDjjc.getJh());
sjSggyGjsbxnyqMapper.insertSjSggyGjsbxnyq2(sjSggyGjsbxnyq);
List<String> sjggjyh= new ArrayList<>(); List<String> sjggjyh= new ArrayList<>();
List<SgfambKcSggy> sgfambKcSggyList=sgfambKcSggyMapper.selectSgfambKcSggyListByQk(new SgfambKcSggy()); List<SgfambKcSggy> sgfambKcSggyList=sgfambKcSggyMapper.selectSgfambKcSggyListByQk(new SgfambKcSggy());
List<SgfambKcSggy> collect = sgfambKcSggyList.stream().filter(sgfambKcSggy -> sgfambKcSggy.getZbid().toString().equals(sjDjjc.getFaid().toString())).collect(Collectors.toList()); List<SgfambKcSggy> collect = sgfambKcSggyList.stream().filter(sgfambKcSggy -> sgfambKcSggy.getZbid().toString().equals(sjDjjc.getFaid().toString())).collect(Collectors.toList());
// if(collect.size()==0){
// Map<String, List<SgfambKcSggy>> groupedByQk = sgfambKcSggyList.stream()
// .collect(Collectors.groupingBy(SgfambKcSggy::getQk));
// for(String s:groupedByQk.keySet()){
// collect=groupedByQk.get(s);
// break;
// }
// }
for (SgfambKcSggy sgfambKcSggy : collect) { for (SgfambKcSggy sgfambKcSggy : collect) {
if (sgfambKcSggy != null) { if (sgfambKcSggy != null) {
String gjyhxx=sgfambKcSggy.getKc()+"轨迹优化，"+sgfambKcSggy.getGjyh(); String gjyhxx=sgfambKcSggy.getKc()+"轨迹优化，"+sgfambKcSggy.getGjyh();
...@@ -655,12 +654,6 @@ public class SjDjjcServiceImpl implements ISjDjjcService ...@@ -655,12 +654,6 @@ public class SjDjjcServiceImpl implements ISjDjjcService
} }
sjSggyGjsbxnyq.setSjyh(String.join("；", sjggjyh));
sjSggyGjsbxnyqMapper.updateSjSggyGjsbxnyqByjh(sjSggyGjsbxnyq);
return sjDjjcMapper.updateSjDjjc(sjDjjc); return sjDjjcMapper.updateSjDjjc(sjDjjc);
} }
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFdsgcsServiceImpl.java
...@@ -285,7 +285,7 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -285,7 +285,7 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
} }
//获取所有井的造斜规律数据 //获取所有井的造斜规律数据
List<Jskd> jskdList = new ArrayList<>(); List<Jskd> jskdList = new ArrayList<>();
List<DjZqsjfx> djZqsjfxList=null; List<DjZqsjfx> djZqsjfxList=new ArrayList<>();
///如果邻井不为空，则进行造斜率的数据封装 ///如果邻井不为空，则进行造斜率的数据封装
if (sjLjjwList.size() > 0) { if (sjLjjwList.size() > 0) {
Object djdcinfo; Object djdcinfo;
...@@ -313,7 +313,7 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -313,7 +313,7 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
} }
String gjyh=""; String gjyh="";
/////查询符合开次的测斜数据 /////查询符合开次的测斜数据
if(djZqsjfxList!=null){ if(djZqsjfxList.size()>0){
List<Jskd> jskdList_kc =new ArrayList<>(); List<Jskd> jskdList_kc =new ArrayList<>();
double ksjs=0.0; double ksjs=0.0;
if (i==0){ if (i==0){
......
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