Merge remote-tracking branch 'origin/master'

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

@@ -380,6 +380,17 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String batchArchiveStatus;  //批量归档状态（6：超期未归档；7：超期已归档）
 	private String overBatchArchiveStatus;  //批量归档超期状态（0：未超期；1：已超期）
 
+	private Date reportBeginDate;		//质量复核审核开始时间
+	private Date reportEndDate;			//质量复核审核结束时间
+	private Date reportTwoBeginDate;	//报告签发审核开始时间
+	private Date reportTwoEndDate;		//报告签发审核结束时间
+	private Date reportRecordBeginDate;	//电子归档审核开始时间
+	private Date reportRecordEndDate;	//电子归档审核结束时间
+	private Date paperRecordBeginDate;	//纸质归档审核开始时间
+	private Date paperRecordEndDate;	//纸质归档审核结束时间
+	private Date reportedBeginDate;		//上报审核开始时间
+	private Date reportedEndDate;		//上报审核结束时间
+
 
 
 	private List<String> civilProjectList = Lists.newArrayList();
@@ -2435,4 +2446,84 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setFilingBatchAuditPassDate(Date filingBatchAuditPassDate) {
 		this.filingBatchAuditPassDate = filingBatchAuditPassDate;
 	}
+
+	public Date getReportBeginDate() {
+		return reportBeginDate;
+	}
+
+	public void setReportBeginDate(Date reportBeginDate) {
+		this.reportBeginDate = reportBeginDate;
+	}
+
+	public Date getReportEndDate() {
+		return reportEndDate;
+	}
+
+	public void setReportEndDate(Date reportEndDate) {
+		this.reportEndDate = reportEndDate;
+	}
+
+	public Date getReportTwoBeginDate() {
+		return reportTwoBeginDate;
+	}
+
+	public void setReportTwoBeginDate(Date reportTwoBeginDate) {
+		this.reportTwoBeginDate = reportTwoBeginDate;
+	}
+
+	public Date getReportTwoEndDate() {
+		return reportTwoEndDate;
+	}
+
+	public void setReportTwoEndDate(Date reportTwoEndDate) {
+		this.reportTwoEndDate = reportTwoEndDate;
+	}
+
+	public Date getReportRecordBeginDate() {
+		return reportRecordBeginDate;
+	}
+
+	public void setReportRecordBeginDate(Date reportRecordBeginDate) {
+		this.reportRecordBeginDate = reportRecordBeginDate;
+	}
+
+	public Date getReportRecordEndDate() {
+		return reportRecordEndDate;
+	}
+
+	public void setReportRecordEndDate(Date reportRecordEndDate) {
+		this.reportRecordEndDate = reportRecordEndDate;
+	}
+
+	public Date getPaperRecordBeginDate() {
+		return paperRecordBeginDate;
+	}
+
+	public void setPaperRecordBeginDate(Date paperRecordBeginDate) {
+		this.paperRecordBeginDate = paperRecordBeginDate;
+	}
+
+	public Date getPaperRecordEndDate() {
+		return paperRecordEndDate;
+	}
+
+	public void setPaperRecordEndDate(Date paperRecordEndDate) {
+		this.paperRecordEndDate = paperRecordEndDate;
+	}
+
+	public Date getReportedBeginDate() {
+		return reportedBeginDate;
+	}
+
+	public void setReportedBeginDate(Date reportedBeginDate) {
+		this.reportedBeginDate = reportedBeginDate;
+	}
+
+	public Date getReportedEndDate() {
+		return reportedEndDate;
+	}
+
+	public void setReportedEndDate(Date reportedEndDate) {
+		this.reportedEndDate = reportedEndDate;
+	}
 }

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

@@ -5733,6 +5733,13 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 
     public ProjectMaterialDefectRecord getDeficiencyRemarks(String reportId){
         ProjectMaterialDefectRecord deficiencyRemarks = dao.getDeficiencyRemarks(reportId);
+        if (deficiencyRemarks!=null && StringUtils.isNotBlank(deficiencyRemarks.getId())){
+            Workattachment workattachment = new Workattachment();
+            workattachment.setAttachmentId(deficiencyRemarks.getId());
+            workattachment.setAttachmentFlag("99");
+            deficiencyRemarks.setWorkAttachments(workattachmentService.findList(workattachment));
+            workattachmentService.attachmentManageOnUrl(deficiencyRemarks.getWorkAttachments());
+        }
         return deficiencyRemarks;
     }
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -1237,7 +1237,7 @@ public class RuralProjectViewController extends BaseController {
             }
         }
 
-        if(StringUtils.isNotBlank(paperFiling.getProcessInstanceId())){
+        if(null != paperFiling && StringUtils.isNotBlank(paperFiling.getProcessInstanceId())){
             WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(paperFiling.getProcessInstanceId());
             if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
                 model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -1119,6 +1119,13 @@ public class WorkFullManageController extends BaseController {
 			if(consultant.getZixunyuan().equals(currentConsultant.getZixunyuan())){
 				try {
 					MyBeanUtils.copyBeanNotNull2Bean( currentConsultant,consultant);
+					if(null != consultants && consultants.size()>0){
+						for (RuralReportConsultant consultantInfo : consultants) {
+							if(StringUtils.isBlank(consultantInfo.getAuditOpinion()) && consultantInfo.getZixunyuan().equals(consultant.getZixunyuan())){
+								consultantInfo.setAuditOpinion(consultant.getAuditOpinion());
+							}
+						}
+					}
 				} catch (Exception e) {
 					e.printStackTrace();
 				}

src/main/resources/freemarker/issueProcess.ftl

@@ -590,7 +590,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="eastAsia"/>
                                         </w:rPr>
-                                        <w:t>技术负责人意见</w:t>
+                                        <w:t>技术负责人（或专业负责人）意见</w:t>
                                     </w:r>
                                 </w:p>
                                 <w:p w:rsidR="00000000" w:rsidRDefault="00C962B1"/>

src/main/resources/jeeplus.properties

@@ -7,7 +7,7 @@ jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
 #jdbc.url=jdbc:mysql://192.168.2.4:3306/simple_xg_total_process?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://127.0.0.1:3306/new_ccpm_2?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://127.0.0.1:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=root
 #jdbc.password=root

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

@@ -556,6 +556,60 @@ END) as projectScale*/
 			<if test="endDate !=null">
 				AND a.create_date &lt; #{endDate}
 			</if>
+			<!-- 质量复核审核时间 -->
+			<if test="reportBeginDate !=null">
+				AND prd.audit_pass_date >= #{reportBeginDate}
+			</if>
+			<if test="reportEndDate !=null">
+				AND prd.audit_pass_date &lt;= #{reportEndDate}
+			</if>
+			<if test="reportBeginDate !=null or reportEndDate !=null">
+				AND prd.status in (5,7)
+			</if>
+			<!-- 报告签发审核时间 -->
+			<if test="reportTwoBeginDate !=null">
+				AND prdt.audit_pass_date >= #{reportTwoBeginDate}
+			</if>
+			<if test="reportTwoEndDate !=null">
+				AND prdt.audit_pass_date &lt;= #{reportTwoEndDate}
+			</if>
+			<if test="reportTwoBeginDate !=null or reportTwoEndDate !=null">
+				AND prdt.status in (5,7)
+			</if>
+			<!-- 电子归档审核时间 -->
+			<if test="reportRecordBeginDate !=null">
+				AND prr.accomplish_date >= #{reportRecordBeginDate}
+			</if>
+			<if test="reportRecordEndDate !=null">
+				AND prr.accomplish_date &lt;= #{reportRecordEndDate}
+			</if>
+			<if test="reportRecordBeginDate !=null or reportRecordEndDate !=null">
+				AND prr.status in (5,7)
+			</if>
+			<!-- 纸质归档审核时间 -->
+			<if test="paperRecordBeginDate !=null">
+				and (pfp.audit_pass_date >= #{paperRecordBeginDate}
+				or ppf.audit_pass_date >= #{paperRecordBeginDate})
+			</if>
+			<if test="paperRecordEndDate !=null">
+				and (pfp.audit_pass_date &lt;= #{paperRecordEndDate}
+				or ppf.audit_pass_date &lt;= #{paperRecordEndDate})
+			</if>
+			<if test="paperRecordBeginDate !=null or paperRecordBeginDate !=null">
+				AND (ppf.status in (5,7) or pfp.status in (5,7))
+			</if>
+			<!-- 上报审核时间 -->
+			<if test="reportedBeginDate !=null">
+				AND rprr.accomplish_date >= #{reportedBeginDate}
+			</if>
+			<if test="reportedEndDate !=null">
+				AND rprr.accomplish_date &lt;= #{reportedEndDate}
+			</if>
+			<if test="reportedBeginDate !=null or reportedEndDate !=null">
+				AND a.reported_state in (5,7)
+			</if>
+
+
 			<if test="attachmentProjectSort !=null and attachmentProjectSort != ''">
 				AND a.attachment_project_sort = #{attachmentProjectSort}
 			</if>
@@ -956,6 +1010,60 @@ END) as projectScale*/
 			<if test="endDate !=null">
 				AND a.create_date &lt; #{endDate}
 			</if>
+			<!-- 质量复核审核时间 -->
+			<if test="reportBeginDate !=null">
+				AND prd.audit_pass_date >= #{reportBeginDate}
+			</if>
+			<if test="reportEndDate !=null">
+				AND prd.audit_pass_date &lt;= #{reportEndDate}
+			</if>
+			<if test="reportBeginDate !=null or reportEndDate !=null">
+				AND prd.status in (5,7)
+			</if>
+			<!-- 报告签发审核时间 -->
+			<if test="reportTwoBeginDate !=null">
+				AND prdt.audit_pass_date >= #{reportTwoBeginDate}
+			</if>
+			<if test="reportTwoEndDate !=null">
+				AND prdt.audit_pass_date &lt;= #{reportTwoEndDate}
+			</if>
+			<if test="reportTwoBeginDate !=null or reportTwoEndDate !=null">
+				AND prdt.status in (5,7)
+			</if>
+			<!-- 电子归档审核时间 -->
+			<if test="reportRecordBeginDate !=null">
+				AND prr.accomplish_date >= #{reportRecordBeginDate}
+			</if>
+			<if test="reportRecordEndDate !=null">
+				AND prr.accomplish_date &lt;= #{reportRecordEndDate}
+			</if>
+			<if test="reportRecordBeginDate !=null or reportRecordEndDate !=null">
+				AND prr.status in (5,7)
+			</if>
+			<!-- 纸质归档审核时间 -->
+			<if test="paperRecordBeginDate !=null">
+				and (pfp.audit_pass_date >= #{paperRecordBeginDate}
+				or ppf.audit_pass_date >= #{paperRecordBeginDate})
+			</if>
+			<if test="paperRecordEndDate !=null">
+				and (pfp.audit_pass_date &lt;= #{paperRecordEndDate}
+				or ppf.audit_pass_date &lt;= #{paperRecordEndDate})
+			</if>
+			<if test="paperRecordBeginDate !=null or paperRecordBeginDate !=null">
+				AND (ppf.status in (5,7) or pfp.status in (5,7))
+			</if>
+			<!-- 上报审核时间 -->
+			<if test="reportedBeginDate !=null">
+				AND rprr.accomplish_date >= #{reportedBeginDate}
+			</if>
+			<if test="reportedEndDate !=null">
+				AND rprr.accomplish_date &lt;= #{reportedEndDate}
+			</if>
+			<if test="reportedBeginDate !=null or reportedEndDate !=null">
+				AND a.reported_state in (5,7)
+			</if>
+
+
 			<if test="attachmentProjectSort !=null and attachmentProjectSort != ''">
 				AND a.attachment_project_sort = #{attachmentProjectSort}
 			</if>
@@ -1217,9 +1325,9 @@ END) as projectScale*/
 		left join case_base cb on a.id = cb.project_id
 		/*LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id*/
 		left join
-		(select id,status,project_id,filing_batch from
+		(select id,status,project_id,filing_batch,audit_pass_date from
 		(
-		select id,create_date,status,project_id,filing_batch
+		select id,create_date,status,project_id,filing_batch,audit_pass_date
 		from project_flingbatch_relation order by create_date desc
 		)z
 		group by z.project_id desc
@@ -1296,6 +1404,60 @@ END) as projectScale*/
 			<if test="endDate !=null">
 				AND a.create_date &lt; #{endDate}
 			</if>
+
+			<!-- 质量复核审核时间 -->
+			<if test="reportBeginDate !=null">
+				AND prd.audit_pass_date >= #{reportBeginDate}
+			</if>
+			<if test="reportEndDate !=null">
+				AND prd.audit_pass_date &lt; #{reportEndDate}
+			</if>
+			<if test="reportBeginDate !=null or reportEndDate !=null">
+				AND prd.status in (5,7)
+			</if>
+			<!-- 报告签发审核时间 -->
+			<if test="reportTwoBeginDate !=null">
+				AND prdt.audit_pass_date >= #{reportTwoBeginDate}
+			</if>
+			<if test="reportTwoEndDate !=null">
+				AND prdt.audit_pass_date &lt; #{reportTwoEndDate}
+			</if>
+			<if test="reportTwoBeginDate !=null or reportTwoEndDate !=null">
+				AND prdt.status in (5,7)
+			</if>
+			<!-- 电子归档审核时间 -->
+			<if test="reportRecordBeginDate !=null">
+				AND prr.accomplish_date >= #{reportRecordBeginDate}
+			</if>
+			<if test="reportRecordEndDate !=null">
+				AND prr.accomplish_date &lt; #{reportRecordEndDate}
+			</if>
+			<if test="reportRecordBeginDate !=null or reportRecordEndDate !=null">
+				AND prr.status in (5,7)
+			</if>
+			<!-- 纸质归档审核时间 -->
+			<if test="paperRecordBeginDate !=null">
+				and (pfp.audit_pass_date >= #{paperRecordBeginDate}
+				or ppf.audit_pass_date >= #{paperRecordBeginDate})
+			</if>
+			<if test="paperRecordEndDate !=null">
+				and (pfp.audit_pass_date &lt;= #{paperRecordEndDate}
+				or ppf.audit_pass_date &lt;= #{paperRecordEndDate})
+			</if>
+			<if test="paperRecordBeginDate !=null or paperRecordBeginDate !=null">
+				AND (ppf.status in (5,7) or pfp.status in (5,7))
+			</if>
+			<!-- 上报审核时间 -->
+			<if test="reportedBeginDate !=null">
+				AND rprr.accomplish_date >= #{reportedBeginDate}
+			</if>
+			<if test="reportedEndDate !=null">
+				AND rprr.accomplish_date &lt; #{reportedEndDate}
+			</if>
+			<if test="reportedBeginDate !=null or reportedEndDate !=null">
+				AND a.reported_state in (5,7)
+			</if>
+
 			<if test="attachmentProjectSort !=null and attachmentProjectSort != ''">
 				AND a.attachment_project_sort = #{attachmentProjectSort}
 			</if>

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingAudit.jsp

@@ -891,7 +891,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -1105,7 +1105,7 @@
 					<c:if test="${projectRecords.submitMoney=='2'}">
 						<div class="form-group layui-row first lw12">
 							<div class="form-group-label">
-								<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+								<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 								<h2>质量复核信息</h2>
 							</div>
 							<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -800,7 +800,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp

@@ -1752,7 +1752,7 @@
             <div class="form-group layui-row first hide" id="qualityView">
                 <div class="form-group layui-row first lw12">
                     <div class="form-group-label">
-                        <div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+                        <div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
                         <h2>质量复核信息</h2>
                     </div>
                     <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1590,7 +1590,7 @@
 				<input type="hidden" id="status" value="${projectReportData.status}">
 				<div class="form-group layui-row first lw12">
 					<div class="form-group-label">
-						<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+						<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 						<h2>质量复核信息</h2>
 					</div>
 					<div class="layui-item layui-col-sm6">

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

@@ -1420,7 +1420,7 @@
 						} else{
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
-						if(noArchivedDays != null && noArchivedDays != undefined && '' != noArchivedDays){
+						if(noArchivedDays != null && noArchivedDays != undefined && '' != noArchivedDays && 5 != d.projectReportRecordStatus){
 							// return "<font style = 'margin-left: 5px;' class='layui-badge layui-bg-orange'>"+noArchivedDays + '天'+"</font>";
 							xml+="<span style='margin-left: 5px;' title='超期天数'>" + noArchivedDays + "天" + "</span>";
 						}else{
@@ -1464,8 +1464,16 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
+							if (d.submitMoney=="1"){
+								if(5 != d.downProjectReportRecordStatus){
+									xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
+								}
+							}else if (d.submitMoney=="2"){
+								if(5 != d.paperFilingStatus){
+									xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
+								}
+							}
 							// return "<font style = 'font-size:14px;font-weight:500;'>"+paperNoArchivedDays + '天'+"</font>";
-							xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
 						}else{
 							// return "<font style = 'font-size:14px;font-weight:500;'></font>";
 						}

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -889,7 +889,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectRepordDescriptionAudit.jsp

@@ -1237,7 +1237,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordAudit.jsp

@@ -830,7 +830,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsCaseAudit.jsp

@@ -970,7 +970,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsCaseModify.jsp

@@ -919,7 +919,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -1587,7 +1587,7 @@
 				<input type="hidden" id="status" value="${projectReportData.status}">
 				<div class="form-group layui-row first lw12">
 					<div class="form-group-label">
-						<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+						<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 						<h2>质量复核信息</h2>
 					</div>
 					<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -36,6 +36,72 @@
 				type : 'date'
 				, trigger: 'click'
 			});
+
+			laydate.render({
+				elem: '#reportBeginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#reportEndDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+
+			laydate.render({
+				elem: '#reportTwoBeginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#reportTwoEndDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+
+			laydate.render({
+				elem: '#reportRecordBeginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#reportRecordEndDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+
+			laydate.render({
+				elem: '#paperRecordBeginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#paperRecordEndDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+
+			laydate.render({
+				elem: '#reportedBeginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#reportedEndDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 				form.on('switch(reportSwitch)',function(data){
@@ -912,6 +978,71 @@
 								</form:select>
 							</div>
 						</div>
+
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">质量复核：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<input id="reportBeginDate" name="reportBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.reportBeginDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="reportEndDate" name="reportEndDate" placeholder="审核结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.reportEndDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+							</div>
+						</div>
+
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">报告签发：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<input id="reportTwoBeginDate" name="reportTwoBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.reportTwoBeginDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="reportTwoEndDate" name="reportTwoEndDate" placeholder="审核结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.reportTwoEndDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+							</div>
+						</div>
+
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">电子归档：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<input id="reportRecordBeginDate" name="reportRecordBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.reportRecordBeginDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="reportRecordEndDate" name="reportRecordEndDate" placeholder="审核结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.reportRecordEndDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+							</div>
+						</div>
+
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">纸质归档：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<input id="paperRecordBeginDate" name="paperRecordBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.paperRecordBeginDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="paperRecordEndDate" name="paperRecordEndDate" placeholder="审核结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.paperRecordEndDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+							</div>
+						</div>
+
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">上报审核：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<input id="reportedBeginDate" name="reportedBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.reportedBeginDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="reportedEndDate" name="reportedEndDate" placeholder="审核结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.reportedEndDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+							</div>
+						</div>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -1058,7 +1189,7 @@
 						}else{
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
-						if(noArchivedDays != null && noArchivedDays != undefined && '' != noArchivedDays){
+						if(noArchivedDays != null && noArchivedDays != undefined && '' != noArchivedDays && 5 != d.projectReportRecordStatus){
 							xml+="<span style='margin-left: 5px;' title='超期天数'>" + noArchivedDays + "天" + "</span>";
 						}else{
 						}
@@ -1085,16 +1216,25 @@
 						var paperNoArchivedDays=d.paperNoArchivedDays;
 						if(st.action){
 							if (d.submitMoney=="1"){
-								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								var xml = "<span title='纸质归档时间："+ d.filingBatchAuditPassDate +"'  onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 							}else if (d.submitMoney=="2"){
-								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								var xml = "<span title='纸质归档时间："+ d.paperFilingAuditPassDate +"'  onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 							}
 						}else{
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						}
-						if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
-							xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
+						}if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
+							if (d.submitMoney=="1"){
+								if(5 != d.downProjectReportRecordStatus){
+									xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
+								}
+							}else if (d.submitMoney=="2"){
+								if(5 != d.paperFilingStatus){
+									xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
+								}
+							}
+							// return "<font style = 'font-size:14px;font-weight:500;'>"+paperNoArchivedDays + '天'+"</font>";
 						}else{
+							// return "<font style = 'font-size:14px;font-weight:500;'></font>";
 						}
 						return xml;
 					}}
@@ -1295,6 +1435,8 @@
                     ,"caseType":"${projectRecords.caseType}"
                     ,"caseCreateBy":"${projectRecords.caseCreateBy}"
                     ,"caseStatus":"${projectRecords.caseStatus}"
+					,"filingBatchAuditPassDate":"<fmt:formatDate value="${projectRecords.filingBatchAuditPassDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
+					,"paperFilingAuditPassDate":"<fmt:formatDate value="${projectRecords.paperFilingAuditPassDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
 					,"reportAuditDate":"<fmt:formatDate value="${projectRecords.reportAuditDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
 					,"reportTwoAuditDate":"<fmt:formatDate value="${projectRecords.reportTwoAuditDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
 					,"projectReportRecordAuditDate":"<fmt:formatDate value="${projectRecords.projectReportRecordAuditDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp

@@ -1580,7 +1580,7 @@
 				<input type="hidden" id="status" value="${projectReportData.status}">
 				<div class="form-group layui-row first lw12">
 					<div class="form-group-label">
-						<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+						<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 						<h2>质量复核信息</h2>
 					</div>
 					<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageAudit.jsp

@@ -1019,7 +1019,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -1019,7 +1019,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -959,7 +959,7 @@
 				<div class="form-group layui-row first hide" id="qualityView">
 					<div class="form-group layui-row first lw12">
 						<div class="form-group-label">
-							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 							<h2>质量复核信息</h2>
 						</div>
 						<div class="layui-item layui-col-sm6">

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

@@ -823,7 +823,7 @@
             <div class="form-group layui-row first hide" id="qualityView">
                 <div class="form-group layui-row first lw12">
                     <div class="form-group-label">
-                        <div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+                        <div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
                         <h2>质量复核信息</h2>
                     </div>
                     <div class="layui-item layui-col-sm6">

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

@@ -988,7 +988,7 @@
 						}else{
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
-						if(noArchivedDays != null && noArchivedDays != undefined && '' != noArchivedDays){
+						if(noArchivedDays != null && noArchivedDays != undefined && '' != noArchivedDays && 5 != d.projectReportRecordStatus){
 							// return "<font style = 'margin-left: 5px;' class='layui-badge layui-bg-orange'>"+noArchivedDays + '天'+"</font>";
 							xml+="<span style='margin-left: 5px;' title='超期天数' >" + noArchivedDays + "天" + "</span>";
 						}else{
@@ -1024,8 +1024,18 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
-							xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
+							if (d.submitMoney=="1"){
+								if(5 != d.downProjectReportRecordStatus){
+									xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
+								}
+							}else if (d.submitMoney=="2"){
+								if(5 != d.paperFilingStatus){
+									xml+="<span style='margin-left: 5px;' title='超期天数'>" + paperNoArchivedDays + "天" + "</span>";
+								}
+							}
+							// return "<font style = 'font-size:14px;font-weight:500;'>"+paperNoArchivedDays + '天'+"</font>";
 						}else{
+							// return "<font style = 'font-size:14px;font-weight:500;'></font>";
 						}
                         return xml;
                     }}

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -353,7 +353,7 @@
 							</c:if>
 						</c:if>
 					</c:if>
-					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载报告模板</a></div>
 					<h2>质量复核信息</h2>
 				</div>
 				<div class="layui-item layui-col-sm6">