Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java
#	src/main/resources/mappings/modules/projectcontentinfo/ProjectReportRecordDao.xml

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectReportRecordDao.java

@@ -7,6 +7,7 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectMaterialDefectRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -66,4 +67,11 @@ public interface ProjectReportRecordDao extends CrudDao<ProjectReportRecord> {
      * @param projectReportRecord
      */
     void adminModifyRecord(ProjectReportRecord projectReportRecord);
-}
+
+    /**
+     * 项目归档修改项目信息
+     * @param projectRecords
+     * @return
+     */
+    Integer updateReported(RuralProjectRecords projectRecords);
+}

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportRecordService.java

@@ -605,6 +605,20 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 				projectReportData.setFileStatus("3");
 				projectReportDataService.updateFileStatus(projectReportData);
 				projectReportRecord.setStatus("5");
+				//修改审批状态
+				if(!"3".equals(record.getProjectType())){
+
+					//修改项目表中上报状态
+					//判断项目是否超期，如果超期则将上报标志改为超期上报（7） 否则变更为正常上报数据
+					if(1 == record.getOverRecordStatus()){
+						record.setProjectRecordStatus(7);
+						//修改项目归档表中状态
+						projectReportRecord.setStatus("7");
+					}else{
+						record.setProjectRecordStatus(5);
+					}
+
+				}
 				WorkProjectNotify notify = new WorkProjectNotify();
 				notify.setNotifyId(projectReportRecord.getId());
 				userList = workProjectNotifyService.readByNotifyId(notify);
@@ -760,6 +774,8 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		}else if(2 == projectReportRecord.getType()){
 			dao.updateRuralProjectReportRecord(projectReportRecord);
 		}
+		//修改项目表中字段信息
+		dao.updateReported(record);
 		return "保存审核意见成功！";
 	}
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -154,4 +154,36 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
     Integer updateProjectMaster(RuralProjectRecords projectRecords);
+
+
+    /**
+     * 查询即将超期的项目数据信息(紧急项目-电子归档)
+     * @param records
+     * @return
+     */
+    List<RuralProjectRecords> getProjectRecordListByAdventExamine(RuralProjectRecords records);
+
+    /**
+     * 查询即将超期的项目数据信息(非紧急项目-电子归档)
+     * @param records
+     * @return
+     */
+    List<RuralProjectRecords> getProjectRecordListByAdvent(RuralProjectRecords records);
+
+    /**
+     * 查询即将超期的项目数据信息(紧急项目-电子归档)
+     * @param records
+     * @return
+     */
+    List<RuralProjectRecords> getProjectNotrecordListExamine(RuralProjectRecords records);
+    /**
+     * 查询即将超期的项目数据信息(紧急项目-电子归档)
+     * @param records
+     * @return
+     */
+    List<RuralProjectRecords> getProjectNotrecordList(RuralProjectRecords records);
+
+    //批量修改项目归档状态
+    void updateProjectRecordState(@Param("idList") List<String> idList);
+
 }

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

@@ -73,6 +73,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Integer defectRecordStatus; //归档资料缺失说明状态
 	private String pmdrProcessInstanceId; //归档资料缺失说明流程id
 	private String pmdrId; //归档资料缺失说明id
+	private Integer projectRecordStatus; //归档状态(向目标)
+	private Integer overRecordStatus; //超期状态（电子归档）（0：未超期，1：已超期）
 	private Integer downProjectReportRecordStatus; //线下归档状态
 
 	private String prrProcessInstanceId; //线上归档流程号
@@ -1493,6 +1495,22 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.reportedAuditNotifyFlag = reportedAuditNotifyFlag;
 	}
 
+	public Integer getProjectRecordStatus() {
+		return projectRecordStatus;
+	}
+
+	public void setProjectRecordStatus(Integer projectRecordStatus) {
+		this.projectRecordStatus = projectRecordStatus;
+	}
+
+	public Integer getOverRecordStatus() {
+		return overRecordStatus;
+	}
+
+	public void setOverRecordStatus(Integer overRecordStatus) {
+		this.overRecordStatus = overRecordStatus;
+	}
+
 	public Integer getDefectRecordStatus() {
 		return defectRecordStatus;
 	}

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

@@ -275,6 +275,10 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             if(records.getReportedType().equals("1") && records.getReportedState().equals("5") && null != records.getAuditPassDate()){
                 records.setReportedState("7");
             }*/
+
+            if(0 != records.getProjectRecordStatus() && 0 == records.getProjectReportRecordStatus()){
+                records.setProjectReportRecordStatus(records.getProjectRecordStatus());
+            }
         }
         page.setList(recordsList);
         return page;

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

@@ -2205,4 +2205,69 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}
 		}
 	}
+
+
+
+	/**
+	 * 获取项目即将超期还未归档并进行通知（电子归档）
+	 * @return
+	 */
+	@Transactional(readOnly = false)
+	public void saveProjectRecordListByAdvent(){
+		RuralProjectRecords projectRecords = new RuralProjectRecords();
+		//查询超期时间天数
+		List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_count");
+		if(adventCount.size()>0){
+			//获取超期时间天数转int
+			Integer endingCount = Integer.parseInt(adventCount.get(0).getLabel());
+			//设置开始时间为还有3天即将超期
+			//projectRecords.setStartCount(endingCount-3);
+			//设置开始时间为领取报告号30天未上报得时间节点
+			projectRecords.setStartCount(30);
+			projectRecords.setEndingCount(endingCount);
+		}
+		//获取项目数据(紧急项目-电子归档)（提前三天进行通知 即 获取即将超期的数据）
+		List<RuralProjectRecords> projectRecordsExamineList = dao.getProjectRecordListByAdventExamine(projectRecords);
+		//获取项目数据(非紧急项目-电子归档)
+		List<RuralProjectRecords> projectRecordsList = dao.getProjectRecordListByAdvent(projectRecords);
+		projectRecordsList.addAll(projectRecordsExamineList);
+		for (RuralProjectRecords info: projectRecordsList) {
+			String notifyStr = null;
+			String titleStr = null;
+			//如果当前时间大于过期时间
+			//Date类的一个方法，如果info.getAdventDateDate()早于 new Date() 返回true，否则返回false
+			if(info.getAdventDateDate().before(new Date())){
+				notifyStr = "项目【"+ info.getProjectName()+"】归档已超期";
+				titleStr = "项目【"+ info.getProjectName()+"】归档已超期。超期时间："+info.getAdventDate() +"。请尽快归档";
+			}else{
+				notifyStr = "项目【"+ info.getProjectName()+"】即将归档超期";
+				titleStr = "项目【"+ info.getProjectName()+"】即将归档超期。超期时间："+info.getAdventDate();
+			}
+			List<User> projectLeaders = workProjectUserDao.queryProjectUsers(info.getId(), "1");
+			for (User user: projectLeaders) {
+				workProjectNotifyService
+						.save(UtilNotify.saveNotify(info.getId(),
+								user,
+								info.getCompany().getId(),
+								titleStr,
+								notifyStr,
+								"94",
+								"0",
+								"待通知",
+								""));
+			}
+
+		}
+		//获取项目数据（获取已经超期的项目数据，进行修改超期状态）
+		List<RuralProjectRecords> projectNotReportExamineList = dao.getProjectNotrecordListExamine(projectRecords);
+		List<RuralProjectRecords> projectNotReportList = dao.getProjectNotrecordList(projectRecords);
+		projectNotReportList.addAll(projectNotReportExamineList);
+		List<String> idList = Lists.newArrayList();
+		if(projectNotReportList.size()>0) {
+			for (RuralProjectRecords info : projectNotReportList){
+				idList.add(info.getId());
+			}
+			dao.updateProjectReportedState(idList);
+		}
+	}
 }

src/main/java/com/jeeplus/modules/workcalendar/service/WorkCalendarTaskService.java

@@ -117,5 +117,8 @@ public class WorkCalendarTaskService  {
         logger.info("-----------项目超期未上报定时任务开始------------------");
         projectRecordsService.saveProjectReportedListByAdvent();
         logger.info("------------项目超期未上报定时任务结束------------------");
+        logger.info("-----------项目超期未归档定时任务开始（电子归档）------------------");
+        projectRecordsService.saveProjectRecordListByAdvent();
+        logger.info("------------项目超期未归档定时任务结束（电子归档）------------------");
     }
 }

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataTwoDao.xml

@@ -531,6 +531,9 @@
 		<if test="status != null and status != ''">
 			,status = #{status}
 		</if>
+		<if test="auditPassDate != null and auditPassDate != ''">
+			,audit_pass_date = #{auditPassDate}
+		</if>
 		<if test="bzshbUserId != null and bzshbUserId != ''">
 			,bzshb_user_id = #{bzshbUserId}
 		</if>

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportRecordDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.modules.projectcontentinfo.dao.ProjectReportRecordDao">
-    
+
 	<sql id="projectReportRecordColumns">
 		a.id AS "id",
 		a.create_by AS "createBy.id",
@@ -28,6 +28,7 @@
 		d.name AS "report.name",
 		d.number AS "report.number"
 	</sql>
+
 	<sql id="projectMaterialDefectRecordColumns">
 		a.id AS "id",
 		a.create_by AS "createBy.id",
@@ -50,8 +51,8 @@
 		JOIN project_report_data d ON d.id = a.report_id
 		JOIN sys_user u ON u.id = a.create_by
 	</sql>
-	
-    
+
+
 	<select id="get" resultType="ProjectReportRecord" >
 		SELECT
 		<include refid="projectReportRecordColumns"/>,
@@ -140,7 +141,7 @@
 	</select>
 
 	<select id="findList" resultType="ProjectReportRecord" >
-		SELECT 
+		SELECT
 			<include refid="projectReportRecordColumns"/>,
 		wci.contract_num AS "contractNum",
 		wci.name AS "contractName",
@@ -338,7 +339,7 @@
 	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE project_report_record SET 
+		UPDATE project_report_record SET
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
@@ -385,4 +386,10 @@
 		  file_num_tow = #{fileNumTow}
 		where id = #{id} ;
 	</update>
-</mapper>
+
+	<update id="updateReported">
+		UPDATE rural_project_records SET
+			record_state = #{projectRecordStatus}
+		WHERE id = #{id}
+	</update>
+</mapper>

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

@@ -45,6 +45,8 @@
 		a.total_fees AS "totalFees",
 		ifnull(a.reported_state,0) as "reportedState",
 		a.over_due_status as "overDueStatus",
+		ifnull(a.record_state,0) as "projectRecordStatus",
+		a.over_record_status as "overRecordStatus",
 		a.emergency_project as "emergencyProject"
 	</sql>
 

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

@@ -53,6 +53,8 @@
 		a.check_remarks as "checkRemarks",
 		a.project_properties As "projectProperties",
 		a.submit_scale As "submitScale",
+		ifnull(a.record_state,0) as "projectRecordStatus",
+		a.over_record_status as "overRecordStatus",
 		a.emergency_project AS "emergencyProject"
 	</sql>
 
@@ -1581,4 +1583,112 @@
 			project_master_id =  #{projectMasterId}
 		WHERE id = #{id}
 	</update>
+
+	<select id="getProjectRecordListByAdventExamine" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords" >
+		SELECT
+		<include refid="projectRecordsColumns"/>
+		,date_add(date_format(prd.audit_pass_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDate
+		,date_add(date_format(prd.audit_pass_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDateDate
+		,a.project_type as "projectType"
+		FROM rural_project_records a
+		left join work_contract_info wci on a.contract_id = wci.id
+		left join project_report_data prd on prd.project_id = a.id
+		left join sys_user u on u.id = a.create_by
+		left join sys_office o on o.id = a.office_id
+		LEFT JOIN sys_area area ON area.id = a.area_id
+		LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		left join sys_user su on su.id = w1.user_id
+		left join sys_office so on so.id = su.office_id
+		<where>
+			a.del_flag = 0
+			and (a.record_state=6 or a.record_state is null)
+			and prd.status = 5
+			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
+		</where>
+	</select>
+
+	<select id="getProjectRecordListByAdvent" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords" >
+		SELECT
+		<include refid="projectRecordsColumns"/>
+		,date_add(date_format(prd.audit_pass_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDate
+		,date_add(date_format(prd.audit_pass_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDateDate
+		,a.project_type as "projectType"
+		FROM rural_project_records a
+		left join work_contract_info wci on a.contract_id = wci.id
+		left join project_report_data_two prd on prd.project_id = a.id
+		left join sys_user u on u.id = a.create_by
+		left join sys_office o on o.id = a.office_id
+		LEFT JOIN sys_area area ON area.id = a.area_id
+		LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		left join sys_user su on su.id = w1.user_id
+		left join sys_office so on so.id = su.office_id
+		<where>
+			a.del_flag = 0
+			and (a.record_state=6 or a.record_state is null)
+			and prd.status = 5
+			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
+		</where>
+	</select>
+
+
+	<select id="getProjectNotrecordListExamine" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords" >
+		SELECT
+		<include refid="projectRecordsColumns"/>
+		,date_add(date_format(prd.audit_pass_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDate
+		,a.project_type as "projectType"
+		FROM rural_project_records a
+		left join work_contract_info wci on a.contract_id = wci.id
+		left join project_report_data prd on prd.project_id = a.id
+		left join sys_user u on u.id = a.create_by
+		left join sys_office o on o.id = a.office_id
+		LEFT JOIN sys_area area ON area.id = a.area_id
+		LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		left join sys_user su on su.id = w1.user_id
+		left join sys_office so on so.id = su.office_id
+		<where>
+			a.del_flag = 0
+			and (a.record_state!=5 or a.record_state is null)
+			and prd.status = 5
+			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
+			and prd.audit_pass_date is not null
+			and a.reported_state is null
+		</where>
+	</select>
+
+
+
+	<select id="getProjectNotrecordList" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords" >
+		SELECT
+		<include refid="projectRecordsColumns"/>
+		,date_add(date_format(prd.audit_pass_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDate
+		,a.project_type as "projectType"
+		FROM rural_project_records a
+		left join work_contract_info wci on a.contract_id = wci.id
+		left join project_report_data_two prd on prd.project_id = a.id
+		left join sys_user u on u.id = a.create_by
+		left join sys_office o on o.id = a.office_id
+		LEFT JOIN sys_area area ON area.id = a.area_id
+		LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		left join sys_user su on su.id = w1.user_id
+		left join sys_office so on so.id = su.office_id
+		<where>
+			a.del_flag = 0
+			and (a.record_state!=5 or a.record_state is null)
+			and prd.status = 5
+			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
+			and prd.audit_pass_date is not null
+			and a.reported_state is null
+		</where>
+	</select>
+
+	<update id="updateProjectRecordState">
+		update rural_project_records set
+		record_state = '6',
+		over_record_status = 1
+		where id in
+		<foreach item="item" index="index" collection="idList"
+				 open="(" separator="," close=")">
+			#{item}
+		</foreach> ;
+	</update>
 </mapper>

src/main/webapp/static/common/jeeplus.js

@@ -467,6 +467,8 @@ function getRuralProjectArchiveState(id)
         case "3":result.label = "cancel";result.status="撤回";break;
         case "4":result.label = "reject";result.status="驳回";break;
         case "5":result.label = "signed";result.status="已归档";break;
+        case "6":result.label = "signed";result.status="超期未归档";result.action = false;break;
+        case "7":result.label = "signed";result.status="超期归档";break;
         case "8":result.label = "changing";result.status="变更中";break;
         case "10":result.label = "unknown";result.status="待发起";result.action = false;break;
         default:

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

@@ -914,9 +914,9 @@
 							var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);
 							if(d.pid ==0){
 								if(st.action)
-									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-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>";
+									var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 								return xml;
 							}else{
 								return '';
@@ -1060,7 +1060,7 @@
 						if(d.projectReportStatus == 5){
 							if(d.emergencyProject == 1){
 								/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-								if(d.projectReportRecordStatus == 0){
+								if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
 									xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 								}
 								if(d.projectReportRecordStatus == 1){
@@ -1085,7 +1085,7 @@
 					}else{
 						if(d.projectReportStatusTwo == 5){
 							/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-							if(d.projectReportRecordStatus == 0){
+							if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 1){

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

@@ -914,9 +914,9 @@
 							var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);
 							if(d.pid ==0){
 								if(st.action)
-									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-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>";
+									var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 								return xml;
 							}else{
 								return '';
@@ -1061,7 +1061,7 @@
 						if(d.projectReportStatus == 5){
 							if(d.emergencyProject == 1){
 								/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-								if(d.projectReportRecordStatus == 0){
+								if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
 									xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 								}
 								if(d.projectReportRecordStatus == 1){
@@ -1086,7 +1086,7 @@
 					}else{
 						if(d.projectReportStatusTwo == 5){
 							/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-							if(d.projectReportRecordStatus == 0){
+							if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 1){