Forráskód Böngészése

开票_项目中间表

user5 4 éve
szülő
commit
67db70ee70

+ 24 - 15
src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoice.java

@@ -78,6 +78,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	private String cancellationRemark;		// 作废原因
 	private List<WorkInvoiceDetail> workAccountList = Lists.newArrayList();//发票明细
 	private List<WorkInvoiceReceipt> workReceiptList;//收款明细
+	private List<WorkInvoiceProjectRelation> workInvoiceProjectRelationList;//开票和项目关系表
 	private Integer notifyFlag; //代办判定条件
 	private String notifyId; //代办判定条件
 	public String getOfficeId() {
@@ -202,7 +203,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setNumber(String number) {
 		this.number = number;
 	}
-	
+
 	@ExcelField(title="开票单位", fieldType=WorkClientInfo.class, value="client.name",align=2, sort=4)
 	public WorkClientInfo getClient() {
 		return client;
@@ -211,7 +212,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setClient(WorkClientInfo client) {
 		this.client = client;
 	}
-	
+
 	@ExcelField(title="项目名称",align=2, sort=2)
 	public String getProjectName() {
 		return projectName;
@@ -268,7 +269,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setProjectName(String projectName) {
 		this.projectName = projectName;
 	}
-	
+
 	@ExcelField(title="开票金额", align=2, sort=7)
 	public Double getMoney() {
 		return money;
@@ -277,7 +278,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setMoney(Double money) {
 		this.money = money;
 	}
-	
+
 	@ExcelField(title="发票类型", dictType="invoice_type", align=2, sort=10)
 	public String getInvoiceType() {
 		return invoiceType;
@@ -286,7 +287,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setInvoiceType(String invoiceType) {
 		this.invoiceType = invoiceType;
 	}
-	
+
 	@ExcelField(title="收款类型", dictType="charge_type", align=2, sort=9)
 	public String getChargeType() {
 		return chargeType;
@@ -295,7 +296,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setChargeType(String chargeType) {
 		this.chargeType = chargeType;
 	}
-	
+
 	@ExcelField(title="开票内容", dictType="invoice_type", align=2, sort=8)
 	public String getContent() {
 		return content;
@@ -304,7 +305,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setContent(String content) {
 		this.content = content;
 	}
-	
+
 	@ExcelField(title="开票经办人", fieldType=User.class, value="drawer.name", align=2, sort=5)
 	public User getDrawer() {
 		return drawer;
@@ -313,7 +314,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setDrawer(User drawer) {
 		this.drawer = drawer;
 	}
-	
+
 	@ExcelField(title="开票经办人部门", fieldType=Office.class, value="office.name", align=2, sort=6)
 	public Office getOffice() {
 		return office;
@@ -322,7 +323,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setOffice(Office office) {
 		this.office = office;
 	}
-	
+
 	@ExcelField(title="发票编号", align=2, sort=3)
 	public Integer getInvoiceNumber() {
 		return invoiceNumber;
@@ -331,7 +332,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setInvoiceNumber(Integer invoiceNumber) {
 		this.invoiceNumber = invoiceNumber;
 	}
-	
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ExcelField(title="开票日期", align=2, sort=11)
 	public Date getInvoiceDate() {
@@ -341,7 +342,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setInvoiceDate(Date invoiceDate) {
 		this.invoiceDate = invoiceDate;
 	}
-	
+
 	//@ExcelField(title="开票备注", align=2, sort=13)
 	public String getInvoiceRemarks() {
 		return invoiceRemarks;
@@ -350,7 +351,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setInvoiceRemarks(String invoiceRemarks) {
 		this.invoiceRemarks = invoiceRemarks;
 	}
-	
+
 	//@ExcelField(title="是否开票", align=2, sort=14)
 	public String getIsInvoice() {
 		return isInvoice;
@@ -359,7 +360,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setIsInvoice(String isInvoice) {
 		this.isInvoice = isInvoice;
 	}
-	
+
 	@ExcelField(title="收款状态", align=2, sort=13)
 	public String getIsCharge() {
 		return isCharge;
@@ -368,7 +369,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setIsCharge(String isCharge) {
 		this.isCharge = isCharge;
 	}
-	
+
 	//@ExcelField(title="是否作废", align=2, sort=16)
 	public String getIsInvalid() {
 		return isInvalid;
@@ -537,4 +538,12 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setNotifyId(String notifyId) {
 		this.notifyId = notifyId;
 	}
-}
+
+	public List<WorkInvoiceProjectRelation> getWorkInvoiceProjectRelationList() {
+		return workInvoiceProjectRelationList;
+	}
+
+	public void setWorkInvoiceProjectRelationList(List<WorkInvoiceProjectRelation> workInvoiceProjectRelationList) {
+		this.workInvoiceProjectRelationList = workInvoiceProjectRelationList;
+	}
+}

+ 37 - 0
src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoiceProjectRelation.java

@@ -0,0 +1,37 @@
+package com.jeeplus.modules.workinvoice.entity;
+
+import com.jeeplus.common.persistence.DataEntity;
+
+/**
+ * @author: 大猫
+ * @create: 2021-05-11 15:44
+ **/
+public class WorkInvoiceProjectRelation extends DataEntity<WorkInvoice> {
+    private String invoiceId;       //开票编号
+    private String projectId;       //项目编号
+    private String projectName;     //项目名称
+
+    public String getInvoiceId() {
+        return invoiceId;
+    }
+
+    public void setInvoiceId(String invoiceId) {
+        this.invoiceId = invoiceId;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+}