Skip to content

R
ry-crm
Commit d3ac1bb7 authored by EDY's avatar EDY
Browse files
Options

优化

parent 9ca4e6bb
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 1624 deletions
ruoyi-admin/pom.xml
View file @ d3ac1bb7
......@@ -90,7 +90,7 @@
</configuration>
</plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
<finalName>${project.artifactId}-crm</finalName>
</build>
</project>
ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/BaseContractInfoController.java
View file @ d3ac1bb7
......@@ -103,6 +103,7 @@ public class BaseContractInfoController extends BaseController {
@PostMapping
public AjaxResult add(@RequestBody BaseContractInfo baseContractInfo) {
baseContractInfo.setCreateBy(getLoginUser().getUser().getNickName());
baseContractInfo.setCreateTime(new Date());
return toAjax(baseContractInfoService.insertBaseContractInfo(baseContractInfo));
}
......@@ -176,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/BaseContractAuditRecord.java
View file @ d3ac1bb7
package com.ruoyi.system.domain.business;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
......@@ -11,6 +14,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author gm
* @date 2025-02-10
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class BaseContractAuditRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -34,43 +39,6 @@ public class BaseContractAuditRecord extends BaseEntity
@Excel(name = "处理意见")
private String clyj;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setJd(Integer jd)
{
this.jd = jd;
}
public Integer getJd()
{
return jd;
}
public void setCz(Integer cz)
{
this.cz = cz;
}
public Integer getCz()
{
return cz;
}
public void setClyj(String clyj)
{
this.clyj = clyj;
}
public String getClyj()
{
return clyj;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......@@ -82,12 +50,4 @@ public class BaseContractAuditRecord extends BaseEntity
.append("createBy", getCreateBy())
.toString();
}
public Long getContractId() {
return contractId;
}
public void setContractId(Long contractId) {
this.contractId = contractId;
}
}
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseContractInfo.java
View file @ d3ac1bb7
......@@ -5,6 +5,8 @@ import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
......@@ -16,6 +18,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author gm
* @date 2025-02-10
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class BaseContractInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -202,467 +206,4 @@ 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;
}
}
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseContractPeriodsInfo.java
View file @ d3ac1bb7
package com.ruoyi.system.domain.business;
import java.math.BigDecimal;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
......@@ -12,6 +15,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author gm
* @date 2025-02-10
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class BaseContractPeriodsInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -34,61 +39,4 @@ public class BaseContractPeriodsInfo extends BaseEntity
/** 描述 */
@Excel(name = "描述")
private String ms;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setContractId(Long contractId)
{
this.contractId = contractId;
}
public Long getContractId()
{
return contractId;
}
public void setQs(String qs)
{
this.qs = qs;
}
public String getQs()
{
return qs;
}
public void setJe(BigDecimal je)
{
this.je = je;
}
public BigDecimal getJe()
{
return je;
}
public void setMs(String ms)
{
this.ms = ms;
}
public String getMs()
{
return ms;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("contractId", getContractId())
.append("qs", getQs())
.append("je", getJe())
.append("ms", getMs())
.toString();
}
}
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseCustomFollowRecord.java
View file @ d3ac1bb7
......@@ -2,6 +2,8 @@ package com.ruoyi.system.domain.business;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
......@@ -13,6 +15,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author gm
* @date 2025-02-10
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class BaseCustomFollowRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -49,94 +53,4 @@ public class BaseCustomFollowRecord extends BaseEntity
@Excel(name = "是否删除 1 删除 0 正常")
private Long deleteFlag;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setCustomId(Long customId)
{
this.customId = customId;
}
public Long getCustomId()
{
return customId;
}
public void setGjnr(String gjnr)
{
this.gjnr = gjnr;
}
public String getGjnr()
{
return gjnr;
}
public void setGjfs(Long gjfs)
{
this.gjfs = gjfs;
}
public Long getGjfs()
{
return gjfs;
}
public void setGjr(String gjr)
{
this.gjr = gjr;
}
public String getGjr()
{
return gjr;
}
public void setGjTime(Date gjTime)
{
this.gjTime = gjTime;
}
public Date getGjTime()
{
return gjTime;
}
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("customId", getCustomId())
.append("gjnr", getGjnr())
.append("gjfs", getGjfs())
.append("gjr", getGjr())
.append("gjTime", getGjTime())
.append("bz", getBz())
.append("deleteFlag", getDeleteFlag())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.toString();
}
}
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseCustomInfo.java
View file @ d3ac1bb7
package com.ruoyi.system.domain.business;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
......@@ -13,6 +15,8 @@ import java.util.Date;
* @author gm
* @date 2025-02-10
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class BaseCustomInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -106,252 +110,4 @@ public class BaseCustomInfo extends BaseEntity
private Integer rubbishFlag;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setKhxm(String khxm)
{
this.khxm = khxm;
}
public String getKhxm()
{
return khxm;
}
public void setKhgs(String khgs)
{
this.khgs = khgs;
}
public String getKhgs()
{
return khgs;
}
public void setKhly(Long khly)
{
this.khly = khly;
}
public Long getKhly()
{
return khly;
}
public void setCplb(Long cplb)
{
this.cplb = cplb;
}
public Long getCplb()
{
return cplb;
}
public void setSjh(String sjh)
{
this.sjh = sjh;
}
public String getSjh()
{
return sjh;
}
public void setWx(String wx)
{
this.wx = wx;
}
public String getWx()
{
return wx;
}
public void setKhdz(String khdz)
{
this.khdz = khdz;
}
public String getKhdz()
{
return khdz;
}
public void setKhxq(String khxq)
{
this.khxq = khxq;
}
public String getKhxq()
{
return khxq;
}
public void setKhhy(String khhy)
{
this.khhy = khhy;
}
public String getKhhy()
{
return khhy;
}
public void setYxdj(Long yxdj)
{
this.yxdj = yxdj;
}
public Long getYxdj()
{
return yxdj;
}
public void setKhzt(Long khzt)
{
this.khzt = khzt;
}
public Long getKhzt()
{
return khzt;
}
public void setGs(Integer gs)
{
this.gs = gs;
}
public Integer getGs()
{
return gs;
}
public void setFzr(String fzr)
{
this.fzr = fzr;
}
public String getFzr()
{
return fzr;
}
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("khxm", getKhxm())
.append("khgs", getKhgs())
.append("khly", getKhly())
.append("cplb", getCplb())
.append("sjh", getSjh())
.append("wx", getWx())
.append("khdz", getKhdz())
.append("khxq", getKhxq())
.append("khhy", getKhhy())
.append("yxdj", getYxdj())
.append("khzt", getKhzt())
.append("gs", getGs())
.append("fzr", getFzr())
.append("deleteFlag", getDeleteFlag())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.toString();
}
public String[] getCustomTrade() {
return customTrade;
}
public void setCustomTrade(String[] customTrade) {
this.customTrade = customTrade;
}
public Long getGsId() {
return gsId;
}
public void setGsId(Long gsId) {
this.gsId = gsId;
}
public String getBz() {
return bz;
}
public void setBz(String bz) {
this.bz = bz;
}
public String[] getCustomStatus() {
return customStatus;
}
public void setCustomStatus(String[] customStatus) {
this.customStatus = customStatus;
}
public String[] getPurposeLevel() {
return purposeLevel;
}
public void setPurposeLevel(String[] purposeLevel) {
this.purposeLevel = purposeLevel;
}
public String[] getProductType() {
return productType;
}
public void setProductType(String[] productType) {
this.productType = productType;
}
public String[] getCustomSource() {
return customSource;
}
public void setCustomSource(String[] customSource) {
this.customSource = customSource;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public Integer getRubbishFlag() {
return rubbishFlag;
}
public void setRubbishFlag(Integer rubbishFlag) {
this.rubbishFlag = rubbishFlag;
}
public String getBq() {
return bq;
}
public void setBq(String bq) {
this.bq = bq;
}
}
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseInvoiceAuditRecord.java
View file @ d3ac1bb7
......@@ -2,6 +2,8 @@ package com.ruoyi.system.domain.business;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
......@@ -13,6 +15,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author gm
* @date 2025-02-25
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class BaseInvoiceAuditRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -40,73 +44,4 @@ public class BaseInvoiceAuditRecord extends BaseEntity
/** 备注 */
@Excel(name = "备注")
private String bz;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setInvoiceId(Long invoiceId)
{
this.invoiceId = invoiceId;
}
public Long getInvoiceId()
{
return invoiceId;
}
public void setShzt(Integer shzt)
{
this.shzt = shzt;
}
public Integer getShzt()
{
return shzt;
}
public void setSpr(String spr)
{
this.spr = spr;
}
public String getSpr()
{
return spr;
}
public void setSpTime(Date spTime)
{
this.spTime = spTime;
}
public Date getSpTime()
{
return spTime;
}
public void setBz(String bz)
{
this.bz = bz;
}
public String getBz()
{
return bz;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("invoiceId", getInvoiceId())
.append("shzt", getShzt())
.append("spr", getSpr())
.append("spTime", getSpTime())
.append("bz", getBz())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.toString();
}
}
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseInvoiceInfo.java
View file @ d3ac1bb7
......@@ -5,6 +5,8 @@ import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
......@@ -16,6 +18,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author gm
* @date 2025-02-17
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class BaseInvoiceInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -155,356 +159,4 @@ public class BaseInvoiceInfo extends BaseEntity
private String fpfj;
private List<BaseInvoiceAuditRecord> baseInvoiceAuditRecords;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setContractId(Long contractId)
{
this.contractId = contractId;
}
public Long getContractId()
{
return contractId;
}
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 setBm(String bm)
{
this.bm = bm;
}
public String getBm()
{
return bm;
}
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 setHkje(BigDecimal hkje)
{
this.hkje = hkje;
}
public BigDecimal getHkje()
{
return hkje;
}
public void setHkqs(Long hkqs)
{
this.hkqs = hkqs;
}
public Long getHkqs()
{
return hkqs;
}
public void setFpnr(String fpnr)
{
this.fpnr = fpnr;
}
public String getFpnr()
{
return fpnr;
}
public void setFplx(Long fplx)
{
this.fplx = fplx;
}
public Long getFplx()
{
return fplx;
}
public void setFpsl(BigDecimal fpsl)
{
this.fpsl = fpsl;
}
public BigDecimal getFpsl()
{
return fpsl;
}
public void setKpje(BigDecimal kpje)
{
this.kpje = kpje;
}
public BigDecimal getKpje()
{
return kpje;
}
public void setFpse(BigDecimal fpse)
{
this.fpse = fpse;
}
public BigDecimal getFpse()
{
return fpse;
}
public void setNsrsbh(String nsrsbh)
{
this.nsrsbh = nsrsbh;
}
public String getNsrsbh()
{
return nsrsbh;
}
public void setDz(String dz)
{
this.dz = dz;
}
public String getDz()
{
return dz;
}
public void setSjh(String sjh)
{
this.sjh = sjh;
}
public String getSjh()
{
return sjh;
}
public void setKhh(String khh)
{
this.khh = khh;
}
public String getKhh()
{
return khh;
}
public void setYhzh(String yhzh)
{
this.yhzh = yhzh;
}
public String getYhzh()
{
return yhzh;
}
public void setSprxm(String sprxm)
{
this.sprxm = sprxm;
}
public String getSprxm()
{
return sprxm;
}
public void setSprdh(String sprdh)
{
this.sprdh = sprdh;
}
public String getSprdh()
{
return sprdh;
}
public void setSpryx(String spryx)
{
this.spryx = spryx;
}
public String getSpryx()
{
return spryx;
}
public void setBz(String bz)
{
this.bz = bz;
}
public String getBz()
{
return bz;
}
public void setFpzt(Long fpzt)
{
this.fpzt = fpzt;
}
public Long getFpzt()
{
return fpzt;
}
public void setSqr(String sqr)
{
this.sqr = sqr;
}
public String getSqr()
{
return sqr;
}
public void setKpsj(Date kpsj)
{
this.kpsj = kpsj;
}
public Date getKpsj()
{
return kpsj;
}
public void setDfkxy(String dfkxy)
{
this.dfkxy = dfkxy;
}
public String getDfkxy()
{
return dfkxy;
}
public void setDzhd(String dzhd)
{
this.dzhd = dzhd;
}
public String getDzhd()
{
return dzhd;
}
public void setFpfj(String fpfj)
{
this.fpfj = fpfj;
}
public String getFpfj()
{
return fpfj;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("contractId", getContractId())
.append("htbh", getHtbh())
.append("bmId", getBmId())
.append("bm", getBm())
.append("khId", getKhId())
.append("khmc", getKhmc())
.append("htmc", getHtmc())
.append("hkje", getHkje())
.append("hkqs", getHkqs())
.append("fpnr", getFpnr())
.append("fplx", getFplx())
.append("fpsl", getFpsl())
.append("kpje", getKpje())
.append("fpse", getFpse())
.append("nsrsbh", getNsrsbh())
.append("dz", getDz())
.append("sjh", getSjh())
.append("khh", getKhh())
.append("yhzh", getYhzh())
.append("sprxm", getSprxm())
.append("sprdh", getSprdh())
.append("spryx", getSpryx())
.append("bz", getBz())
.append("fpzt", getFpzt())
.append("sqr", getSqr())
.append("kpsj", getKpsj())
.append("dfkxy", getDfkxy())
.append("dzhd", getDzhd())
.append("fpfj", getFpfj())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.toString();
}
public List<BaseInvoiceAuditRecord> getBaseInvoiceAuditRecords() {
return baseInvoiceAuditRecords;
}
public void setBaseInvoiceAuditRecords(List<BaseInvoiceAuditRecord> baseInvoiceAuditRecords) {
this.baseInvoiceAuditRecords = baseInvoiceAuditRecords;
}
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 String getFpdm() {
return fpdm;
}
public void setFpdm(String fpdm) {
this.fpdm = fpdm;
}
public String getFphm() {
return fphm;
}
public void setFphm(String fphm) {
this.fphm = fphm;
}
}
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BasePaymentCollectionInfo.java
View file @ d3ac1bb7
......@@ -3,6 +3,8 @@ package com.ruoyi.system.domain.business;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
......@@ -14,6 +16,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author gm
* @date 2025-02-10
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class BasePaymentCollectionInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -70,145 +74,4 @@ public class BasePaymentCollectionInfo extends BaseEntity
/** 是否删除 1 是 0 否 */
@Excel(name = "是否删除 1 是 0 否")
private Long deleteFlag;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setContractId(Long contractId)
{
this.contractId = contractId;
}
public Long getContractId()
{
return contractId;
}
public void setInvoiceId(Long invoiceId)
{
this.invoiceId = invoiceId;
}
public Long getInvoiceId()
{
return invoiceId;
}
public void setDzFlag(Long dzFlag)
{
this.dzFlag = dzFlag;
}
public Long getDzFlag()
{
return dzFlag;
}
public void setHkTime(Date hkTime)
{
this.hkTime = hkTime;
}
public Date getHkTime()
{
return hkTime;
}
public void setHkqs(Long hkqs)
{
this.hkqs = hkqs;
}
public Long getHkqs()
{
return hkqs;
}
public void setHkje(BigDecimal hkje)
{
this.hkje = hkje;
}
public BigDecimal getHkje()
{
return hkje;
}
public void setHkfs(Long hkfs)
{
this.hkfs = hkfs;
}
public Long getHkfs()
{
return hkfs;
}
public void setHkpz(String hkpz)
{
this.hkpz = hkpz;
}
public String getHkpz()
{
return hkpz;
}
public void setSkfs(Long skfs)
{
this.skfs = skfs;
}
public Long getSkfs()
{
return skfs;
}
public void setBz(String bz)
{
this.bz = bz;
}
public String getBz()
{
return bz;
}
public void setYjdzTime(Date yjdzTime)
{
this.yjdzTime = yjdzTime;
}
public Date getYjdzTime()
{
return yjdzTime;
}
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("contractId", getContractId())
.append("invoiceId", getInvoiceId())
.append("dzFlag", getDzFlag())
.append("hkTime", getHkTime())
.append("hkqs", getHkqs())
.append("hkje", getHkje())
.append("hkfs", getHkfs())
.append("hkpz", getHkpz())
.append("skfs", getSkfs())
.append("bz", getBz())
.append("yjdzTime", getYjdzTime())
.append("deleteFlag", getDeleteFlag())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.toString();
}
}
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseSubjectInfo.java
View file @ d3ac1bb7
......@@ -2,6 +2,8 @@ package com.ruoyi.system.domain.business;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
......@@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author gm
* @date 2025-02-10
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class BaseSubjectInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -63,143 +67,4 @@ public class BaseSubjectInfo extends BaseEntity
private String bz;
private String contractPrefix;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setZtmc(String ztmc)
{
this.ztmc = ztmc;
}
public String getZtmc()
{
return ztmc;
}
public void setSbh(String sbh)
{
this.sbh = sbh;
}
public String getSbh()
{
return sbh;
}
public void setFr(String fr)
{
this.fr = fr;
}
public String getFr()
{
return fr;
}
public void setLxdh(String lxdh)
{
this.lxdh = lxdh;
}
public String getLxdh()
{
return lxdh;
}
public void setYx(String yx)
{
this.yx = yx;
}
public String getYx()
{
return yx;
}
public void setDz(String dz)
{
this.dz = dz;
}
public String getDz()
{
return dz;
}
public void setKhh(String khh)
{
this.khh = khh;
}
public String getKhh()
{
return khh;
}
public void setHh(String hh)
{
this.hh = hh;
}
public String getHh()
{
return hh;
}
public void setYhzh(String yhzh)
{
this.yhzh = yhzh;
}
public String getYhzh()
{
return yhzh;
}
public void setDeleteFlag(Long deleteFlag)
{
this.deleteFlag = deleteFlag;
}
public Long getDeleteFlag()
{
return deleteFlag;
}
public void setBz(String bz)
{
this.bz = bz;
}
public String getBz()
{
return bz;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("ztmc", getZtmc())
.append("sbh", getSbh())
.append("fr", getFr())
.append("lxdh", getLxdh())
.append("yx", getYx())
.append("dz", getDz())
.append("khh", getKhh())
.append("hh", getHh())
.append("yhzh", getYhzh())
.append("deleteFlag", getDeleteFlag())
.append("bz", getBz())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.toString();
}
public String getContractPrefix() {
return contractPrefix;
}
public void setContractPrefix(String contractPrefix) {
this.contractPrefix = contractPrefix;
}
}
ruoyi-system/src/main/java/com/ruoyi/system/service/business/impl/BaseContractInfoServiceImpl.java
View file @ d3ac1bb7
......@@ -125,7 +125,7 @@ public class BaseContractInfoServiceImpl implements IBaseContractInfoService {
if (baseContractInfo.getShzt() == 1) {
baseContractInfo.setHtzt(7);
}
if (baseContractInfo.getShzt() == 0) {
if (baseContractInfo.getShzt() == 2) {
baseContractInfo.setHtzt(6);
}
baseContractInfo.setShrId(user.getUserId());
......
ruoyi-system/src/main/resources/mapper/business/BaseContractAuditRecordMapper.xml
View file @ d3ac1bb7
......@@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBaseContractAuditRecordVo"/>
where id = #{id}
</select>
<select id="selectBaseContractAuditRecordByContractId"
resultType="com.ruoyi.system.domain.business.BaseContractAuditRecord">
<select id="selectBaseContractAuditRecordByContractId" parameterType="Long"
resultMap="BaseContractAuditRecordResult">
<include refid="selectBaseContractAuditRecordVo"/>
where contract_id = #{contractId}
</select>
......
ruoyi-system/src/main/resources/mapper/business/BaseContractPeriodsInfoMapper.xml
View file @ d3ac1bb7
......@@ -30,8 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBaseContractPeriodsInfoVo"/>
where id = #{id}
</select>
<select id="selectBaseContractPeriodsInfoByContractId"
resultType="com.ruoyi.system.domain.business.BaseContractPeriodsInfo">
<select id="selectBaseContractPeriodsInfoByContractId" parameterType="Long"
resultMap="BaseContractPeriodsInfoResult">
<include refid="selectBaseContractPeriodsInfoVo"/>
where contract_id = #{contractId}
</select>
......
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