Merge remote-tracking branch 'origin/master'

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

@@ -304,6 +304,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String caseCreateBy;               //案例项目 创建人id
 	private String caseStatus;				//案例项目的状态
 	private String caseProcessId;			//案例项目的流程id
+	private String ziXunBDE;			//上报中的咨询标的额
 
 
 
@@ -1497,7 +1498,6 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	}
 
 
-	@ExcelField(title="标的额(万元)", align=2, sort=12)
 	public BigDecimal getSubmitScale() {
 		return submitScale;
 	}
@@ -2214,4 +2214,13 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setCaseProcessId(String caseProcessId) {
 		this.caseProcessId = caseProcessId;
 	}
+
+	@ExcelField(title="标的额(万元)", align=2, sort=12)
+	public String getZiXunBDE() {
+		return ziXunBDE;
+	}
+
+	public void setZiXunBDE(String ziXunBDE) {
+		this.ziXunBDE = ziXunBDE;
+	}
 }

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -394,6 +394,7 @@ END) as projectScale*/
 		,cb.case_type as "caseType"
 		,cb.case_create_by as "caseCreateBy"
 		,if(case_status > 0 ,case_status,"0") as "caseStatus"
+		,rprr.ZiXunBDE as "ziXunBDE"
 		FROM rural_project_records a
 		left join case_base cb on a.id = cb.project_id
 		LEFT JOIN sys_area area ON area.id = a.area_id

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.jeeplus.modules.workinvoice.dao.WorkInvoiceDao">
 
 	<sql id="workInvoiceColumns">
-		a.id AS "id",
+		DISTINCT(a.id) AS "id",
 		a.number AS "number",
 		a.process_instance_id AS "processInstanceId",
 		a.client_id AS "client.id",
@@ -913,7 +913,7 @@
 	</select>
 
 	<select id="queryCount" resultType="int" >
-		SELECT count(1)
+		SELECT count(DISTINCT(a.id))
 		FROM work_invoice a
 		<include refid="workInvoiceJoins"/>
 		left join work_invoice_detail wid on a.id = wid.invoice_id