项目档案

src/main/java/org/jeecg/modules/basedata/model/BaseMaterialFileClassificationTree.java

@@ -37,6 +37,7 @@ public class BaseMaterialFileClassificationTree {
     private BaseMaterialFileClassificationTree(){}
 
     public BaseMaterialFileClassificationTree(BaseMaterialFileClassification baseMaterialFileClassification){
+        this.id=baseMaterialFileClassification.getId();
         this.key=baseMaterialFileClassification.getId();
         this.value=baseMaterialFileClassification.getId();
         this.title=baseMaterialFileClassification.getName();

src/main/java/org/jeecg/modules/contract/file/entity/ContractFile.java

@@ -57,8 +57,7 @@ public class ContractFile implements Serializable {
 	@Excel(name = "免费售后起始", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
 	@DateTimeFormat(pattern="yyyy-MM-dd")
-	private java.util.Date
-			freeAfterSalesStart;
+	private java.util.Date freeAfterSalesStart;
 	/**免费售后截至*/
 	@Excel(name = "免费售后截至", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -126,6 +125,8 @@ public class ContractFile implements Serializable {
 	private String salesmanId;
 	/**销售人员名称*/
 	private String salesmanName;
+	/**汇款金额*/
+	private java.math.BigDecimal received;
 
 	/**客户名称*/
 	@TableField(exist = false)
@@ -139,8 +140,9 @@ public class ContractFile implements Serializable {
 	/**客户地址*/
 	@TableField(exist = false)
 	private String fdCustomeraddress;
-	/**汇款金额*/
-	private java.math.BigDecimal received;
+	/**项目立项名称*/
+	@TableField(exist = false)
+private String proName;
 
 	/**合同产品子表*/
 	@TableField(exist = false)

src/main/java/org/jeecg/modules/contract/file/entity/ContractFileModular.java

@@ -70,4 +70,7 @@ public class ContractFileModular implements Serializable {
 	/**主表id*/
 	@Excel(name = "主表id", width = 15)
 	private java.lang.String contractFileId;
+
+	/**物料档案模块id*/
+	private java.lang.String baseMaterialFileModularId;
 }