员工采购

This commit is contained in:
wkc
2026-02-06 17:22:59 +08:00
parent b38c1121e6
commit f659913b2f
12 changed files with 1372 additions and 70 deletions

View File

@@ -9,8 +9,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
/**
* 员工采购交易信息对象 ccdi_purchase_transaction
@@ -77,31 +76,31 @@ public class CcdiPurchaseTransaction implements Serializable {
private String supplierBankAccount;
/** 采购申请日期 */
private LocalDate applyDate;
private Date applyDate;
/** 采购计划批准日期 */
private LocalDate planApproveDate;
private Date planApproveDate;
/** 采购公告发布日期 */
private LocalDate announceDate;
private Date announceDate;
/** 开标日期 */
private LocalDate bidOpenDate;
private Date bidOpenDate;
/** 合同签订日期 */
private LocalDate contractSignDate;
private Date contractSignDate;
/** 预计交货日期 */
private LocalDate expectedDeliveryDate;
private Date expectedDeliveryDate;
/** 实际交货日期 */
private LocalDate actualDeliveryDate;
private Date actualDeliveryDate;
/** 验收日期 */
private LocalDate acceptanceDate;
private Date acceptanceDate;
/** 结算日期 */
private LocalDate settlementDate;
private Date settlementDate;
/** 申请人工号 */
private String applicantId;
@@ -123,11 +122,11 @@ public class CcdiPurchaseTransaction implements Serializable {
/** 创建时间 */
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
private Date createTime;
/** 更新时间 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
private Date updateTime;
/** 创建人 */
@TableField(fill = FieldFill.INSERT)

View File

@@ -2,17 +2,13 @@ package com.ruoyi.ccdi.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
/**
* 采购交易信息新增DTO
@@ -121,47 +117,47 @@ public class CcdiPurchaseTransactionAddDTO implements Serializable {
@NotNull(message = "采购申请日期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "采购申请日期")
private LocalDate applyDate;
private Date applyDate;
/** 采购计划批准日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "采购计划批准日期")
private LocalDate planApproveDate;
private Date planApproveDate;
/** 采购公告发布日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "采购公告发布日期")
private LocalDate announceDate;
private Date announceDate;
/** 开标日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "开标日期")
private LocalDate bidOpenDate;
private Date bidOpenDate;
/** 合同签订日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "合同签订日期")
private LocalDate contractSignDate;
private Date contractSignDate;
/** 预计交货日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "预计交货日期")
private LocalDate expectedDeliveryDate;
private Date expectedDeliveryDate;
/** 实际交货日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "实际交货日期")
private LocalDate actualDeliveryDate;
private Date actualDeliveryDate;
/** 验收日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "验收日期")
private LocalDate acceptanceDate;
private Date acceptanceDate;
/** 结算日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "结算日期")
private LocalDate settlementDate;
private Date settlementDate;
/** 申请人工号 */
@NotBlank(message = "申请人工号不能为空")

View File

@@ -2,17 +2,13 @@ package com.ruoyi.ccdi.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
/**
* 采购交易信息编辑DTO
@@ -121,47 +117,47 @@ public class CcdiPurchaseTransactionEditDTO implements Serializable {
@NotNull(message = "采购申请日期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "采购申请日期")
private LocalDate applyDate;
private Date applyDate;
/** 采购计划批准日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "采购计划批准日期")
private LocalDate planApproveDate;
private Date planApproveDate;
/** 采购公告发布日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "采购公告发布日期")
private LocalDate announceDate;
private Date announceDate;
/** 开标日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "开标日期")
private LocalDate bidOpenDate;
private Date bidOpenDate;
/** 合同签订日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "合同签订日期")
private LocalDate contractSignDate;
private Date contractSignDate;
/** 预计交货日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "预计交货日期")
private LocalDate expectedDeliveryDate;
private Date expectedDeliveryDate;
/** 实际交货日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "实际交货日期")
private LocalDate actualDeliveryDate;
private Date actualDeliveryDate;
/** 验收日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "验收日期")
private LocalDate acceptanceDate;
private Date acceptanceDate;
/** 结算日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "结算日期")
private LocalDate settlementDate;
private Date settlementDate;
/** 申请人工号 */
@NotBlank(message = "申请人工号不能为空")

View File

@@ -6,7 +6,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date;
/**
* 采购交易信息查询DTO
@@ -40,10 +40,10 @@ public class CcdiPurchaseTransactionQueryDTO implements Serializable {
/** 申请日期-开始 */
@Schema(description = "申请日期-开始")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate applyDateStart;
private Date applyDateStart;
/** 申请日期-结束 */
@Schema(description = "申请日期-结束")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate applyDateEnd;
private Date applyDateEnd;
}

View File

@@ -7,7 +7,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
/**
* 采购交易信息VO
@@ -93,47 +93,47 @@ public class CcdiPurchaseTransactionVO implements Serializable {
/** 采购申请日期(或立项日期) */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "采购申请日期")
private LocalDate applyDate;
private Date applyDate;
/** 采购计划批准日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "采购计划批准日期")
private LocalDate planApproveDate;
private Date planApproveDate;
/** 采购公告发布日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "采购公告发布日期")
private LocalDate announceDate;
private Date announceDate;
/** 开标日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "开标日期")
private LocalDate bidOpenDate;
private Date bidOpenDate;
/** 合同签订日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "合同签订日期")
private LocalDate contractSignDate;
private Date contractSignDate;
/** 预计交货日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "预计交货日期")
private LocalDate expectedDeliveryDate;
private Date expectedDeliveryDate;
/** 实际交货日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "实际交货日期")
private LocalDate actualDeliveryDate;
private Date actualDeliveryDate;
/** 验收日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "验收日期")
private LocalDate acceptanceDate;
private Date acceptanceDate;
/** 结算日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "结算日期")
private LocalDate settlementDate;
private Date settlementDate;
/** 申请人工号 */
@Schema(description = "申请人工号")