项目管理页面添加质量复核通过时间字段

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

@@ -254,6 +254,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String completionStatus; //完成状态
 
 	private String money; //收费金额
+	private Date prdAuditDate; //报告审批通过时间时间
 
 	private List<String> civilProjectList = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
@@ -1848,4 +1849,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setMoney(String money) {
 		this.money = money;
 	}
+
+	public Date getPrdAuditDate() {
+		return prdAuditDate;
+	}
+
+	public void setPrdAuditDate(Date prdAuditDate) {
+		this.prdAuditDate = prdAuditDate;
+	}
 }

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

@@ -359,6 +359,7 @@
 		,ppf.id as "ppfId"
 		,pfb.process_instance_id AS "filingProcessinstanceId"
 		,ifnull(pfp.status,0) as "filingProjectStatus"
+		,prd.audit_pass_date as "prdAuditDate"
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -714,10 +714,18 @@
 						return "<font style = 'font-size:14px;font-weight:500;'>"+d.client+"</font>";
 					}}
                 ,{field:'createName',align:'center', title: '登记人',  width:80}
-                ,{field: 'createDate', align:'center', title: '创建日期/打包时间',width:100,templet: function(d){
+                ,{field: 'createDate', align:'center', title: '创建日期',width:100,templet: function(d){
 					var date=d.createDate;
 					return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 				}}
+                ,{field: 'prdAuditDate', align:'center', title: '质量复核通过时间',width:140,templet: function(d){
+					var prdAuditDate=d.prdAuditDate;
+					if(prdAuditDate != null && prdAuditDate != undefined && '' != prdAuditDate){
+						return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(prdAuditDate,'yyyy-MM-dd')+"</font>";
+					}else{
+						return "<font style = 'font-size:14px;font-weight:500;'></font>";
+					}
+				}}
 				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
 				}}
@@ -1125,6 +1133,7 @@
 					,"submitMoney":"${projectRecords.submitMoney}"
 					,"newRecordTwoNotifyFlag":"${projectRecords.newRecordTwoNotifyFlag}"
 					,"newRecordNotifyFlag":"${projectRecords.newRecordNotifyFlag}"
+					,"prdAuditDate":"${projectRecords.prdAuditDate}"
 					,"falg":
 					<c:choose>
 						<c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -712,10 +712,18 @@
 						return "<font style = 'font-size:14px;font-weight:500;'>"+d.client+"</font>";
 					}}
 				,{field:'createName',align:'center', title: '登记人',  width:80}
-				,{field: 'createDate', align:'center', title: '创建日期/打包时间',width:100,templet: function(d){
+				,{field: 'createDate', align:'center', title: '创建日期',width:100,templet: function(d){
 						var date=d.createDate;
 						return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 					}}
+				,{field: 'prdAuditDate', align:'center', title: '质量复核通过时间',width:140,templet: function(d){
+						var prdAuditDate=d.prdAuditDate;
+						if(prdAuditDate != null && prdAuditDate != undefined && '' != prdAuditDate){
+							return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(prdAuditDate,'yyyy-MM-dd')+"</font>";
+						}else{
+							return "<font style = 'font-size:14px;font-weight:500;'></font>";
+						}
+					}}
 				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
 					}}
@@ -1127,6 +1135,7 @@
 					,"submitMoney":"${projectRecords.submitMoney}"
 					,"newRecordTwoNotifyFlag":"${projectRecords.newRecordTwoNotifyFlag}"
 					,"newRecordNotifyFlag":"${projectRecords.newRecordNotifyFlag}"
+					,"prdAuditDate":"${projectRecords.prdAuditDate}"
 					,"falg":
 					<c:choose>
 						<c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">