Skip to content

Z
zjsgfa_mysql
Commit 71078a0e by jiang'yun
Options

修改

parent f350e075
Showing with 48 additions and 280 deletions
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java
......@@ -520,7 +520,7 @@ public class SjDjjcController extends BaseController
String sjddsd=new DataFormatter().formatCellValue( row.getCell(8));
if(StringUtils.isNotEmpty(sjddsd)){
sjDzfc.setSjddsd(Double.parseDouble(sjddsd));
sjDzfc.setSjddsd(sjddsd);
}
......@@ -538,7 +538,7 @@ public class SjDjjcController extends BaseController
String yjddsd1=new DataFormatter().formatCellValue( row.getCell(12));
if(StringUtils.isNotEmpty(yjddsd1)){
sjDzfc.setYjddsd1(Double.parseDouble(yjddsd1));
sjDzfc.setYjddsd1(yjddsd1);
}
......@@ -557,7 +557,7 @@ public class SjDjjcController extends BaseController
String yjddsd2=new DataFormatter().formatCellValue( row.getCell(16));
if(StringUtils.isNotEmpty(yjddsd2)){
sjDzfc.setYjddsd2(Double.parseDouble(yjddsd2));
sjDzfc.setYjddsd2(yjddsd2);
}
......@@ -615,13 +615,11 @@ public class SjDjjcController extends BaseController
return AjaxResult.error("井身结构表第"+(i+1)+"行套管顶深不能为空");
}
sjJsjg.setTtds(Double.parseDouble(tgds));
String tgxs=new DataFormatter().formatCellValue(row.getCell(5));
if(StringUtils.isEmpty(tgxs)){
return AjaxResult.error("井身结构表第"+(i+1)+"行套管下深不能为空");
}
sjJsjg.setTtxs(Double.parseDouble(tgxs));
String snfg=new DataFormatter().formatCellValue(row.getCell(6));
if(StringUtils.isEmpty(snfg)){
sjJsjg.setSnfg(Double.parseDouble("0"));
......@@ -632,8 +630,6 @@ public class SjDjjcController extends BaseController
sjJsjg.setBz(bz);
sjJsjgList.add(sjJsjg);
}
if(sjJsjgList.size()>0){
//先删除该井数据
sjJsjgMapper.deleteSjJsjgByJh(jh);
......
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjDzfc.java
......@@ -60,7 +60,7 @@ public class SjDzfc extends BaseEntity
/** 断点深度 */
@Excel(name = "断点深度")
private Double sjddsd;
private String sjddsd;
/** 依据井号1 */
@Excel(name = "依据井号1")
......@@ -80,7 +80,7 @@ public class SjDzfc extends BaseEntity
/** 断点深度1 */
@Excel(name = "断点深度1")
private Double yjddsd1;
private String yjddsd1;
//设计井岩性提示
private String sjyxts;
......@@ -103,7 +103,7 @@ public class SjDzfc extends BaseEntity
/** 断点深度2 */
@Excel(name = "断点深度2")
private Double yjddsd2;
private String yjddsd2;
/** 创建人 */
@Excel(name = "创建人")
......@@ -126,264 +126,4 @@ public class SjDzfc extends BaseEntity
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setDcJ(String dcJ)
{
this.dcJ = dcJ;
}
public String getDcJ()
{
return dcJ;
}
public void setDcX(String dcX)
{
this.dcX = dcX;
}
public String getDcX()
{
return dcX;
}
public void setDcT(String dcT)
{
this.dcT = dcT;
}
public String getDcT()
{
return dcT;
}
public void setDcZ(String dcZ)
{
this.dcZ = dcZ;
}
public String getDcZ()
{
return dcZ;
}
public void setDcD(String dcD)
{
this.dcD = dcD;
}
public String getDcD()
{
return dcD;
}
public void setSjjh(String sjjh)
{
this.sjjh = sjjh;
}
public String getSjjh()
{
return sjjh;
}
public void setSjdcs(Double sjdcs)
{
this.sjdcs = sjdcs;
}
public Double getSjdcs()
{
return sjdcs;
}
public void setSjjcgx(String sjjcgx)
{
this.sjjcgx = sjjcgx;
}
public String getSjjcgx()
{
return sjjcgx;
}
public void setSjhd(Double sjhd)
{
this.sjhd = sjhd;
}
public Double getSjhd()
{
return sjhd;
}
public void setSjddsd(Double sjddsd)
{
this.sjddsd = sjddsd;
}
public Double getSjddsd()
{
return sjddsd;
}
public void setYjjh1(String yjjh1)
{
this.yjjh1 = yjjh1;
}
public String getYjjh1()
{
return yjjh1;
}
public void setYjdcs1(Double yjdcs1)
{
this.yjdcs1 = yjdcs1;
}
public Double getYjdcs1()
{
return yjdcs1;
}
public void setYjjcgx1(String yjjcgx1)
{
this.yjjcgx1 = yjjcgx1;
}
public String getYjjcgx1()
{
return yjjcgx1;
}
public void setYjhyjd1(String yjhyjd1)
{
this.yjhyjd1 = yjhyjd1;
}
public String getYjhyjd1()
{
return yjhyjd1;
}
public void setYjddsd1(Double yjddsd1)
{
this.yjddsd1 = yjddsd1;
}
public Double getYjddsd1()
{
return yjddsd1;
}
public void setYjjh2(String yjjh2)
{
this.yjjh2 = yjjh2;
}
public String getYjjh2()
{
return yjjh2;
}
public void setYjdcs2(Double yjdcs2)
{
this.yjdcs2 = yjdcs2;
}
public Double getYjdcs2()
{
return yjdcs2;
}
public void setYjjcgx2(String yjjcgx2)
{
this.yjjcgx2 = yjjcgx2;
}
public String getYjjcgx2()
{
return yjjcgx2;
}
public void setYjhyjd2(String yjhyjd2)
{
this.yjhyjd2 = yjhyjd2;
}
public String getYjhyjd2()
{
return yjhyjd2;
}
public void setYjddsd2(Double yjddsd2)
{
this.yjddsd2 = yjddsd2;
}
public Double getYjddsd2()
{
return yjddsd2;
}
public void setCreatedBy(String createdBy)
{
this.createdBy = createdBy;
}
public String getCreatedBy()
{
return createdBy;
}
public void setCreatedTime(Date createdTime)
{
this.createdTime = createdTime;
}
public Date getCreatedTime()
{
return createdTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("dcJ", getDcJ())
.append("dcX", getDcX())
.append("dcT", getDcT())
.append("dcZ", getDcZ())
.append("dcD", getDcD())
.append("sjjh", getSjjh())
.append("sjdcs", getSjdcs())
.append("sjjcgx", getSjjcgx())
.append("sjhd", getSjhd())
.append("sjddsd", getSjddsd())
.append("yjjh1", getYjjh1())
.append("yjdcs1", getYjdcs1())
.append("yjjcgx1", getYjjcgx1())
.append("yjhyjd1", getYjhyjd1())
.append("yjddsd1", getYjddsd1())
.append("yjjh2", getYjjh2())
.append("yjdcs2", getYjdcs2())
.append("yjjcgx2", getYjjcgx2())
.append("yjhyjd2", getYjhyjd2())
.append("yjddsd2", getYjddsd2())
.append("createdBy", getCreatedBy())
.append("createdTime", getCreatedTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}
src/main/java/com/zjsgfa/project/zjsgfa/util/CxszhUtil.java
......@@ -43,7 +43,11 @@ public class CxszhUtil {
}
if(cs==0){
return Double.parseDouble(df.format(js));
}else {
return Double.parseDouble(df.format(cs));
}
return Double.parseDouble(df.format(cs));
}
}
src/main/java/com/zjsgfa/project/zt/service/impl/DjdcServiceImpl.java
......@@ -1641,6 +1641,13 @@ public class DjdcServiceImpl implements DjdcService {
String dcD = item.getDcD();
if (StringUtils.isEmpty(dcD)) {
dcD = item.getDcZ();
}else {
dcD=dcD.trim();
if (StringUtils.isEmpty(dcD)) {
dcD = item.getDcZ();
}else {
dcD=dcD.trim();
}
}
final String dc=dcD;
ljDzfc.setDzfc(dc);
......@@ -1648,7 +1655,8 @@ public class DjdcServiceImpl implements DjdcService {
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){
ljDzfc.setYxts(String.join( ",",yxts));
String join = String.join(",", yxts.stream().distinct().collect(Collectors.toList()));
ljDzfc.setYxts(String.join(",",Arrays.stream(join.split(",")).distinct().collect(Collectors.toList())));
//查询特殊岩性
commonParam.setDc(dc);
List<LjDcyx> dcyxList2 = ljQueryMapper.getDcyxList2(commonParam);
......@@ -1656,11 +1664,14 @@ public class DjdcServiceImpl implements DjdcService {
List<LjDcyx> ljDcyxes1=new ArrayList<>();
for(LjDcyx ljDcyx:dcyxList2){
for(Tsyxclxx tsyxclxx:tsyxclxxes){
if(ljDcyx.getYxmc().contains(tsyxclxx.getTsyx())){
collect.add(tsyxclxx.getWt());
ljDcyx.setWt(tsyxclxx.getWt());
ljDcyxes1.add(ljDcyx);
if(StringUtils.isNotEmpty(ljDcyx.getYxmc())){
if(ljDcyx.getYxmc().contains(tsyxclxx.getTsyx())){
collect.add(tsyxclxx.getWt());
ljDcyx.setWt(tsyxclxx.getWt());
ljDcyxes1.add(ljDcyx);
}
}
}
}
......@@ -1696,7 +1707,8 @@ public class DjdcServiceImpl implements DjdcService {
}
}
if(yqcts.size()>0){
ljDzfc.setYqsts(String.join( ",",yqcts));
String join = String.join(",", yqcts.stream().distinct().collect(Collectors.toList()));
ljDzfc.setYqsts(String.join(",",Arrays.stream(join.split(",")).distinct().collect(Collectors.toList())));
}else {
ljDzfc.setYqsts("无");
}
......@@ -1726,10 +1738,24 @@ public class DjdcServiceImpl implements DjdcService {
//最后构造
for (SjDzfc item : sjDzfcs) {
if(item.getSjdcs()==null){
continue;
}else {
}
String dcD = item.getDcD();
if (StringUtils.isEmpty(dcD)) {
dcD = item.getDcZ();
}else {
dcD=dcD.trim();
if (StringUtils.isEmpty(dcD)) {
dcD = item.getDcZ();
}else {
dcD=dcD.trim();
}
}
final String dc=dcD;
SjDcfxDzfc ljDzfc =new SjDcfxDzfc();
ljDzfc.setJh(param.getJh());
......@@ -1737,10 +1763,11 @@ public class DjdcServiceImpl implements DjdcService {
ljDzfc.setDzfc(dc);
List<String> collect = dzgzzbs.stream().filter(dzgzzb -> dzgzzb.getDzfc().equals(dc)).map(dzgzzb -> StringUtils.isNotEmpty(dzgzzb.getZyyx()) ? dzgzzb.getZyyx().replaceAll("、", ",") : "").collect(Collectors.toList());
if(collect.size()>0){
ljDzfc.setYxts(String.join( ",",collect));
String join = String.join(",", collect.stream().distinct().collect(Collectors.toList()));
ljDzfc.setYxts(String.join(",",Arrays.stream(join.split(",")).distinct().collect(Collectors.toList())));
List<String> tsyx = tsyxclxxes.stream().filter(tsyxclxx -> tsyxclxx.getTsyx().indexOf(ljDzfc.getYxts()) != -1).map(Tsyxclxx::getWt).collect(Collectors.toList());
if(tsyx.size()>0){
ljDzfc.setGzts(String.join( ",",tsyx));
ljDzfc.setGzts(String.join( ",",tsyx.stream().distinct().collect(Collectors.toList())));
}
}
//计算斜深
......@@ -1771,7 +1798,8 @@ public class DjdcServiceImpl implements DjdcService {
String dc = sjDcfxDzfc.getDzfc();
List<String> collect = dzgzzbs.stream().filter(dzgzzb -> dzgzzb.getDzfc().equals(dc)).map(dzgzzb -> StringUtils.isNotEmpty(dzgzzb.getZyyx()) ? dzgzzb.getZyyx().replaceAll("、", ",") : "").collect(Collectors.toList());
if(collect.size()>0){
sjDcfxDzfc.setYxts(String.join( ",",collect));
sjDcfxDzfc.setYxts(String.join( ",",collect.stream().distinct().collect(Collectors.toList())));
List<String> tsyx = tsyxclxxes.stream().filter(tsyxclxx -> tsyxclxx.getTsyx().contains(sjDcfxDzfc.getYxts())).map(Tsyxclxx::getWt).collect(Collectors.toList());
if(tsyx.size()>0){
sjDcfxDzfc.setGzts(String.join( ",",tsyx));
......
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