未归档天数调整，文件上传验证调整

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

@@ -260,8 +260,8 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                 }
 
                 //设置纸质未归档天数
-                if (null != records.getPrdAuditDate() && 5 != records.getProjectReportRecordStatus()
-                        && 5 != records.getFilingProjectStatus() && 7!= records.getProjectReportRecordStatus()
+                if (null != records.getPrdAuditDate()
+                        && 5 != records.getFilingProjectStatus()
                         && 7 != records.getFilingProjectStatus() && 10 != records.getFilingProjectStatus()){
                     try {
                         Date date2 = format.parse(records.getPrdAuditDate());
@@ -291,8 +291,8 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                 }
 
                 //设置纸质未归档天数
-                if (null != records.getTwoAuditPassDate() && 5 != records.getProjectReportRecordStatus()
-                        && !"5".equals(records.getPaperFilingStatus()) && 7!= records.getProjectReportRecordStatus() &&
+                if (null != records.getTwoAuditPassDate()
+                        && !"5".equals(records.getPaperFilingStatus()) &&
                         !"7".equals(records.getPaperFilingStatus()) && !"10".equals(records.getPaperFilingStatus())){
                     try {
                         Date date2 = format.parse(records.getTwoAuditPassDate());

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

@@ -338,8 +338,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 }
 
                 //设置纸质未归档天数
-                if (null != records.getPrdAuditDate() && 5 != records.getProjectReportRecordStatus()
-                        && 5 != records.getFilingProjectStatus() && 7 != records.getProjectReportRecordStatus()
+                if (null != records.getPrdAuditDate()
+                        && 5 != records.getFilingProjectStatus()
                         && 7 != records.getFilingProjectStatus() && 10 != records.getFilingProjectStatus()){
                     try {
                         Date date2 = format.parse(records.getPrdAuditDate());
@@ -369,8 +369,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 }
 
                 //设置纸质未归档天数
-                if (null != records.getTwoAuditPassDate() && 5 != records.getProjectReportRecordStatus()
-                        && !"5".equals(records.getPaperFilingStatus()) && 7!= records.getProjectReportRecordStatus() &&
+                if (null != records.getTwoAuditPassDate()
+                        && !"5".equals(records.getPaperFilingStatus()) &&
                         !"7".equals(records.getPaperFilingStatus())&&!"10".equals(records.getPaperFilingStatus())){
                     try {
                         Date date2 = format.parse(records.getTwoAuditPassDate());

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectRecordDescriptionForm.jsp

@@ -111,14 +111,14 @@
                 if (obj == 2) {
                     <%--$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/holdSaveRecord");--%>
                 } else {
-                    // if (boolFlag) {
-                    //     var gistdata = $("#file_attachment tr").length;
-                    //     console.log('说明扫描件数量：' + gistdata)
-                    //     if (gistdata === 0) {
-                    //         top.layer.msg("请上传说明扫描件！", {icon: 0});
-                    //         return false;
-                    //     }
-                    // }
+                    if (boolFlag) {
+                        var gistdata = $("#file_attachment tr").length;
+                        console.log('说明扫描件数量：' + gistdata)
+                        if (gistdata === 0) {
+                            top.layer.msg("请上传说明扫描件！", {icon: 0});
+                            return false;
+                        }
+                    }
 
                     if (boolFlag) {
                         var hiatus1 = document.getElementById('hiatus1').checked

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

@@ -83,14 +83,14 @@
             if(validateForm.form()){
 				var projectId = '${project.id}';
 				var boolFlag = true;
-				// if (boolFlag) {
-				//     var gistdata = $("#file_attachment tr").length;
-				//     console.log('说明扫描件数量：' + gistdata)
-				//     if (gistdata === 0) {
-				//         top.layer.msg("请上传说明扫描件！", {icon: 0});
-				//         return false;
-				//     }
-				// }
+				if (boolFlag) {
+				    var gistdata = $("#file_attachment tr").length;
+				    console.log('说明扫描件数量：' + gistdata)
+				    if (gistdata === 0) {
+				        top.layer.msg("请上传说明扫描件！", {icon: 0});
+				        return false;
+				    }
+				}
 
 				if (boolFlag) {
 					var hiatus1 = document.getElementById('hiatus1').checked