diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java index e2afb0b2..94f6aed3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java @@ -1,12 +1,16 @@ package org.dromara.xzd.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; /** * 决算清单(调整)对象 xzd_jsqd_tz @@ -133,6 +137,23 @@ public class XzdJsqdTz extends BaseEntity { */ private String tzhwbs; + /** + * 质保期 + */ + private int zbq; + + /** + * 归还期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date ghq; + + /** + * 归还比例 + */ + private BigDecimal ghbl; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java index 460456ba..b5b660da 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java @@ -1,12 +1,15 @@ package org.dromara.xzd.domain.bo; -import org.dromara.xzd.domain.XzdJsqdTz; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.xzd.domain.XzdJsqdTz; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.util.Date; /** * 决算清单(调整)业务对象 xzd_jsqd_tz @@ -134,6 +137,23 @@ public class XzdJsqdTzBo extends BaseEntity { */ private String remark; + /** + * 质保期 + */ + private int zbq; + + /** + * 归还期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date ghq; + + /** + * 归还比例 + */ + private BigDecimal ghbl; + /** * 数据来源 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java index 764f1e50..f2b6ab66 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java @@ -133,6 +133,7 @@ public class XzdContractAccountVo implements Serializable { * 甲方单位(客户) */ @ExcelProperty(value = "甲方单位(客户)") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "firstPartyId") private String firstParty; /** @@ -144,6 +145,7 @@ public class XzdContractAccountVo implements Serializable { * 乙方单位(供应商) */ @ExcelProperty(value = "乙方单位(供应商)") + @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "secondPartyId") private String secondParty; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java index 1ef73138..7fed5c42 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java @@ -1,14 +1,17 @@ package org.dromara.xzd.domain.vo; -import java.math.BigDecimal; -import org.dromara.xzd.domain.XzdJsqdTz; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.xzd.domain.XzdJsqdTz; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; /** @@ -157,6 +160,23 @@ public class XzdJsqdTzVo implements Serializable { @ExcelProperty(value = "调整后wbs") private String tzhwbs; + /** + * 质保期 + */ + private int zbq; + + /** + * 归还期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date ghq; + + /** + * 归还比例 + */ + private BigDecimal ghbl; + /** * 备注 */