报告删除操作

src/main/java/com/jeeplus/common/utils/MenuStatusEnum.java

@@ -34,6 +34,8 @@ public enum MenuStatusEnum {
     WORK_RECORDS("22d943bb9e614ca69148743ff28e2362","项目登记"),
     OVERALL_WORK_RECORDS("5bbf7fdd208149bf8b353d34b089ec09","全过程-工程咨询-项目登记"),
     OVERALL_COST_WORK_RECORDS("20ce4621fb7d4831adc95cb83cbba756","全过程-造价审核-项目登记"),
+    OVERALL_WORK_RECORD_LIST("95f8a1999204460b9a78d1d20b85a0fb","全过程-工程咨询-项目列表"),
+    OVERALL_COST_WORK_RECORD_LIST("bac3717361294087887c9af75066e32a","全过程-造价审核-项目列表"),
     WORK_INVOICEDETAIL("84312d6a28e948b8b7b68185cf8d4d72","发票明细"),
     WORK_INVOICEALTER("89323021918e444bae3537521046d19f","开票管理"),
     WORK_CONTRACT_INFO("b9309305d94f4ee8b66eebbcae9f2db4","合同登记"),

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

@@ -7,6 +7,7 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
+import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectReportData;
@@ -74,4 +75,16 @@ public interface RuralProjectMessageDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
     ProjectReportRecord getProjectReportRecord(String reportId);
+
+    /**
+     * 修改工作内容中的info_id信息
+     * @param projectcontentinfo
+     */
+    void updateProjectcontentinfo(Projectcontentinfo projectcontentinfo);
+
+    /**
+     * 删除报告信息
+     * @param projectReportData
+     */
+    void deleteReport(ProjectReportData projectReportData);
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -69,6 +69,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String projectType; //类型 1.工程咨询 2.造价审核
 
 	private String prrId;
+	private String projectReportName;
 
 	public String getPrrId() {
 		return prrId;
@@ -636,4 +637,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setProjectType(String projectType) {
 		this.projectType = projectType;
 	}
+
+	public String getProjectReportName() {
+		return projectReportName;
+	}
+
+	public void setProjectReportName(String projectReportName) {
+		this.projectReportName = projectReportName;
+	}
 }

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

@@ -143,9 +143,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     public Page<RuralProjectRecords> findPage(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords) {
         //设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
-            String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
-            if(StringUtils.isBlank(dataScopeSql)){
-                dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+            String dataScopeSql = null;
+            //判断查询为工程咨询信息
+            if("1".equals(projectRecords.getProjectType())){
+                dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORD_LIST.getValue());
+            } else if("2".equals(projectRecords.getProjectType())){//判断查询为造价审核信息
+                dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_COST_WORK_RECORD_LIST.getValue());
             }
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
@@ -1340,4 +1343,22 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         this.queryReportData(projectRecords);
     }
 
+    /**
+     * 修改工作内容中的info_id信息
+     * @param projectcontentinfo
+     */
+    @Transactional(readOnly = false)
+    public void updateProjectcontentinfo(Projectcontentinfo projectcontentinfo){
+        dao.updateProjectcontentinfo(projectcontentinfo);
+    }
+
+    /**
+     * 删除报告信息
+     * @param projectReportData
+     */
+    @Transactional(readOnly = false)
+    public void deleteReport(ProjectReportData projectReportData){
+        dao.deleteReport(projectReportData);
+    }
+
 }

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

@@ -259,6 +259,25 @@ public class RuralCostProjectMessageController extends BaseController {
     }
 
     /**
+     * 删除报告信息
+     * @param projectcontentinfo
+     * @param status
+     * @param model
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping(value = "deleteReport")
+    public String deleteReport(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
+        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        //修改工作内容中的信息（将工作内容的info_id清空）
+        ruralProjectMessageService.updateProjectcontentinfo(projectcontentinfo1);
+        //删除报告信息
+        ruralProjectMessageService.deleteReport(projectReportData);
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+    }
+
+    /**
      * 读取单个实体流程
      * @return
      */

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

@@ -204,8 +204,8 @@ public class RuralProjectMessageController extends BaseController {
      * @return
      */
     @RequestMapping(value = {"saveReport"})
-    public String saveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes) throws Exception {
-        //try{
+    public String saveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes) {
+        try{
             String str = ruralProjectMessageService.saveData(projectcontentinfo,2);
             addMessage(redirectAttributes, "发起报告审批"+(str.equals("true")?"成功":"失败"));
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
@@ -215,9 +215,9 @@ public class RuralProjectMessageController extends BaseController {
                 }
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
             }
-        /*}catch (Exception e){
+        }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
-        }*/
+        }
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
@@ -241,9 +241,9 @@ public class RuralProjectMessageController extends BaseController {
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
             if (projectReportData!=null){
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
-                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
                 }
-                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
             }
         }catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
@@ -253,7 +253,26 @@ public class RuralProjectMessageController extends BaseController {
         }
         addMessage(redirectAttributes, "暂存报告失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
-        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+    }
+
+    /**
+     * 删除报告信息
+     * @param projectcontentinfo
+     * @param status
+     * @param model
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping(value = "deleteReport")
+    public String deleteReport(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
+        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        //修改工作内容中的信息（将工作内容的info_id清空）
+        ruralProjectMessageService.updateProjectcontentinfo(projectcontentinfo1);
+        //删除报告信息
+        ruralProjectMessageService.deleteReport(projectReportData);
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
     }
 
     /**

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

@@ -212,6 +212,7 @@
 		o.top_company AS "office.name",
 		ifnull(prd.number ,"") as "projectReportNumber"
 		,ifnull(prd.status,0) as "projectReportStatus"
+		,ifnull(prd.name,"") as "projectReportName"
 		,ifnull(prr.status,0) as "projectReportRecordStatus",
         prr.record_num as recodeNum,
 		prr.process_instance_id as prrProcessInstanceId
@@ -904,4 +905,14 @@
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		WHERE a.report_id = #{reportId}
 	</select>
+
+	<update id="updateProjectcontentinfo">
+		update project_content_info
+		set info_id = null
+		where id = #{id}
+	</update>
+
+	<delete id="deleteReport">
+		delete from project_report_data where id = #{id}
+	</delete>
 </mapper>

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

@@ -344,14 +344,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>";
 							}
 							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>";
 							}
 							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>";
 							}
 							if(d.recordcancel != undefined && d.recordcancel =="1")
 							{

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.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/ruralProjectRecords/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/ruralProjectMessage/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/ruralProjectMessage/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/ruralProjectMessage/formRecord?reportId=" + d.id + "&view=view','95%', '95%')\">" + d.recodeNum + "</a>";
@@ -320,14 +320,19 @@
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
                             xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/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/ruralProjectMessage/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/ruralProjectMessage/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/ruralProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/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")
                         {
@@ -382,6 +387,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>