Commit 26b12795 by jianshuqin

申请费用计划单 增加所属账期和所属项目

parent 0ebda317
......@@ -2,10 +2,12 @@ package com.bailuntec.cost.api.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
......@@ -56,4 +58,10 @@ public class CostDetailDto {
private String projectType;
@ApiModelProperty("客户编号")
private String customerNum;
@ApiModelProperty("所属项目")
private String project;
@ApiModelProperty("所属账期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date projectDate;
}
package com.bailuntec.cost.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class CostPlanTempDto {
......@@ -20,6 +22,9 @@ public class CostPlanTempDto {
private String typeNo; // 大类编号
private String typeNameDto; // 大类标题
private String dic; // 币种
private String project; // 所属项目
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date projectDate; // 所属账期
@ApiModelProperty("会计一级科目")
private String accountingSubjectNo;
......
......@@ -13,6 +13,7 @@ import lombok.Data;
import org.springframework.beans.BeanUtils;
import java.math.BigDecimal;
import java.util.Date;
@TableName("cost_plan_temp")
......@@ -34,6 +35,10 @@ public class CostPlanTempDomain {
private String costReason;
// 币种
private String dic;
// 所属项目
private String project;
// 所属账期
private Date projectDate;
@ApiModelProperty("类型编号")
private Integer typeId;
......
......@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
@TableName("cost_detail")
......@@ -63,6 +64,10 @@ public class CostDetailDomain {
@ApiModelProperty("客户编号")
private String customerNum;
@ApiModelProperty("所属项目")
private String project;
@ApiModelProperty("所属账期")
private Date projectDate;
public CostDetailDto castToDto() {
CostDetailDto costDetailDto = new CostDetailDto();
......
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