报告签章调整

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/service/ProjectReportSignatureWorkService.java

@@ -270,7 +270,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         signature.setDutyPerson(projectReportSignature.getDutyPerson());
         signature.setStatus(projectReportSignature.getStatus());
         signature.setSignatureName(projectReportSignature.getSignatureName());
-
+        signature.setCompany(UserUtils.getUser().getCompany());
+        signature.setOffice(UserUtils.getUser().getOffice());
 
         //根据签章类型进行保存
         if (projectReportSignature.getSignatureType().equals("1")){//报告签章
@@ -350,7 +351,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         signature.setDutyPerson(projectReportSignature.getDutyPerson());
         signature.setStatus(projectReportSignature.getStatus());
         signature.setSignatureName(projectReportSignature.getSignatureName());
-
+        signature.setCompany(UserUtils.getUser().getCompany());
+        signature.setOffice(UserUtils.getUser().getOffice());
 
         if (StringUtils.isBlank(projectReportSignature.getId())){
             signature.preInsert();
@@ -2638,8 +2640,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         if (StringUtils.isBlank(reportSignature.getSignatureType())){
             reportSignature.setSignatureType("1");
             //签章类型label
-            String dictLabel = DictUtils.getDictLabel(reportSignature.getSignatureType(), "signature_type_project_report_work", "");
-            reportSignature.setLabel(dictLabel);
+//            String dictLabel = DictUtils.getDictLabel(reportSignature.getSignatureType(), "signature_type_project_report_work", "");
+            reportSignature.setLabel("报告签章");
             //负责人名称
             User user = UserUtils.get(reportSignature.getDutyPerson());
             reportSignature.setDutyPersonName(user.getName());
@@ -2680,8 +2682,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         if (StringUtils.isBlank(reportSignature.getSignatureType())){
             reportSignature.setSignatureType("2");
             //签章类型label
-            String dictLabel = DictUtils.getDictLabel(reportSignature.getSignatureType(), "signature_type_project_report_work", "");
-            reportSignature.setLabel(dictLabel);
+//            String dictLabel = DictUtils.getDictLabel(reportSignature.getSignatureType(), "signature_type_project_report_work", "");
+            reportSignature.setLabel("审定单签章");
             //负责人名称
             User user = UserUtils.get(reportSignature.getDutyPerson());
             reportSignature.setDutyPersonName(user.getName());

src/main/resources/mappings/modules/signature/projectReport/ProjectReportSignatureDao.xml

@@ -653,6 +653,12 @@
 		<if test="null != dutyPerson and '' != dutyPerson">
 			,duty_person = #{dutyPerson}
 		</if>
+		<if test="office != null and office.id != null and office.id != ''">
+			,office_id = #{office.id}
+		</if>
+		<if test="company != null and company.id != null and company.id != ''">
+			,company_id = #{company.id}
+		</if>
 		,update_date = now()
 		WHERE id = #{id}
 	</update>
@@ -712,6 +718,12 @@
 		<if test="null != dutyPerson and '' != dutyPerson">
 			,duty_person = #{dutyPerson}
 		</if>
+		<if test="office != null and office.id != null and office.id != ''">
+			,office_id = #{office.id}
+		</if>
+		<if test="company != null and company.id != null and company.id != ''">
+			,company_id = #{company.id}
+		</if>
 		,update_date = now()
 		WHERE id = #{id}
 	</update>

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkAudit.jsp

@@ -413,10 +413,12 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
 					<div class="layui-input-block readOnlyFFF">
-						<form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="true" value="${projectReportSignature.signatureType}">
-							<form:option value=""/>
-							<form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>
+<%--						<form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="true" value="${projectReportSignature.signatureType}">--%>
+<%--							<form:option value=""/>--%>
+<%--							<form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--						</form:select>--%>
+						<form:input path="label" id="label" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章类型" class="form-control layui-input required"/>
+
 					</div>
 				</div>
 
@@ -433,12 +435,14 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>签章责任人：</label>
 					<div class="layui-input-block readOnlyFFF">
-						<select class="form-control judgment layui-input" id="dutyPerson" disabled="true" name="dutyPerson">
-							<option value=""/>
-							<c:forEach items="${dutyPersonList}" var="user">
-								<option value="${user.id}" <c:if test="${projectReportSignature.dutyPerson eq user.id }">selected</c:if>>${user.name}</option>
-							</c:forEach>
-						</select>
+<%--						<select class="form-control judgment layui-input" id="dutyPerson" disabled="true" name="dutyPerson">--%>
+<%--							<option value=""/>--%>
+<%--							<c:forEach items="${dutyPersonList}" var="user">--%>
+<%--								<option value="${user.id}" <c:if test="${projectReportSignature.dutyPerson eq user.id }">selected</c:if>>${user.name}</option>--%>
+<%--							</c:forEach>--%>
+<%--						</select>--%>
+						<form:input path="dutyPersonName" id="dutyPersonName" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章责任人" class="form-control layui-input required"/>
+
 					</div>
 				</div>
 

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkAuditApproval.jsp

@@ -413,11 +413,12 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
 					<div class="layui-input-block readOnlyFFF">
-						<form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="true" value="${projectReportSignature.signatureType}">
-							<form:option value=""/>
-							<form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>
+<%--						<form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="true" value="${projectReportSignature.signatureType}">--%>
+<%--							<form:option value=""/>--%>
+<%--							<form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--						</form:select>--%>
 <%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectReportSignature.signatureName}"/>--%>
+							<form:input path="label" id="label" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章类型" class="form-control layui-input required"/>
 
 					</div>
 				</div>
@@ -436,12 +437,14 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>签章责任人：</label>
 					<div class="layui-input-block readOnlyFFF">
-						<select class="form-control judgment layui-input" id="dutyPerson" disabled="true" name="dutyPerson">
-							<option value=""/>
-							<c:forEach items="${dutyPersonList}" var="user">
-								<option value="${user.id}" <c:if test="${projectReportSignature.dutyPerson eq user.id }">selected</c:if>>${user.name}</option>
-							</c:forEach>
-						</select>
+<%--						<select class="form-control judgment layui-input" id="dutyPerson" disabled="true" name="dutyPerson">--%>
+<%--							<option value=""/>--%>
+<%--							<c:forEach items="${dutyPersonList}" var="user">--%>
+<%--								<option value="${user.id}" <c:if test="${projectReportSignature.dutyPerson eq user.id }">selected</c:if>>${user.name}</option>--%>
+<%--							</c:forEach>--%>
+<%--						</select>--%>
+							<form:input path="dutyPersonName" id="dutyPersonName" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章责任人" class="form-control layui-input required"/>
+
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkList.jsp

@@ -376,91 +376,82 @@
                         return "<span title=\"" + d.createName + "\">" + d.createName + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:100}
-                ,{align:'center', title: '报告签章状态',  width:100,templet:function(d){
-                        var st = getSignatureState(d.reportStatus);
+                ,{align:'center', title: '审定单签章状态',  width:100,templet:function(d){
+                        var st = getSignatureState(d.approvalStatus);
                         if(st.action)
-                            var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/projectReport/projectReportSignature/getProcess?reportId=" + d.reportId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/projectReport/projectReportSignature/getApprovalProcess?approvalId=" + d.approvalId + "','95%','95%')\" class=\"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>";
                         return xml;
                     }}
-                ,{align:'center', title: '审定单签章状态',  width:100,templet:function(d){
-                        var st = getSignatureState(d.approvalStatus);
+                ,{align:'center', title: '报告签章状态',  width:100,templet:function(d){
+                        var st = getSignatureState(d.reportStatus);
                         if(st.action)
-                            var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/projectReport/projectReportSignature/getApprovalProcess?approvalId=" + d.approvalId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/projectReport/projectReportSignature/getProcess?reportId=" + d.reportId + "','95%','95%')\" class=\"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>";
                         return xml;
                     }}
+
                 ,{field:'op',align:'center',title:"操作",minWidth:160,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
-                        if(d.canedit1 != undefined && d.canedit1 =="1")
+                        if(d.approvalCancancel1 != undefined && d.approvalCancancel1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审定单签章</a>";
                         }
 
-                        if(d.canedit2 != undefined && d.canedit2 =="1")
+                        if(d.approvalCanedit2 != undefined && d.approvalCanedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签章申请', '${ctx}/projectReport/projectReportSignature/modify?id=" + d.reportId + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整审定单签章申请', '${ctx}/projectReport/projectReportSignature/modifyApproval?id=" + d.approvalId + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
                         }
-                        if(d.canrecall != undefined && d.canrecall =="1")
+                        if(d.approvalCanrecall != undefined && d.approvalCanrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
                         }
-                        if(d.candel != undefined && d.candel =="1")
+                        if(d.approvalCanedit1 != undefined && d.approvalCanedit1 =="1")
                         {
-                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该签章申请信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
                         }
-                        if(d.reportDelete != undefined && d.reportDelete =="1")
+                        if(d.approvalCancancel != undefined && d.approvalCancancel =="1")
                         {
-                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/deleteReport?id=" + d.reportId + "\" onclick=\"return confirmx('确认要作废该报告签章申请信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除报告签章</a>";
+                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/revokeApproval?id=" + d.approvalId + "&processInstanceId=" + d.approvalProcInsId + "&status="+d.approvalStatus+"\" onclick=\"return confirmx('确认要撤回该审定单签章申请审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回审定单签章</a>";
                         }
                         if(d.approvalDelete != undefined && d.approvalDelete =="1")
                         {
                             xml+="<a href=\"${ctx}/projectReport/projectReportSignature/deleteApproval?id=" + d.approvalId + "\" onclick=\"return confirmx('确认要作废该审定单签章申请信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除审定单签章</a>";
                         }
-                        if(d.cancancel != undefined && d.cancancel =="1")
-                        {
-                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/revoke?id=" + d.reportId + "&processInstanceId=" + d.reportProcInsId + "&status="+d.reportStatus+"\" onclick=\"return confirmx('确认要撤回该报告签章申请审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回报告签章</a>";
-                        }
                         if(d.approvalCancancel2 != undefined && d.approvalCancancel2 =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 报告签章</a>";
                         }
-
-                        if(d.approvalCanedit1 != undefined && d.approvalCanedit1 =="1")
+                        if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
                         }
-                        if(d.approvalCancancel1 != undefined && d.approvalCancancel1 =="1")
+
+                        if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审定单签章</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签章申请', '${ctx}/projectReport/projectReportSignature/modify?id=" + d.reportId + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
                         }
-
-                        if(d.approvalCanedit2 != undefined && d.approvalCanedit2 =="1")
+                        if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整审定单签章申请', '${ctx}/projectReport/projectReportSignature/modifyApproval?id=" + d.approvalId + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
                         }
-                        if(d.approvalCanrecall != undefined && d.approvalCanrecall =="1")
+                        if(d.candel != undefined && d.candel =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
+                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该签章申请信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                         }
-                        if(d.approvalCancancel != undefined && d.approvalCancancel =="1")
+                        if(d.reportDelete != undefined && d.reportDelete =="1")
                         {
-                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/revokeApproval?id=" + d.approvalId + "&processInstanceId=" + d.approvalProcInsId + "&status="+d.approvalStatus+"\" onclick=\"return confirmx('确认要撤回该审定单签章申请审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回审定单签章</a>";
+                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/deleteReport?id=" + d.reportId + "\" onclick=\"return confirmx('确认要作废该报告签章申请信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除报告签章</a>";
                         }
-                        if(d.reportStatus == 5){
-                            //上传审定单进行签章
 
-                            if(d.reportSignatureUrlFlag == 1){
-                                xml+="<a href=\""+ d.reportSignatureUrl +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >报告签章文件下载</a>"
-                            }else{
-                                if(d.reportSignatureContractId){
-                                    xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.reportSignatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >报告签章文件下载</a>"
-                                }
-                            }
+                        if(d.cancancel != undefined && d.cancancel =="1")
+                        {
+                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/revoke?id=" + d.reportId + "&processInstanceId=" + d.reportProcInsId + "&status="+d.reportStatus+"\" onclick=\"return confirmx('确认要撤回该报告签章申请审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回报告签章</a>";
                         }
+
                         if(d.approvalStatus == 5){
                             //上传审定单进行签章
 
@@ -472,6 +463,18 @@
                                 }
                             }
                         }
+                        if(d.reportStatus == 5){
+                            //上传审定单进行签章
+
+                            if(d.reportSignatureUrlFlag == 1){
+                                xml+="<a href=\""+ d.reportSignatureUrl +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >报告签章文件下载</a>"
+                            }else{
+                                if(d.reportSignatureContractId){
+                                    xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.reportSignatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >报告签章文件下载</a>"
+                                }
+                            }
+                        }
+
 
                         /*if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
                         {
@@ -527,8 +530,8 @@
                     ,"createName":"<c:out value="${projectReportSignature.createBy.name}" escapeXml="false"/>"
                     <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectReportSignature.createBy.id}">
                     <shiro:hasPermission name="projectReport:projectReportSignature:del">,"candel":	<c:choose><c:when test="${ projectReportSignature.reportStatus == null && projectReportSignature.approvalStatus == null && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
-                    <shiro:hasPermission name="projectReport:projectReportSignature:del">,"reportDelete":	<c:choose><c:when test="${(projectReportSignature.reportStatus == 3 || projectReportSignature.reportStatus == 1 || projectReportSignature.reportStatus == null) && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
-                    <shiro:hasPermission name="projectReport:projectReportSignature:del">,"approvalDelete":	<c:choose><c:when test="${(projectReportSignature.approvalStatus == 3 || projectReportSignature.approvalStatus == 1 || projectReportSignature.approvalStatus == null) && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+                    <shiro:hasPermission name="projectReport:projectReportSignature:del">,"reportDelete":	<c:choose><c:when test="${(projectReportSignature.reportStatus == 3 || projectReportSignature.reportStatus == 1 ) && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+                    <shiro:hasPermission name="projectReport:projectReportSignature:del">,"approvalDelete":	<c:choose><c:when test="${(projectReportSignature.approvalStatus == 3 || projectReportSignature.approvalStatus == 1 ) && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                     <shiro:hasPermission name="projectReport:projectReportSignature:edit">,"canedit1":	<c:choose><c:when test="${projectReportSignature.reportStatus == 1 && fns:getUser().id == projectReportSignature.createBy.id }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     ,"approvalCanedit1":<c:choose><c:when test="${projectReportSignature.approvalStatus == 1 && fns:getUser().id == projectReportSignature.createBy.id }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     ,"canedit2":<c:choose><c:when test="${projectReportSignature.reportStatus == 4 && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>