Browse Source

项目导出添加标的额数据列

user5 3 years ago
parent
commit
ebfe4e2d2a

+ 7 - 5
src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -1490,6 +1490,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.adventDateDate = adventDateDate;
 	}
 
+
+	@ExcelField(title="标的额(万元)", align=2, sort=12)
 	public BigDecimal getSubmitScale() {
 		return submitScale;
 	}
@@ -1738,7 +1740,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.proInfos = proInfos;
 	}
 
-	@ExcelField(title="审定价(元)", align=2, sort=13)
+	@ExcelField(title="审定价(元)", align=2, sort=14)
 	public String getApprovalFee() {
 		return approvalFee;
 	}
@@ -1746,7 +1748,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setApprovalFee(String approvalFee) {
 		this.approvalFee = approvalFee;
 	}
-	@ExcelField(title="送审价(元)", align=2, sort=12)
+	@ExcelField(title="送审价(元)", align=2, sort=13)
 	public String getReviewFee() {
 		return reviewFee;
 	}
@@ -1755,7 +1757,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.reviewFee = reviewFee;
 	}
 
-	@ExcelField(title="核增核减额(元)", align=2, sort=14)
+	@ExcelField(title="核增核减额(元)", align=2, sort=15)
 	public String getVerifyFee() {
 		return verifyFee;
 	}
@@ -1764,7 +1766,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.verifyFee = verifyFee;
 	}
 
-	@ExcelField(title="核减率(%)", align=2, sort=15)
+	@ExcelField(title="核减率(%)", align=2, sort=16)
 	public String getVerifyRate() {
 		return verifyRate;
 	}
@@ -1808,7 +1810,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.projectMasterOffice = projectMasterOffice;
 	}
 
-	@ExcelField(title="项目汇总开票金额", align=2, sort=16)
+	@ExcelField(title="项目汇总开票金额", align=2, sort=17)
 	public String getProjectinvoiceMoney() {
 		return projectinvoiceMoney;
 	}

+ 1 - 0
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -319,6 +319,7 @@ END) as projectScale*/
 		<include refid="projectRecordsColumns"/>
 		,a.record_state as "recordState"
 		,a.submit_money as "submitMoney"
+		,a.submit_scale as "submitScale"
 		,(case when a.submit_money = '1' then 'B级' when a.submit_money = '2' then 'A级' else '' end) as projectScale
 		,(case
 		when a.submit_money = '1' and prd.status = '5' then