修改日期
This commit is contained in:
@ -1,14 +1,14 @@
|
|||||||
package org.dromara.xzd.domain;
|
package org.dromara.xzd.domain;
|
||||||
|
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合作协议对象 xzd_contract_agreement
|
* 合作协议对象 xzd_contract_agreement
|
||||||
@ -43,7 +43,7 @@ public class XzdContractAgreement extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 单据日期
|
* 单据日期
|
||||||
*/
|
*/
|
||||||
private Date documentDate;
|
private LocalDate documentDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 甲方单位
|
* 甲方单位
|
||||||
@ -68,7 +68,7 @@ public class XzdContractAgreement extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 签订日期
|
* 签订日期
|
||||||
*/
|
*/
|
||||||
private Date signingDate;
|
private LocalDate signingDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合同含税总金额
|
* 合同含税总金额
|
||||||
@ -88,12 +88,12 @@ public class XzdContractAgreement extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 开始日期
|
* 开始日期
|
||||||
*/
|
*/
|
||||||
private Date startDate;
|
private LocalDate startDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 结束日期
|
* 结束日期
|
||||||
*/
|
*/
|
||||||
private Date endDate;
|
private LocalDate endDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 支付条款
|
* 支付条款
|
||||||
|
|||||||
@ -1,16 +1,17 @@
|
|||||||
package org.dromara.xzd.domain.bo;
|
package org.dromara.xzd.domain.bo;
|
||||||
|
|
||||||
import org.dromara.xzd.domain.XzdContractAgreement;
|
|
||||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import org.dromara.common.core.validate.AddGroup;
|
|
||||||
import org.dromara.common.core.validate.EditGroup;
|
|
||||||
import io.github.linpeilie.annotations.AutoMapper;
|
import io.github.linpeilie.annotations.AutoMapper;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import jakarta.validation.constraints.*;
|
import org.dromara.common.core.validate.AddGroup;
|
||||||
|
import org.dromara.common.core.validate.EditGroup;
|
||||||
|
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||||
|
import org.dromara.xzd.domain.XzdContractAgreement;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合作协议业务对象 xzd_contract_agreement
|
* 合作协议业务对象 xzd_contract_agreement
|
||||||
@ -41,8 +42,8 @@ public class XzdContractAgreementBo extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 单据日期
|
* 单据日期
|
||||||
*/
|
*/
|
||||||
@NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class })
|
@NotNull(message = "单据日期不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||||
private Date documentDate;
|
private LocalDate documentDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 甲方单位
|
* 甲方单位
|
||||||
@ -68,7 +69,7 @@ public class XzdContractAgreementBo extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 签订日期
|
* 签订日期
|
||||||
*/
|
*/
|
||||||
private Date signingDate;
|
private LocalDate signingDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合同含税总金额
|
* 合同含税总金额
|
||||||
@ -78,7 +79,7 @@ public class XzdContractAgreementBo extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 协议类型
|
* 协议类型
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "协议类型不能为空", groups = { AddGroup.class, EditGroup.class })
|
@NotBlank(message = "协议类型不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||||
private String agreementType;
|
private String agreementType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -94,12 +95,12 @@ public class XzdContractAgreementBo extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 开始日期
|
* 开始日期
|
||||||
*/
|
*/
|
||||||
private Date startDate;
|
private LocalDate startDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 结束日期
|
* 结束日期
|
||||||
*/
|
*/
|
||||||
private Date endDate;
|
private LocalDate endDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 支付条款
|
* 支付条款
|
||||||
|
|||||||
@ -1,18 +1,17 @@
|
|||||||
package org.dromara.xzd.domain.vo;
|
package org.dromara.xzd.domain.vo;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
import org.dromara.xzd.domain.XzdContractAgreement;
|
|
||||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
|
||||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
|
||||||
import io.github.linpeilie.annotations.AutoMapper;
|
import io.github.linpeilie.annotations.AutoMapper;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||||
|
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||||
|
import org.dromara.xzd.domain.XzdContractAgreement;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -51,7 +50,7 @@ public class XzdContractAgreementVo implements Serializable {
|
|||||||
* 单据日期
|
* 单据日期
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "单据日期")
|
@ExcelProperty(value = "单据日期")
|
||||||
private Date documentDate;
|
private LocalDate documentDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 甲方单位
|
* 甲方单位
|
||||||
@ -90,7 +89,7 @@ public class XzdContractAgreementVo implements Serializable {
|
|||||||
* 签订日期
|
* 签订日期
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "签订日期")
|
@ExcelProperty(value = "签订日期")
|
||||||
private Date signingDate;
|
private LocalDate signingDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合同含税总金额
|
* 合同含税总金额
|
||||||
@ -119,13 +118,13 @@ public class XzdContractAgreementVo implements Serializable {
|
|||||||
* 开始日期
|
* 开始日期
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "开始日期")
|
@ExcelProperty(value = "开始日期")
|
||||||
private Date startDate;
|
private LocalDate startDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 结束日期
|
* 结束日期
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "结束日期")
|
@ExcelProperty(value = "结束日期")
|
||||||
private Date endDate;
|
private LocalDate endDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 支付条款
|
* 支付条款
|
||||||
|
|||||||
Reference in New Issue
Block a user