Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workreview/service/WorkReviewStandardService.java

@@ -316,7 +316,11 @@ public class WorkReviewStandardService extends TreeService<WorkReviewStandardDao
                 }
             }
         }
-        projectcontentinfo.getProjectReportData().setExaminScore(projectcontentinfo.getReviewScore());
+        String sore="0";
+        if(StringUtils.isNotBlank(projectcontentinfo.getReviewScore())){
+            sore=projectcontentinfo.getReviewScore();
+        }
+        projectcontentinfo.getProjectReportData().setExaminScore(sore);
         bzshbExaminDao.updateBzshbExamin(projectcontentinfo.getProjectReportData());
     }
 }

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -278,6 +278,10 @@
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('添加项目计划信息', '${ctx}/project/projectPlanConsulting/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 添加</a>";
 						}
+						if(d.adminEdit != undefined && d.adminEdit =="1")
+						{
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanConsulting/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 编辑</a>";
+						}
 						xml+="</div>"
 						return xml;
 
@@ -313,6 +317,11 @@
 					<shiro:hasPermission name="ruralProject:ruralProjectView:consultingPlanView">
 					,"showView":1
 					</shiro:hasPermission>
+					<shiro:hasPermission name="project:projectPlanCost:adminEdit">
+					<c:if test="${projectRecords.planCount>0}">
+					,"adminEdit":<c:choose><c:when test="${projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					</c:if>
+					</shiro:hasPermission>
 				}
 				</c:forEach>
 				</c:if>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -278,6 +278,10 @@
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('添加项目计划信息', '${ctx}/project/projectPlanCost/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 添加</a>";
 						}
+						if(d.adminEdit != undefined && d.adminEdit =="1")
+						{
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanCost/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 编辑</a>";
+						}
 						xml+="</div>"
 						return xml;
 
@@ -313,6 +317,11 @@
 					<shiro:hasPermission name="ruralProject:ruralProjectView:costPlanView">
 					,"showView":1
 					</shiro:hasPermission>
+					<shiro:hasPermission name="project:projectPlanCost:adminEdit">
+						<c:if test="${projectRecords.planCount>0}">
+						,"adminEdit":<c:choose><c:when test="${projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+						</c:if>
+					</shiro:hasPermission>
 				}
 				</c:forEach>
 				</c:if>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -940,9 +940,10 @@
 											<td class="op-td">
 												<div class="op-btn-box" >
 													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-													</c:if>
+<%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
+<%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
+<%--													</c:if>--%>
+													<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
 												</div>
 											</td>
 										</tr>