Commit 14fc6c70 by jiang'yun

修改

parent a829eab9
......@@ -2,6 +2,7 @@ package com.zjsgfa.project.zjsgfa.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
......@@ -13,6 +14,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity;
* @author
* @date 2025-07-17
*/
@Data
public class SjTgTgqdjh extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -34,39 +36,39 @@ public class SjTgTgqdjh extends BaseEntity
/** 每米质量 */
@Excel(name = "每米质量")
private Double mmzl;
private String mmzl;
/** 段净重 */
@Excel(name = "段净重")
private Double djz;
private String djz;
/** 累计重 */
@Excel(name = "累计重")
private Double ljz;
private String ljz;
/** 抗外挤最大载荷 */
@Excel(name = "抗外挤最大载荷")
private Double zdzhkwj;
private String zdzhkwj;
/** 抗外挤安全系数 */
@Excel(name = "抗外挤安全系数")
private Double aqxskwj;
private String aqxskwj;
/** 抗内压最大载荷 */
@Excel(name = "抗内压最大载荷")
private Double zdzhkny;
private String zdzhkny;
/** 抗内压安全系数 */
@Excel(name = "抗内压安全系数")
private Double aqxskny;
private String aqxskny;
/** 抗拉最大载荷 */
@Excel(name = "抗拉最大载荷")
private Double zdzhkl;
private String zdzhkl;
/** 抗拉安全系数 */
@Excel(name = "抗拉安全系数")
private Double aqxskl;
private String aqxskl;
/** 备注 */
@Excel(name = "备注")
......@@ -81,187 +83,4 @@ public class SjTgTgqdjh 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 setJh(String jh)
{
this.jh = jh;
}
public String getJh()
{
return jh;
}
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 setMmzl(Double mmzl)
{
this.mmzl = mmzl;
}
public Double getMmzl()
{
return mmzl;
}
public void setDjz(Double djz)
{
this.djz = djz;
}
public Double getDjz()
{
return djz;
}
public void setLjz(Double ljz)
{
this.ljz = ljz;
}
public Double getLjz()
{
return ljz;
}
public void setZdzhkwj(Double zdzhkwj)
{
this.zdzhkwj = zdzhkwj;
}
public Double getZdzhkwj()
{
return zdzhkwj;
}
public void setAqxskwj(Double aqxskwj)
{
this.aqxskwj = aqxskwj;
}
public Double getAqxskwj()
{
return aqxskwj;
}
public void setZdzhkny(Double zdzhkny)
{
this.zdzhkny = zdzhkny;
}
public Double getZdzhkny()
{
return zdzhkny;
}
public void setAqxskny(Double aqxskny)
{
this.aqxskny = aqxskny;
}
public Double getAqxskny()
{
return aqxskny;
}
public void setZdzhkl(Double zdzhkl)
{
this.zdzhkl = zdzhkl;
}
public Double getZdzhkl()
{
return zdzhkl;
}
public void setAqxskl(Double aqxskl)
{
this.aqxskl = aqxskl;
}
public Double getAqxskl()
{
return aqxskl;
}
public void setBz(String bz)
{
this.bz = bz;
}
public String getBz()
{
return bz;
}
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("jh", getJh())
.append("kc", getKc())
.append("jd", getJd())
.append("mmzl", getMmzl())
.append("djz", getDjz())
.append("ljz", getLjz())
.append("zdzhkwj", getZdzhkwj())
.append("aqxskwj", getAqxskwj())
.append("zdzhkny", getZdzhkny())
.append("aqxskny", getAqxskny())
.append("zdzhkl", getZdzhkl())
.append("aqxskl", getAqxskl())
.append("bz", getBz())
.append("createdBy", getCreatedBy())
.append("createdTime", getCreatedTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}
......@@ -2,6 +2,7 @@ package com.zjsgfa.project.zjsgfa.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
......@@ -13,6 +14,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity;
* @author
* @date 2025-07-17
*/
@Data
public class SjTgTgxnsj extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -26,7 +28,7 @@ public class SjTgTgxnsj extends BaseEntity
/** 外径 */
@Excel(name = "外径")
private Double wj;
private String wj;
/** 钢级 */
@Excel(name = "钢级")
......@@ -34,7 +36,7 @@ public class SjTgTgxnsj extends BaseEntity
/** 壁厚 */
@Excel(name = "壁厚")
private Double bh;
private String bh;
/** 扣型 */
@Excel(name = "扣型")
......@@ -42,23 +44,23 @@ public class SjTgTgxnsj extends BaseEntity
/** 每米重量 */
@Excel(name = "每米重量")
private Double mmzl;
private String mmzl;
/** 接箍外径 */
@Excel(name = "接箍外径")
private Double jgwj;
private String jgwj;
/** 抗拉强度 */
@Excel(name = "抗拉强度")
private Double klqd;
private String klqd;
/** 抗挤强度 */
@Excel(name = "抗挤强度")
private Double kjqd;
private String kjqd;
/** 抗内压强度 */
@Excel(name = "抗内压强度")
private Double knyqd;
private String knyqd;
/** 备注 */
@Excel(name = "备注")
......@@ -73,165 +75,4 @@ public class SjTgTgxnsj 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 setJh(String jh)
{
this.jh = jh;
}
public String getJh()
{
return jh;
}
public void setWj(Double wj)
{
this.wj = wj;
}
public Double getWj()
{
return wj;
}
public void setGj(String gj)
{
this.gj = gj;
}
public String getGj()
{
return gj;
}
public void setBh(Double bh)
{
this.bh = bh;
}
public Double getBh()
{
return bh;
}
public void setKx(String kx)
{
this.kx = kx;
}
public String getKx()
{
return kx;
}
public void setMmzl(Double mmzl)
{
this.mmzl = mmzl;
}
public Double getMmzl()
{
return mmzl;
}
public void setJgwj(Double jgwj)
{
this.jgwj = jgwj;
}
public Double getJgwj()
{
return jgwj;
}
public void setKlqd(Double klqd)
{
this.klqd = klqd;
}
public Double getKlqd()
{
return klqd;
}
public void setKjqd(Double kjqd)
{
this.kjqd = kjqd;
}
public Double getKjqd()
{
return kjqd;
}
public void setKnyqd(Double knyqd)
{
this.knyqd = knyqd;
}
public Double getKnyqd()
{
return knyqd;
}
public void setBz(String bz)
{
this.bz = bz;
}
public String getBz()
{
return bz;
}
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("jh", getJh())
.append("wj", getWj())
.append("gj", getGj())
.append("bh", getBh())
.append("kx", getKx())
.append("mmzl", getMmzl())
.append("jgwj", getJgwj())
.append("klqd", getKlqd())
.append("kjqd", getKjqd())
.append("knyqd", getKnyqd())
.append("bz", getBz())
.append("createdBy", getCreatedBy())
.append("createdTime", getCreatedTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}
......@@ -2,6 +2,7 @@ package com.zjsgfa.project.zjsgfa.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
......@@ -13,6 +14,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity;
* @author
* @date 2025-07-17
*/
@Data
public class SjTgTgz extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -34,7 +36,7 @@ public class SjTgTgz extends BaseEntity
/** 外径 */
@Excel(name = "外径")
private Double wj;
private String wj;
/** 钢级 */
@Excel(name = "钢级")
......@@ -42,7 +44,7 @@ public class SjTgTgz extends BaseEntity
/** 壁厚 */
@Excel(name = "壁厚")
private Double bh;
private String bh;
/** 扣型 */
@Excel(name = "扣型")
......@@ -50,15 +52,15 @@ public class SjTgTgz extends BaseEntity
/** 最佳上扣扭矩 */
@Excel(name = "最佳上扣扭矩")
private Double zjsknj;
private String zjsknj;
/** 长度 */
@Excel(name = "长度")
private Double cd;
private String cd;
/** 钻井液密度 */
@Excel(name = "钻井液密度")
private Double zjymd;
private String zjymd;
/** 备注 */
@Excel(name = "备注")
......@@ -73,165 +75,4 @@ public class SjTgTgz 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 setJh(String jh)
{
this.jh = jh;
}
public String getJh()
{
return jh;
}
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 setWj(Double wj)
{
this.wj = wj;
}
public Double getWj()
{
return wj;
}
public void setGj(String gj)
{
this.gj = gj;
}
public String getGj()
{
return gj;
}
public void setBh(Double bh)
{
this.bh = bh;
}
public Double getBh()
{
return bh;
}
public void setKx(String kx)
{
this.kx = kx;
}
public String getKx()
{
return kx;
}
public void setZjsknj(Double zjsknj)
{
this.zjsknj = zjsknj;
}
public Double getZjsknj()
{
return zjsknj;
}
public void setCd(Double cd)
{
this.cd = cd;
}
public Double getCd()
{
return cd;
}
public void setZjymd(Double zjymd)
{
this.zjymd = zjymd;
}
public Double getZjymd()
{
return zjymd;
}
public void setBz(String bz)
{
this.bz = bz;
}
public String getBz()
{
return bz;
}
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("jh", getJh())
.append("kc", getKc())
.append("jd", getJd())
.append("wj", getWj())
.append("gj", getGj())
.append("bh", getBh())
.append("kx", getKx())
.append("zjsknj", getZjsknj())
.append("cd", getCd())
.append("zjymd", getZjymd())
.append("bz", getBz())
.append("createdBy", getCreatedBy())
.append("createdTime", getCreatedTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}
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