优化

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/BaseContractInfoController.java

@@ -177,23 +177,23 @@ public class BaseContractInfoController extends BaseController {
                     // 2. 构建数据模型
                     new HashMap<String, Object>() {{
                         put("xmmc" , baseContract.getHtmc());
-                        put("jf" , baseContract.getJGsmc());
+                        put("jf" , baseContract.getjGsmc());
                         put("yf" , baseSubjectInfo.getZtmc());
                         put("htbh" , baseContract.getHtbh());
                         put("qyrq" , DateUtils.dateTime(baseContract.getQysj()));
-                        put("jLxr" , baseContract.getJLxr());
-                        put("jTxdz" , baseContract.getJTxdz());
-                        put("jLxdh" , baseContract.getJLxdh());
-                        put("jGsmc" , baseContract.getJGsmc());
-                        put("jTxdz" , baseContract.getJTxdz());
-                        put("jYb" , baseContract.getJYb());
-                        put("jDzyx" , baseContract.getJDzyj());
-                        put("jHkr" , baseContract.getJHkr());
-                        put("jKhyh" , baseContract.getJKhyh());
-                        put("jYhzh" , baseContract.getJYhzh());
-                        put("jSwdjh" , baseContract.getJSwdjh());
-                        put("jLxr" , baseContract.getJLxr());
-                        put("jLxdh" , baseContract.getJLxdh());
+                        put("jLxr" , baseContract.getjLxr());
+                        put("jTxdz" , baseContract.getjTxdz());
+                        put("jLxdh" , baseContract.getjLxdh());
+                        put("jGsmc" , baseContract.getjGsmc());
+                        put("jTxdz" , baseContract.getjTxdz());
+                        put("jYb" , baseContract.getjYb());
+                        put("jDzyx" , baseContract.getjDzyj());
+                        put("jHkr" , baseContract.getjHkr());
+                        put("jKhyh" , baseContract.getjKhyh());
+                        put("jYhzh" , baseContract.getjYhzh());
+                        put("jSwdjh" , baseContract.getjSwdjh());
+                        put("jLxr" , baseContract.getjLxr());
+                        put("jLxdh" , baseContract.getjLxdh());
                         put("htmc" , baseContract.getHtmc());
                         put("htze" , baseContract.getHtze());
                         put("hezedx" , MoneyConverter.convert(baseContract.getHtze()));

ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseContractInfo.java

@@ -30,7 +30,7 @@ public class BaseContractInfo extends BaseEntity
     /** 主体id */
     private Long subjectId;
 
-    /** 主体名称 */
+    /** 主体 */
     private String subjectName;
 
     /** 合同编号 */
@@ -209,4 +209,467 @@ public class BaseContractInfo extends BaseEntity
 
     // 终止时间查询类型
     private Integer htzzsjType;
+
+    public BaseContractInfo() {
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setHtbh(String htbh)
+    {
+        this.htbh = htbh;
+    }
+
+    public String getHtbh()
+    {
+        return htbh;
+    }
+    public void setBmId(Long bmId)
+    {
+        this.bmId = bmId;
+    }
+
+    public Long getBmId()
+    {
+        return bmId;
+    }
+    public void setSsbm(String ssbm)
+    {
+        this.ssbm = ssbm;
+    }
+
+    public String getSsbm()
+    {
+        return ssbm;
+    }
+    public void setYwyId(Long ywyId)
+    {
+        this.ywyId = ywyId;
+    }
+
+    public Long getYwyId()
+    {
+        return ywyId;
+    }
+    public void setYwy(String ywy)
+    {
+        this.ywy = ywy;
+    }
+
+    public String getYwy()
+    {
+        return ywy;
+    }
+    public void setKhId(Long khId)
+    {
+        this.khId = khId;
+    }
+
+    public Long getKhId()
+    {
+        return khId;
+    }
+    public void setKhmc(String khmc)
+    {
+        this.khmc = khmc;
+    }
+
+    public String getKhmc()
+    {
+        return khmc;
+    }
+    public void setHtmc(String htmc)
+    {
+        this.htmc = htmc;
+    }
+
+    public String getHtmc()
+    {
+        return htmc;
+    }
+    public void setCplb(Long cplb)
+    {
+        this.cplb = cplb;
+    }
+
+    public Long getCplb()
+    {
+        return cplb;
+    }
+    public void setjGsmc(String jGsmc)
+    {
+        this.jGsmc = jGsmc;
+    }
+
+    public String getjGsmc()
+    {
+        return jGsmc;
+    }
+    public void setjTxdz(String jTxdz)
+    {
+        this.jTxdz = jTxdz;
+    }
+
+    public String getjTxdz()
+    {
+        return jTxdz;
+    }
+    public void setjYb(String jYb)
+    {
+        this.jYb = jYb;
+    }
+
+    public String getjYb()
+    {
+        return jYb;
+    }
+    public void setjDzyj(String jDzyj)
+    {
+        this.jDzyj = jDzyj;
+    }
+
+    public String getjDzyj()
+    {
+        return jDzyj;
+    }
+    public void setjHkr(String jHkr)
+    {
+        this.jHkr = jHkr;
+    }
+
+    public String getjHkr()
+    {
+        return jHkr;
+    }
+    public void setjKhyh(String jKhyh)
+    {
+        this.jKhyh = jKhyh;
+    }
+
+    public String getjKhyh()
+    {
+        return jKhyh;
+    }
+    public void setjYhzh(String jYhzh)
+    {
+        this.jYhzh = jYhzh;
+    }
+
+    public String getjYhzh()
+    {
+        return jYhzh;
+    }
+    public void setjSwdjh(String jSwdjh)
+    {
+        this.jSwdjh = jSwdjh;
+    }
+
+    public String getjSwdjh()
+    {
+        return jSwdjh;
+    }
+    public void setjLxr(String jLxr)
+    {
+        this.jLxr = jLxr;
+    }
+
+    public String getjLxr()
+    {
+        return jLxr;
+    }
+    public void setjLxdh(String jLxdh)
+    {
+        this.jLxdh = jLxdh;
+    }
+
+    public String getjLxdh()
+    {
+        return jLxdh;
+    }
+    public void setHtnr(String htnr)
+    {
+        this.htnr = htnr;
+    }
+
+    public String getHtnr()
+    {
+        return htnr;
+    }
+    public void setQysj(Date qysj)
+    {
+        this.qysj = qysj;
+    }
+
+    public Date getQysj()
+    {
+        return qysj;
+    }
+    public void setHtzt(Integer htzt)
+    {
+        this.htzt = htzt;
+    }
+
+    public Integer getHtzt()
+    {
+        return htzt;
+    }
+    public void setFkfs(Long fkfs)
+    {
+        this.fkfs = fkfs;
+    }
+
+    public Long getFkfs()
+    {
+        return fkfs;
+    }
+    public void setHtsxsj(Date htsxsj)
+    {
+        this.htsxsj = htsxsj;
+    }
+
+    public Date getHtsxsj()
+    {
+        return htsxsj;
+    }
+    public void setHtzzsj(Date htzzsj)
+    {
+        this.htzzsj = htzzsj;
+    }
+
+    public Date getHtzzsj()
+    {
+        return htzzsj;
+    }
+    public void setQs(Long qs)
+    {
+        this.qs = qs;
+    }
+
+    public Long getQs()
+    {
+        return qs;
+    }
+    public void setHtze(BigDecimal htze)
+    {
+        this.htze = htze;
+    }
+
+    public BigDecimal getHtze()
+    {
+        return htze;
+    }
+    public void setFkbl(String fkbl)
+    {
+        this.fkbl = fkbl;
+    }
+
+    public String getFkbl()
+    {
+        return fkbl;
+    }
+    public void setFdFlag(Long fdFlag)
+    {
+        this.fdFlag = fdFlag;
+    }
+
+    public Long getFdFlag()
+    {
+        return fdFlag;
+    }
+    public void setFdje(BigDecimal fdje)
+    {
+        this.fdje = fdje;
+    }
+
+    public BigDecimal getFdje()
+    {
+        return fdje;
+    }
+    public void setDqjd(Integer dqjd)
+    {
+        this.dqjd = dqjd;
+    }
+
+    public Integer getDqjd()
+    {
+        return dqjd;
+    }
+    public void setZtdw(Long ztdw)
+    {
+        this.ztdw = ztdw;
+    }
+
+    public Long getZtdw()
+    {
+        return ztdw;
+    }
+    public void setHtfj(String htfj)
+    {
+        this.htfj = htfj;
+    }
+
+    public String getHtfj()
+    {
+        return htfj;
+    }
+    public void setBz(String bz)
+    {
+        this.bz = bz;
+    }
+
+    public String getBz()
+    {
+        return bz;
+    }
+    public void setDeleteFlag(Long deleteFlag)
+    {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Long getDeleteFlag()
+    {
+        return deleteFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("htbh", getHtbh())
+            .append("bmId", getBmId())
+            .append("ssbm", getSsbm())
+            .append("ywyId", getYwyId())
+            .append("ywy", getYwy())
+            .append("khId", getKhId())
+            .append("khmc", getKhmc())
+            .append("htmc", getHtmc())
+            .append("cplb", getCplb())
+            .append("jGsmc", getjGsmc())
+            .append("jTxdz", getjTxdz())
+            .append("jYb", getjYb())
+            .append("jDzyj", getjDzyj())
+            .append("jHkr", getjHkr())
+            .append("jKhyh", getjKhyh())
+            .append("jYhzh", getjYhzh())
+            .append("jSwdjh", getjSwdjh())
+            .append("jLxr", getjLxr())
+            .append("jLxdh", getjLxdh())
+            .append("htnr", getHtnr())
+            .append("qysj", getQysj())
+            .append("htzt", getHtzt())
+            .append("fkfs", getFkfs())
+            .append("htsxsj", getHtsxsj())
+            .append("htzzsj", getHtzzsj())
+            .append("qs", getQs())
+            .append("htze", getHtze())
+            .append("fkbl", getFkbl())
+            .append("fdFlag", getFdFlag())
+            .append("fdje", getFdje())
+            .append("dqjd", getDqjd())
+            .append("ztdw", getZtdw())
+            .append("htfj", getHtfj())
+            .append("bz", getBz())
+            .append("deleteFlag", getDeleteFlag())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+
+    public BigDecimal getHkje() {
+        return hkje;
+    }
+
+    public void setHkje(BigDecimal hkje) {
+        this.hkje = hkje;
+    }
+
+    public List<BaseContractPeriodsInfo> getBaseContractPeriodsInfos() {
+        return baseContractPeriodsInfos;
+    }
+
+    public void setBaseContractPeriodsInfos(List<BaseContractPeriodsInfo> baseContractPeriodsInfos) {
+        this.baseContractPeriodsInfos = baseContractPeriodsInfos;
+    }
+
+    public List<BaseContractAuditRecord> getBaseContractAuditRecords() {
+        return baseContractAuditRecords;
+    }
+
+    public void setBaseContractAuditRecords(List<BaseContractAuditRecord> baseContractAuditRecords) {
+        this.baseContractAuditRecords = baseContractAuditRecords;
+    }
+
+    public Long getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Long subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Long getShrId() {
+        return shrId;
+    }
+
+    public void setShrId(Long shrId) {
+        this.shrId = shrId;
+    }
+
+
+    public String getShrName() {
+        return shrName;
+    }
+
+    public void setShrName(String shrName) {
+        this.shrName = shrName;
+    }
+
+    public Integer getShzt() {
+        return shzt;
+    }
+
+    public void setShzt(Integer shzt) {
+        this.shzt = shzt;
+    }
+
+    public BigDecimal getHtMinAmount() {
+        return htMinAmount;
+    }
+
+    public void setHtMinAmount(BigDecimal htMinAmount) {
+        this.htMinAmount = htMinAmount;
+    }
+
+    public BigDecimal getHtMaxAmount() {
+        return htMaxAmount;
+    }
+
+    public void setHtMaxAmount(BigDecimal htMaxAmount) {
+        this.htMaxAmount = htMaxAmount;
+    }
+
+    public Integer getHtsxsjType() {
+        return htsxsjType;
+    }
+
+    public void setHtsxsjType(Integer htsxsjType) {
+        this.htsxsjType = htsxsjType;
+    }
+
+    public Integer getHtzzsjType() {
+        return htzzsjType;
+    }
+
+    public void setHtzzsjType(Integer htzzsjType) {
+        this.htzzsjType = htzzsjType;
+    }
 }