归档信息删除操作

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectMessageDao.java

@@ -87,4 +87,10 @@ public interface RuralProjectMessageDao extends CrudDao<RuralProjectRecords> {
      * @param projectReportData
      */
     void deleteReport(ProjectReportData projectReportData);
+
+    /**
+     * 删除归档信息
+     * @param projectReportRecord
+     */
+    void deleteRecord(ProjectReportRecord projectReportRecord);
 }

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

@@ -1361,4 +1361,13 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         dao.deleteReport(projectReportData);
     }
 
+    /**
+     * 删除归档信息
+     * @param projectReportRecord
+     */
+    @Transactional(readOnly = false)
+    public void deleteRecord(ProjectReportRecord projectReportRecord){
+        dao.deleteRecord(projectReportRecord);
+    }
+
 }

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

@@ -607,6 +607,22 @@ public class RuralCostProjectMessageController extends BaseController {
     }
 
     /**
+     * 删除归档信息
+     * @param projectReportRecord
+     * @return
+     */
+    @RequestMapping(value = "deleteRecord")
+    public String deleteRecord(ProjectReportRecord projectReportRecord) {
+        ProjectReportData reportData = ruralProjectMessageService.getProjectReportDateByProjectId(projectReportRecord.getReportId());
+        if(null != reportData){
+            ProjectReportRecord projectReportRecordInfo =ruralProjectMessageService.getProjectReportRecord(reportData.getId());
+            //删除归档信息
+            ruralProjectMessageService.deleteRecord(projectReportRecordInfo);
+        }
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+    }
+
+    /**
      * 读取单个实体流程
      * @return
      */

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

@@ -265,7 +265,7 @@ public class RuralProjectMessageController extends BaseController {
      * @return
      */
     @RequestMapping(value = "deleteReport")
-    public String deleteReport(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+    public String deleteReport(RuralProjectcontentinfo projectcontentinfo) {
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         //修改工作内容中的信息（将工作内容的info_id清空）
@@ -604,6 +604,22 @@ public class RuralProjectMessageController extends BaseController {
     }
 
     /**
+     * 删除归档信息
+     * @param projectReportRecord
+     * @return
+     */
+    @RequestMapping(value = "deleteRecord")
+    public String deleteRecord(ProjectReportRecord projectReportRecord) {
+        ProjectReportData reportData = ruralProjectMessageService.getProjectReportDateByProjectId(projectReportRecord.getReportId());
+        if(null != reportData){
+            ProjectReportRecord projectReportRecordInfo =ruralProjectMessageService.getProjectReportRecord(reportData.getId());
+            //删除归档信息
+            ruralProjectMessageService.deleteRecord(projectReportRecordInfo);
+        }
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+    }
+
+    /**
      * 读取单个实体流程
      * @return
      */

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -915,4 +915,8 @@
 	<delete id="deleteReport">
 		delete from project_report_data where id = #{id}
 	</delete>
+
+	<delete id="deleteRecord">
+		delete from rural_project_report_record where id = #{id}
+	</delete>
 </mapper>

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

@@ -277,8 +277,8 @@
                 ,{field:'projId',align:'center', title: '项目编号',minWidth:150,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralCostProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
                     }}
-                ,{field:'projectReportNumber', align:'center',title: '报告编号',minWidth:200,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.contract + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view','95%', '95%')\">" + d.projectReportNumber + "</a>";
+                ,{field:'projectReportName', align:'center',title: '报告名称',minWidth:200,templet:function(d){
+                        return "<a class=\"attention-info\" title=\"" + d.contract + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view','95%', '95%')\">" + d.projectReportName + "</a>";
 					}}
                 ,{field:'recodeNum', align:'center',title: '归档申请编号',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.contract + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id + "&view=view','95%', '95%')\">" + d.recodeNum + "</a>";
@@ -310,7 +310,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",width:200,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",width:230,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
                         if(d.canAdd != undefined && d.canAdd =="1")
@@ -320,14 +320,17 @@
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
@@ -344,19 +347,19 @@
 							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/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></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/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></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/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></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")
 							{
@@ -387,6 +390,7 @@
                     ,"prrProcessInstanceId":"${projectRecords.prrProcessInstanceId}"
                     ,"prrId":"${projectRecords.prrId}"
                     ,"procId":"${projectRecords.processInstanceId}"
+					,"projectReportName":"${projectRecords.projectReportName}"
                     <c:choose>
                         <c:when test="${flag == '1' or fn:contains(projectRecords.leaderIds,fns:getUser().id)}">
                             ,"canAdd":<c:choose>
@@ -407,7 +411,7 @@
                                         </c:choose>
 
                             ,"cancancel":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 2  && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
@@ -429,7 +433,7 @@
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordcancel":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                         </c:when>

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

@@ -310,7 +310,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",width:200,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",width:230,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
                         if(d.canAdd != undefined && d.canAdd =="1")
@@ -349,14 +349,17 @@
 							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>";
 							}
 							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>";
 							}
 							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>";
 							}
 							if(d.recordcancel != undefined && d.recordcancel =="1")
 							{
@@ -408,7 +411,7 @@
                                         </c:choose>
 
                             ,"cancancel":<c:choose>
-                                            <c:when test="${projectRecords.projectReportStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                            <c:when test="${projectRecords.projectReportStatus == 2 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>
                                             <c:otherwise>"0"</c:otherwise>
                                         </c:choose>
 
@@ -430,7 +433,7 @@
                                 <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"recordcancel":<c:choose>
-                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when>
+                                <c:when test="${projectRecords.projectReportRecordStatus == 2 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                         </c:when>