项目文件上传

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

@@ -1657,8 +1657,12 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		//添加项目类型
 		relateInfo.setAttachmentProjectType(projectRecords.getProjectType());
 		relateInfo.setAttachmentProjectSort(projectRecords.getAttachmentProjectSort());
-		//查看送审金额是否为500w以上金额
-		Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+		Integer approvalMoney = 0;
+		if(null != projectReportData){
+			//查看送审金额是否为500w以上金额
+			approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
+
+		}
 		if(0 == approvalMoney){
 			//金额为0
 			relateInfo.setAttachmentProjectApprovalMoney(null);
@@ -1787,4 +1791,12 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		page.setList(recordsList);
 		return page;
 	}
+
+	/**
+	 * 修改项目开始时间和结束时间
+	 * @param projectRecords
+	 */
+	public void updateDate(RuralProjectRecords projectRecords){
+		dao.updateDate(projectRecords);
+	}
 }

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

@@ -383,7 +383,7 @@
                     </shiro:hasPermission>
                     ,"cancancel":<c:choose><c:when test="${projectRecords.projectStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-					,"recordStatus":<c:choose><c:when test="${'5' != projectRecords.projectReportRecordStatus && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+
 					</c:when>
                     <c:otherwise>
                     ,"candel":"0"
@@ -396,13 +396,20 @@
                     </c:otherwise>
                     </c:choose>
                     <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:edit">,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
-					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:adminAccessory">
-						,"adminAccessory":
+					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:accessory">
+						,"recordStatus":
 							<c:choose>
 								<c:when test="${projectRecords.projectStatus == 5 && '5' != projectRecords.projectReportRecordStatus}">"1"</c:when>
 								<c:otherwise>"0"</c:otherwise>
 							</c:choose>
 					</shiro:hasPermission>
+					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:adminAccessory">
+					,"adminAccessory":
+							<c:choose>
+							<c:when test="${projectRecords.projectStatus == 5 && '5' != projectRecords.projectReportRecordStatus}">"1"</c:when>
+					<c:otherwise>"0"</c:otherwise>
+					</c:choose>
+					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>

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

@@ -410,7 +410,7 @@
                     ,"canrecall":<c:choose><c:when test="${projectRecords.projectStatus == 3 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </shiro:hasPermission>
                     ,"cancancel":<c:choose><c:when test="${projectRecords.projectStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"recordStatus":<c:choose><c:when test="${'5' != projectRecords.projectReportRecordStatus && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+
                     ,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </c:when>
                     <c:otherwise>
@@ -424,6 +424,13 @@
                     </c:otherwise>
                     </c:choose>
                     <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+					<shiro:hasPermission name="ruralProject:ruralProjectRecords:accessory">
+					,"recordStatus":
+							<c:choose>
+							<c:when test="${'5' != projectRecords.projectReportRecordStatus && projectRecords.projectStatus == 5}">"1"</c:when>
+					<c:otherwise>"0"</c:otherwise>
+					</c:choose>
+					</shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralProjectRecords:adminAccessory">
 					,"adminAccessory":
 							<c:choose>