2025-09-22 wj 整体修改3

qianhe-system/src/main/java/com/qianhe/system/domain/SysDeptCb.java

@@ -27,8 +27,8 @@ public class SysDeptCb extends BaseEntity
     @Excel(name = "年度")
     @Excel(name = "年度")
     private String nd;
     private String nd;
 
 
-    /** 单位类型（油气开发单位、主要专业化单位、科研、监督、服务协调单位） */
-    @Excel(name = "单位类型", readConverterExp = "油=气开发单位、主要专业化单位、科研、监督、服务协调单位")
+    /** 单位类型（油气生产单位、专业化单位、科研监督单位） */
+    @Excel(name = "单位类型", readConverterExp = "油=气开发单位、专业化单位、科研监督单位")
     private String dwlx;
     private String dwlx;
 
 
     /** 交油气量（万吨）/经营收入（万元） */
     /** 交油气量（万吨）/经营收入（万元） */

qianhe-ydsj/src/main/java/com/qianhe/domain/SjFybpZb.java

@@ -100,186 +100,5 @@ public class SjFybpZb extends BaseEntity
     private String jl;
     private String jl;
 
 
     private Boolean jlflag;
     private Boolean jlflag;
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
 
 
-    public Long getId()
-    {
-        return id;
-    }
-    public void setFyrq(String fyrq)
-    {
-        this.fyrq = fyrq;
-    }
-
-    public String getFyrq()
-    {
-        return fyrq;
-    }
-    public void setDeptId(String deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    public String getDeptId()
-    {
-        return deptId;
-    }
-    public void setFyje(BigDecimal fyje)
-    {
-        this.fyje = fyje;
-    }
-
-    public BigDecimal getFyje()
-    {
-        return fyje;
-    }
-    public void setZt(String zt)
-    {
-        this.zt = zt;
-    }
-
-    public String getZt()
-    {
-        return zt;
-    }
-    public void setTjr(String tjr)
-    {
-        this.tjr = tjr;
-    }
-
-    public String getTjr()
-    {
-        return tjr;
-    }
-    public void setTjrq(String tjrq)
-    {
-        this.tjrq = tjrq;
-    }
-
-    public String getTjrq()
-    {
-        return tjrq;
-    }
-    public void setSprq(String sprq)
-    {
-        this.sprq = sprq;
-    }
-
-    public String getSprq()
-    {
-        return sprq;
-    }
-    public void setSpr(String spr)
-    {
-        this.spr = spr;
-    }
-
-    public String getSpr()
-    {
-        return spr;
-    }
-    public void setYsyje(BigDecimal ysyje)
-    {
-        this.ysyje = ysyje;
-    }
-
-    public BigDecimal getYsyje()
-    {
-        return ysyje;
-    }
-    public void setSpyj(String spyj)
-    {
-        this.spyj = spyj;
-    }
-
-    public String getSpyj()
-    {
-        return spyj;
-    }
-    public void setYl1(String yl1)
-    {
-        this.yl1 = yl1;
-    }
-
-    public String getYl1()
-    {
-        return yl1;
-    }
-    public void setYl2(String yl2)
-    {
-        this.yl2 = yl2;
-    }
-
-    public String getYl2()
-    {
-        return yl2;
-    }
-    public void setYl3(String yl3)
-    {
-        this.yl3 = yl3;
-    }
-
-    public String getYl3()
-    {
-        return yl3;
-    }
-    public void setYl4(String yl4)
-    {
-        this.yl4 = yl4;
-    }
-
-    public String getYl4()
-    {
-        return yl4;
-    }
-    public void setYl5(String yl5)
-    {
-        this.yl5 = yl5;
-    }
-
-    public String getYl5()
-    {
-        return yl5;
-    }
-
-    public List<SjFybp> getSjFybpList()
-    {
-        return sjFybpList;
-    }
-
-    public void setSjFybpList(List<SjFybp> sjFybpList)
-    {
-        this.sjFybpList = sjFybpList;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("fyrq", getFyrq())
-            .append("deptId", getDeptId())
-            .append("fyje", getFyje())
-            .append("zt", getZt())
-            .append("tjr", getTjr())
-            .append("tjrq", getTjrq())
-            .append("sprq", getSprq())
-            .append("spr", getSpr())
-            .append("ysyje", getYsyje())
-            .append("spyj", getSpyj())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("yl1", getYl1())
-            .append("yl2", getYl2())
-            .append("yl3", getYl3())
-            .append("yl4", getYl4())
-            .append("yl5", getYl5())
-            .append("sjFybpList", getSjFybpList())
-            .toString();
-    }
 }
 }