项目批量上传添加项目定义号和施工单位

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/ImportBRuralProjectRecords.java

@@ -38,6 +38,8 @@ public class ImportBRuralProjectRecords extends ActEntity<ImportBRuralProjectRec
 	private String reviewerPerson;//审核人名称
 	private String reviewerPersonId;//审核人
 	private String companyType;//单位编号（1：赣能；0：东兴）
+	private String constructionUnit; //施工单位
+	private String projectDefinitionId; //项目定义号
 
 	//@ExcelField(title="是否有合同", align=2, sort=1)
 	public String getWhetherContract() {
@@ -51,28 +53,28 @@ public class ImportBRuralProjectRecords extends ActEntity<ImportBRuralProjectRec
 	public String getProjectName() {
 		return projectName;
 	}
-	@ExcelField(title="项目所在地", align=2, sort=3)
+	@ExcelField(title="项目所在地", align=2, sort=5)
 	public String getAreaName() {
 		return areaName;
 	}
 
-	@ExcelField(title="投资性质", align=2, sort=4)
+	@ExcelField(title="投资性质", align=2, sort=6)
 	public String getProjectProperties() {
 		return projectProperties;
 	}
 
-	@ExcelField(title="建设地点", align=2, sort=5)
+	@ExcelField(title="建设地点", align=2, sort=7)
 	public String getProjectSite() {
 		return projectSite;
 	}
-	@ExcelField(title="项目责任人", align=2, sort=6)
+	@ExcelField(title="项目责任人", align=2, sort=8)
 	public String getLeaderName() {
 		return leaderName;
 	}
 	public String 	getProjectMasterName() {
 		return projectMasterName;
 	}
-	@ExcelField(title="工程类型名称", align=2, sort=8)
+	@ExcelField(title="工程类型名称", align=2, sort=10)
 	public String getEngineeringName() {
 		return engineeringName;
 	}
@@ -83,15 +85,15 @@ public class ImportBRuralProjectRecords extends ActEntity<ImportBRuralProjectRec
 	public BigDecimal getSubmitScale() {
 		return submitScale;
 	}
-	@ExcelField(title="项目开始日期", align=2, sort=10)
+	@ExcelField(title="项目开始日期", align=2, sort=12)
 	public Date getBeginDate() {
 		return beginDate;
 	}
-	@ExcelField(title="项目结束日期", align=2, sort=11)
+	@ExcelField(title="项目结束日期", align=2, sort=13)
 	public Date getEndDate() {
 		return endDate;
 	}
-	@ExcelField(title="项目类别", align=2, sort=12)
+	@ExcelField(title="项目类别", align=2, sort=14)
 	public String getAttachmentProjectSort() {
 		return attachmentProjectSort;
 	}
@@ -100,16 +102,34 @@ public class ImportBRuralProjectRecords extends ActEntity<ImportBRuralProjectRec
 		return clientNumber;
 	}
 
-	@ExcelField(title="送审规模", align=2, sort=9)
+	@ExcelField(title="送审规模", align=2, sort=11)
 	public String getSubmitScaleStr() {
 		return submitScaleStr;
 	}
 
-	@ExcelField(title="项目审核人", align=2, sort=7)
+	@ExcelField(title="项目审核人", align=2, sort=9)
 	public String getReviewerPerson() {
 		return reviewerPerson;
 	}
 
+	@ExcelField(title="施工单位", align=2, sort=4)
+	public String getConstructionUnit() {
+		return constructionUnit;
+	}
+
+	@ExcelField(title="项目定义号", align=2, sort=3)
+	public String getProjectDefinitionId() {
+		return projectDefinitionId;
+	}
+
+	public void setConstructionUnit(String constructionUnit) {
+		this.constructionUnit = constructionUnit;
+	}
+
+	public void setProjectDefinitionId(String projectDefinitionId) {
+		this.projectDefinitionId = projectDefinitionId;
+	}
+
 	public void setReviewerPerson(String reviewerPerson) {
 		this.reviewerPerson = reviewerPerson;
 	}

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -3042,6 +3042,10 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				projectRecords.setProjectStatus(1);
 				//填入项目名称
 				projectRecords.setProjectName(importBRuralProjectRecords.getProjectName());
+				//项目定义号
+				projectRecords.setProjectDefinitionId(importBRuralProjectRecords.getProjectDefinitionId());
+				//施工单位
+				projectRecords.setConstructionUnit(importBRuralProjectRecords.getConstructionUnit());
 
 				if(null != importBRuralProjectRecords.getBeginDate() && null != importBRuralProjectRecords.getEndDate()){
 					int compareTo = importBRuralProjectRecords.getEndDate().compareTo(importBRuralProjectRecords.getBeginDate());