From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/entity/bs/SsurveyinformationEntity.java | 329 ++++++++++++++++++++----------------------------------
1 files changed, 120 insertions(+), 209 deletions(-)
diff --git a/src/main/java/com/lf/server/entity/bs/SsurveyinformationEntity.java b/src/main/java/com/lf/server/entity/bs/SsurveyinformationEntity.java
index 64ec62b..1140454 100644
--- a/src/main/java/com/lf/server/entity/bs/SsurveyinformationEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/SsurveyinformationEntity.java
@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.time.LocalDate;
/**
* Ssurveyinformation
@@ -17,21 +18,13 @@
@TableName("bs.s_survey_information")
@EqualsAndHashCode(callSuper = false)
public class SsurveyinformationEntity extends BaseEntity {
- private static final long serialVersionUID = 651724262000864512L;
+ private static final long serialVersionUID = 801105564833202176L;
private String segname;
private String projname;
private String pipename;
-
- private String belongs;
-
- private String belongsid;
-
- private String datastatus;
-
- private String remarks;
private String location;
@@ -45,11 +38,9 @@
private String minmtempe;
- private String frosoildep;
-
private String sintensity;
- private BigDecimal seismic;
+ private String seismic;
private String dsgrouping;
@@ -57,57 +48,31 @@
private String seisection;
- private String groughness;
-
private String lipindex;
private String lipgrade;
private String ssossoil;
- private BigDecimal gwatdepth;
+ private String gwattype;
+
+ private String gwatdepth;
private String amplitude;
- private BigDecimal waterelev;
+ private String waterelev;
private String gradeosw;
- private String mediumosw;
-
private String gradeoswsb;
-
- private String mediuoswsb;
private String gradeosws;
- private String mediumosws;
-
- private String gradeogw;
-
- private String mediumogw;
-
- private String gradeogwsb;
-
- private String mediuogwsb;
-
- private String gradeogws;
-
- private String mediumogws;
-
private String gradeos;
-
- private String mediumos;
private String gradeossb;
- private String mediumossb;
-
private String gradeoss;
-
- private String mediumoss;
-
- private String valuation;
private String thawgrade;
@@ -115,7 +80,11 @@
private String fsoiltype;
- private BigDecimal upperlimit;
+ private String upperlimit;
+
+ private String fsoilgroup;
+
+ private String frosoildep;
private String frostheave;
@@ -145,9 +114,13 @@
private String saltexp;
+ private String othersoil;
+
private String abnburying;
private String profile;
+
+ private String agdesc;
private String uniformity;
@@ -155,9 +128,9 @@
private String strdepth;
- private BigDecimal bearingcap;
+ private String bearingcap;
- private BigDecimal commodulus;
+ private String commodulus;
private String schemesugg;
@@ -168,6 +141,16 @@
private String version;
private String datastage;
+
+ private String belongs;
+
+ private String belongsid;
+
+ private String datastatus;
+
+ private String remarks;
+
+ private String workname;
public SsurveyinformationEntity() {
}
@@ -194,38 +177,6 @@
public void setPipename(String pipename) {
this.pipename = pipename;
- }
-
- public String getBelongs() {
- return belongs;
- }
-
- public void setBelongs(String belongs) {
- this.belongs = belongs;
- }
-
- public String getBelongsid() {
- return belongsid;
- }
-
- public void setBelongsid(String belongsid) {
- this.belongsid = belongsid;
- }
-
- public String getDatastatus() {
- return datastatus;
- }
-
- public void setDatastatus(String datastatus) {
- this.datastatus = datastatus;
- }
-
- public String getRemarks() {
- return remarks;
- }
-
- public void setRemarks(String remarks) {
- this.remarks = remarks;
}
public String getLocation() {
@@ -276,14 +227,6 @@
this.minmtempe = minmtempe;
}
- public String getFrosoildep() {
- return frosoildep;
- }
-
- public void setFrosoildep(String frosoildep) {
- this.frosoildep = frosoildep;
- }
-
public String getSintensity() {
return sintensity;
}
@@ -292,11 +235,11 @@
this.sintensity = sintensity;
}
- public BigDecimal getSeismic() {
+ public String getSeismic() {
return seismic;
}
- public void setSeismic(BigDecimal seismic) {
+ public void setSeismic(String seismic) {
this.seismic = seismic;
}
@@ -324,14 +267,6 @@
this.seisection = seisection;
}
- public String getGroughness() {
- return groughness;
- }
-
- public void setGroughness(String groughness) {
- this.groughness = groughness;
- }
-
public String getLipindex() {
return lipindex;
}
@@ -356,11 +291,19 @@
this.ssossoil = ssossoil;
}
- public BigDecimal getGwatdepth() {
+ public String getGwattype() {
+ return gwattype;
+ }
+
+ public void setGwattype(String gwattype) {
+ this.gwattype = gwattype;
+ }
+
+ public String getGwatdepth() {
return gwatdepth;
}
- public void setGwatdepth(BigDecimal gwatdepth) {
+ public void setGwatdepth(String gwatdepth) {
this.gwatdepth = gwatdepth;
}
@@ -372,11 +315,11 @@
this.amplitude = amplitude;
}
- public BigDecimal getWaterelev() {
+ public String getWaterelev() {
return waterelev;
}
- public void setWaterelev(BigDecimal waterelev) {
+ public void setWaterelev(String waterelev) {
this.waterelev = waterelev;
}
@@ -388,28 +331,12 @@
this.gradeosw = gradeosw;
}
- public String getMediumosw() {
- return mediumosw;
- }
-
- public void setMediumosw(String mediumosw) {
- this.mediumosw = mediumosw;
- }
-
public String getGradeoswsb() {
return gradeoswsb;
}
public void setGradeoswsb(String gradeoswsb) {
this.gradeoswsb = gradeoswsb;
- }
-
- public String getMediuoswsb() {
- return mediuoswsb;
- }
-
- public void setMediuoswsb(String mediuoswsb) {
- this.mediuoswsb = mediuoswsb;
}
public String getGradeosws() {
@@ -420,76 +347,12 @@
this.gradeosws = gradeosws;
}
- public String getMediumosws() {
- return mediumosws;
- }
-
- public void setMediumosws(String mediumosws) {
- this.mediumosws = mediumosws;
- }
-
- public String getGradeogw() {
- return gradeogw;
- }
-
- public void setGradeogw(String gradeogw) {
- this.gradeogw = gradeogw;
- }
-
- public String getMediumogw() {
- return mediumogw;
- }
-
- public void setMediumogw(String mediumogw) {
- this.mediumogw = mediumogw;
- }
-
- public String getGradeogwsb() {
- return gradeogwsb;
- }
-
- public void setGradeogwsb(String gradeogwsb) {
- this.gradeogwsb = gradeogwsb;
- }
-
- public String getMediuogwsb() {
- return mediuogwsb;
- }
-
- public void setMediuogwsb(String mediuogwsb) {
- this.mediuogwsb = mediuogwsb;
- }
-
- public String getGradeogws() {
- return gradeogws;
- }
-
- public void setGradeogws(String gradeogws) {
- this.gradeogws = gradeogws;
- }
-
- public String getMediumogws() {
- return mediumogws;
- }
-
- public void setMediumogws(String mediumogws) {
- this.mediumogws = mediumogws;
- }
-
public String getGradeos() {
return gradeos;
}
public void setGradeos(String gradeos) {
this.gradeos = gradeos;
- }
-
- public String getMediumos() {
- return mediumos;
- }
-
- public void setMediumos(String mediumos) {
- this.mediumos = mediumos;
}
public String getGradeossb() {
@@ -500,36 +363,12 @@
this.gradeossb = gradeossb;
}
- public String getMediumossb() {
- return mediumossb;
- }
-
- public void setMediumossb(String mediumossb) {
- this.mediumossb = mediumossb;
- }
-
public String getGradeoss() {
return gradeoss;
}
public void setGradeoss(String gradeoss) {
this.gradeoss = gradeoss;
- }
-
- public String getMediumoss() {
- return mediumoss;
- }
-
- public void setMediumoss(String mediumoss) {
- this.mediumoss = mediumoss;
- }
-
- public String getValuation() {
- return valuation;
- }
-
- public void setValuation(String valuation) {
- this.valuation = valuation;
}
public String getThawgrade() {
@@ -556,12 +395,28 @@
this.fsoiltype = fsoiltype;
}
- public BigDecimal getUpperlimit() {
+ public String getUpperlimit() {
return upperlimit;
}
- public void setUpperlimit(BigDecimal upperlimit) {
+ public void setUpperlimit(String upperlimit) {
this.upperlimit = upperlimit;
+ }
+
+ public String getFsoilgroup() {
+ return fsoilgroup;
+ }
+
+ public void setFsoilgroup(String fsoilgroup) {
+ this.fsoilgroup = fsoilgroup;
+ }
+
+ public String getFrosoildep() {
+ return frosoildep;
+ }
+
+ public void setFrosoildep(String frosoildep) {
+ this.frosoildep = frosoildep;
}
public String getFrostheave() {
@@ -676,6 +531,14 @@
this.saltexp = saltexp;
}
+ public String getOthersoil() {
+ return othersoil;
+ }
+
+ public void setOthersoil(String othersoil) {
+ this.othersoil = othersoil;
+ }
+
public String getAbnburying() {
return abnburying;
}
@@ -690,6 +553,14 @@
public void setProfile(String profile) {
this.profile = profile;
+ }
+
+ public String getAgdesc() {
+ return agdesc;
+ }
+
+ public void setAgdesc(String agdesc) {
+ this.agdesc = agdesc;
}
public String getUniformity() {
@@ -716,19 +587,19 @@
this.strdepth = strdepth;
}
- public BigDecimal getBearingcap() {
+ public String getBearingcap() {
return bearingcap;
}
- public void setBearingcap(BigDecimal bearingcap) {
+ public void setBearingcap(String bearingcap) {
this.bearingcap = bearingcap;
}
- public BigDecimal getCommodulus() {
+ public String getCommodulus() {
return commodulus;
}
- public void setCommodulus(BigDecimal commodulus) {
+ public void setCommodulus(String commodulus) {
this.commodulus = commodulus;
}
@@ -771,4 +642,44 @@
public void setDatastage(String datastage) {
this.datastage = datastage;
}
+
+ public String getBelongs() {
+ return belongs;
+ }
+
+ public void setBelongs(String belongs) {
+ this.belongs = belongs;
+ }
+
+ public String getBelongsid() {
+ return belongsid;
+ }
+
+ public void setBelongsid(String belongsid) {
+ this.belongsid = belongsid;
+ }
+
+ public String getDatastatus() {
+ return datastatus;
+ }
+
+ public void setDatastatus(String datastatus) {
+ this.datastatus = datastatus;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getWorkname() {
+ return workname;
+ }
+
+ public void setWorkname(String workname) {
+ this.workname = workname;
+ }
}
--
Gitblit v1.9.3