修改上传报告流程信息

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

@@ -405,7 +405,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     workActivityProcess.setId("");
                 }
                 // 审核环节
-                if ("master".equals(taskDefKey) && count.contains("1")) {
+                if ("bmzr".equals(taskDefKey) && count.contains("1")) {
                     taskCount = "1";
                     exp = "pass";
                     if ("yes".equals(flag)) {
@@ -1097,6 +1097,9 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                         ""
                 );
         List<User> users = new ArrayList<>();
+
+        //部门主任
+        List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,recordsOffice.getId(),"12",projectRecords.getCreateBy());
         //总工
         List<User> bzshbsList = UserUtils.getByRoleActivityEnname("bzshb",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
         List<User> bzshbs = new ArrayList<>();
@@ -1157,21 +1160,21 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             }
             workProjectNotify.setId("");
         } else {
-            if (masters.size()==0 ){
+            if (bmzrs.size()==0 ){
                 projectReportData.setStatus("1");
                 projectReportDataService.save(projectReportData);
             }
-            if (masters.size()==0){
+            if (bmzrs.size()==0){
                 return "流程审批人不能为空,项目负责人下无用户,请联系管理员！";
             }
             processType = "newReportAudit";
-            users.addAll(masters);
-            variables.put("masterList", masters);
-            variables.put("mastercount", masters.size());
+            users.addAll(bmzrs);
+            variables.put("bmzrList", bmzrs);
+            variables.put("bmzrCount", bmzrs.size());
         }
         for (User u : users){
             workProjectNotify.setUser(u);
-            workProjectNotify.setNotifyRole("项目负责人审批");
+            workProjectNotify.setNotifyRole("部门主任审批");
             workProjectNotify.setId("");
             workProjectNotifyService
                     .save(workProjectNotify);
@@ -1210,7 +1213,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             workActivityProcessService.insert(workActivityProcess);
             //workActivityProcess.setCount(3);
             //workActivityProcessService.insert(workActivityProcess);
-            workActivityProcessService.insertAuditsByType(masters,processInstance.getId(),1,1);
+            workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
             workActivityProcessService.insertAuditsByType(bzshbs,processInstance.getId(),2,0);
             //workActivityProcessService.insertAuditsByType(gzrs,processInstance.getId(),3,0);
         }

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

@@ -333,7 +333,7 @@ public class RuralCostProjectMessageController extends BaseController {
         List<User> users = null;
         ProjectRecords projectRecord = projectRecordsServices.getRuralMasters(projectcontentinfo.getProject().getId());
         projectReportData.setProject(projectRecord);
-        if ("master".equals(taskDefKey)){
+        if ("bmzr".equals(taskDefKey)){
             users = UserUtils.getByProssType(t.getProcessInstanceId(),2);
             if (users==null )
                 users = UserUtils.getByRoleActivityEnname("bzshb",3,t.getOfficeId(),"12",t.getCreateBy());

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

@@ -332,7 +332,7 @@ public class RuralProjectMessageController extends BaseController {
         List<User> users = null;
         ProjectRecords projectRecord = projectRecordsServices.getRuralMasters(projectcontentinfo.getProject().getId());
         projectReportData.setProject(projectRecord);
-        if ("master".equals(taskDefKey)){
+        if ("bmzr".equals(taskDefKey)){
             users = UserUtils.getByProssType(t.getProcessInstanceId(),2);
             if (users==null )
                 users = UserUtils.getByRoleActivityEnname("bzshb",3,t.getOfficeId(),"12",t.getCreateBy());

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

@@ -510,7 +510,7 @@ function getAuditState(id)
         case "2":result.label = "auditing";result.status="审批中";break;
         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 "5":result.label = "signed";result.status="已完成";break;
         case "6":result.label = "discarding";result.status="作废中";break;
         case "7":result.label = "discarded";result.status="已作废";break;
         case "8":result.label = "changing";result.status="变更中";break;

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

@@ -337,7 +337,6 @@
 				<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
 				<div class="layui-input-block">
 					<form:select  path="projectReportData.achievementType" class="form-control simple-select required">
-						<form:option value="" label=""/>
 						<form:options items="${fns:getMainDictList('achievement_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 					</form:select>
 				</div>

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

@@ -328,7 +328,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{field:'op',align:'center',title:"操作", fixed: 'right',width:230,templet:function(d){
+                ,{field:'op',align:'center',title:"操作", fixed: 'right',width:250,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
                         if(d.canAdd != undefined && d.canAdd =="1")
@@ -358,31 +358,31 @@
 
 						/*归档相关按钮*/
 						if(d.projectReportStatus == 5){
-							xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载报告模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载报告模板</a>";
+							xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";
 							if(d.recordAdd != undefined && d.recordAdd =="1")
 							{
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 归档</a>";
 							}
 							if(d.recordedit1 != undefined && d.recordedit1 =="1")
 							{
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档信息</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档信息</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
 							}
 							if(d.recordedit2 != undefined && d.recordedit2 =="1")
 							{
 								//驳回操作
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档信息</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档信息</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
 							}
 							if(d.recordrecall != undefined && d.recordrecall =="1")
 							{
 								//撤回操作
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档信息</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档信息</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
 							}
 							if(d.recordcancel != undefined && d.recordcancel =="1")
 							{
-								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回归档信息</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回归档</a>";
 							}
                         }
 
@@ -422,48 +422,48 @@
 					,"projectReportName":"${projectRecords.projectReportName}"
 					,"reportedState":"${projectRecords.reportedState}"
                     <c:choose>
-                        <c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
+                        <c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">
                             ,"canAdd":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 0 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 0 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit1":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 1 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 1 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit2":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 4 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 4 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canrecall":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 3 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 3 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             ,"cancancel":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 2  && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 2  && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             <%-- 归档状态 --%>
                             ,"recordAdd":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 0 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 0 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit1":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 1 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 1 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit2":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 4 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 4 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordrecall":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 3 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 3 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordcancel":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                         </c:when>
@@ -480,7 +480,7 @@
                     ,"recordcancel":"0"
                     </c:otherwise>
                     </c:choose>
-                    <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit3":<c:choose><c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+                    <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit3":<c:choose><c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                     <%--<shiro:hasPermission name="project:projectRecords:edit">
                     ,"canedit3":<c:choose>
                                     <c:when test="${projectRecords.projectReportStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>

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

@@ -329,7 +329,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作", fixed: 'right',width:230,templet:function(d){
+                ,{field:'op',align:'center',title:"操作", fixed: 'right',width:250,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
                         if(d.canAdd != undefined && d.canAdd =="1")
@@ -361,29 +361,29 @@
 
 						/*归档相关按钮*/
 						if(d.projectReportStatus == 5){
-							xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载报告模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载报告模板</a>";
+							xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";
 							if(d.recordAdd != undefined && d.recordAdd =="1")
 							{
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 归档</a>";
 							}
 							if(d.recordedit1 != undefined && d.recordedit1 =="1")
 							{
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档信息</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档信息</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
 							}
 							if(d.recordedit2 != undefined && d.recordedit2 =="1")
 							{
-								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档信息</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档信息</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
 							}
 							if(d.recordrecall != undefined && d.recordrecall =="1")
 							{
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档信息</a>";
-								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档信息</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 重新归档</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteRecord?reportId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目归档信息吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除归档</a>";
 							}
 							if(d.recordcancel != undefined && d.recordcancel =="1")
 							{
-								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回归档信息</a>";
+								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告归档审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回归档</a>";
 							}
                         }
 						/*上报相关按钮*/
@@ -420,49 +420,51 @@
                     ,"procId":"${projectRecords.processInstanceId}"
                     ,"projectReportName":"${projectRecords.projectReportName}"
                     ,"reportedState":"${projectRecords.reportedState}"
+                    ,"createId":"${projectRecords.createBy.id}"
+                    ,"loginId":"${fns:getUser().id}"
                     <c:choose>
-                        <c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
+                        <c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">
                             ,"canAdd":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 0 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 0 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit1":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 1 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 1 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canedit2":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 4 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 4 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
                             ,"canrecall":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 3 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 3 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             ,"cancancel":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 2 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 2 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
                             <%-- 归档状态 --%>
                             ,"recordAdd":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 0 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 0 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit1":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 1 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 1 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordedit2":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 4 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 4 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordrecall":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 3 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 3 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordcancel":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fns:getUser().id == projectRecords.leaderIds}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                         </c:when>
@@ -479,7 +481,7 @@
                     ,"recordcancel":"0"
                     </c:otherwise>
                     </c:choose>
-                    <shiro:hasPermission name="project:projectRecords:edit">,"canedit3":<c:choose><c:when test="${fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+                    <shiro:hasPermission name="project:projectRecords:edit">,"canedit3":<c:choose><c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                     <%--<shiro:hasPermission name="project:projectRecords:edit">
                     ,"canedit3":<c:choose>
                                     <c:when test="${projectRecords.projectReportStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>