diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ContractEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ContractEntity.java index 3f1627d..e33d747 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/ContractEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/ContractEntity.java @@ -1,17 +1,20 @@ package com.dite.znpt.domain.entity; -import java.math.BigDecimal; -import java.util.Date; -import java.io.Serial; -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.*; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.dite.znpt.domain.AuditableEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import com.alibaba.excel.annotation.ExcelProperty; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; /** * @author huise23 @@ -82,6 +85,11 @@ public class ContractEntity extends AuditableEntity implements Serializable { @TableField("payment_date") private Date paymentDate; + @ExcelProperty("履约时间期限") + @ApiModelProperty("履约时间期限") + @TableField("performance_deadline") + private Date performanceDeadline; + @ExcelProperty("付款地址/交付地址") @ApiModelProperty("付款地址/交付地址") @TableField("payment_address") @@ -106,5 +114,10 @@ public class ContractEntity extends AuditableEntity implements Serializable { @ApiModelProperty("合同状态") @TableField("contract_status") private String contractStatus; + + @ExcelProperty("合同内容") + @ApiModelProperty("合同内容") + @TableField("contract_text") + private String contractText; } diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ContractListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ContractListReq.java index 9eb3e7a..fa58191 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ContractListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ContractListReq.java @@ -1,14 +1,14 @@ package com.dite.znpt.domain.vo; -import java.math.BigDecimal; -import java.util.Date; -import java.io.Serial; -import java.io.Serializable; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + /** * @author huise23 * @date 2025/07/21 21:13 @@ -57,6 +57,9 @@ public class ContractListReq implements Serializable { @ApiModelProperty("付款日期/交付日期") private Date paymentDate; + @ApiModelProperty("履约时间期限") + private Date performanceDeadline; + @ApiModelProperty("付款地址/交付地址") private String paymentAddress; @@ -72,5 +75,8 @@ public class ContractListReq implements Serializable { @ApiModelProperty("合同状态") private String contractStatus; + @ApiModelProperty("合同内容") + private String contractText; + } diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ContractReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ContractReq.java index ace5f90..e6030cb 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ContractReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ContractReq.java @@ -1,21 +1,14 @@ package com.dite.znpt.domain.vo; -import java.math.BigDecimal; -import java.util.Date; -import java.io.Serial; -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import com.alibaba.excel.annotation.ExcelProperty; -import com.dite.znpt.util.ValidationGroup; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; /** * @author huise23 * @date 2025/07/21 21:13 @@ -62,6 +55,9 @@ public class ContractReq implements Serializable { @ApiModelProperty("付款日期/交付日期") private Date paymentDate; + @ApiModelProperty("履约时间期限") + private Date performanceDeadline; + @ApiModelProperty("付款地址/交付地址") private String paymentAddress; @@ -76,5 +72,8 @@ public class ContractReq implements Serializable { @ApiModelProperty("合同状态") private String contractStatus; + + @ApiModelProperty("合同内容") + private String contractText; } diff --git a/core/src/main/resources/mapper/ContractMapper.xml b/core/src/main/resources/mapper/ContractMapper.xml index 182e078..c2a698d 100644 --- a/core/src/main/resources/mapper/ContractMapper.xml +++ b/core/src/main/resources/mapper/ContractMapper.xml @@ -53,6 +53,9 @@ and a.payment_date = #{paymentDate} + + and a.performance_deadline = #{performanceDeadline} + and a.payment_address like concat ('%', #{paymentAddress}, '%') @@ -68,6 +71,9 @@ and a.contract_status like concat ('%', #{contractStatus}, '%') + + and a.contract_text like concat ('%', #{contractText}, '%') +