资料缺失说明添加作废按钮

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectReportRecordDao.java

@@ -74,4 +74,11 @@ public interface ProjectReportRecordDao extends CrudDao<ProjectReportRecord> {
      * @return
      */
     Integer updateReported(RuralProjectRecords projectRecords);
+
+    /**
+     * 作废资料缺失说明
+     * @param materialDefectRecord
+     * @return
+     */
+    Integer deleteDefectRecord(ProjectMaterialDefectRecord materialDefectRecord);
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectMaterialDefectRecordService.java

@@ -28,6 +28,7 @@ import com.jeeplus.modules.workactivity.service.ActivityService;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workactivitymenu.service.WorkActivityMenuService;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
@@ -431,4 +432,15 @@ public class ProjectMaterialDefectRecordService extends CrudService<ProjectRepor
         ruralProjectMessageDao.updateProjectMaterialDefectRecord(projectReportRecord);
         return "保存审核意见成功！";
     }
+
+    @Transactional(readOnly = false)
+    public void delete(ProjectMaterialDefectRecord materialDefectRecord) {
+        projectReportRecordDao.deleteDefectRecord(materialDefectRecord);
+        //删除流程表信息
+        workProjectNotifyService.deleteActivityProcess(materialDefectRecord.getProcessInstanceId());
+        //删除流程人员表信息
+        workProjectNotifyService.deleteActivityProcessUser(materialDefectRecord.getProcessInstanceId());
+
+
+    }
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportDefectRecordController.java

@@ -524,4 +524,28 @@ public class ProjectReportDefectRecordController extends BaseController {
 			return "redirect:"+Global.getAdminPath()+"/project/projectEarlyPigeonhole/?repage";
 		}
 	}
+
+	/**
+	 * 作废资料缺失说明
+	 * @param materialDefectRecord
+	 * @param redirectAttributes
+	 * @return
+	 */
+	@RequestMapping(value = "delete")
+	public String delete(ProjectMaterialDefectRecord materialDefectRecord, RedirectAttributes redirectAttributes) {
+		ProjectMaterialDefectRecord defectRecord = materialDefectRecordService.getMaterialDefectRecord(materialDefectRecord.getId());
+		if(defectRecord.getStatus().equals(materialDefectRecord.getStatus())){
+			addMessage(redirectAttributes, "作废成功");
+			materialDefectRecordService.delete(defectRecord);
+		}else{
+			addMessage(redirectAttributes, "该合同不是撤回、驳回状态，无法作废");
+		}
+		addMessage(redirectAttributes, "作废资料缺失说明成功");
+		if (StringUtils.isNotBlank(materialDefectRecord.getView()) && materialDefectRecord.getView().equals("zixun")){
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+		}
+		return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+
+
+	}
 }

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportRecordDao.xml

@@ -392,4 +392,10 @@
 			record_state = #{projectRecordStatus}
 		WHERE id = #{id}
 	</update>
+
+	<update id="deleteDefectRecord">
+		UPDATE project_material_defect_record SET
+			status = 7
+		WHERE id = #{id}
+	</update>
 </mapper>

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

@@ -482,12 +482,13 @@ function getdefectRecordState(id)
     result.action = true;
     switch(id)
     {
-        case "0":result.label = "tempstore";result.status="未发起";result.action = false;break;
+        case "0":result.status="";result.action = false;break;
         case "1":result.label = "tempstore";result.status="暂存";result.action = false;break;
         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 "7":result.label = "discarded";result.status="作废";result.action = false;break;
         case "8":result.label = "changing";result.status="变更中";break;
         case "10":result.label = "unknown";result.status="待发起";result.action = false;break;
         default:

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

@@ -1090,6 +1090,7 @@
 							}
 							if(d.projectReportRecordStatus == 1){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
+
 							}
 							if(d.projectReportRecordStatus == 2){
 								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回线上归档</a>";
@@ -1110,7 +1111,7 @@
 					//归档资料缺失说明
 					if(d.projectReportStatusTwo == 0){
 						if(d.projectReportStatus == 5){
-							if(d.submitMoney != 2){
+							if(d.emergencyProject == 1){
 								if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
 									if (d.defectRecordStatus==0) {
 										xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
@@ -1120,10 +1121,12 @@
 									}
 									if (d.defectRecordStatus==3){
 										xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+										xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
 									}
 									if(d.defectRecordStatus == 4){
 										//驳回操作
 										xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+										xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
 									}
 								}
 							}
@@ -1139,10 +1142,14 @@
 								}
 								if (d.defectRecordStatus==3){
 									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
+
 								}
 								if(d.defectRecordStatus == 4){
 									//驳回操作
 									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
+
 								}
 							}
 						}

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

@@ -1111,7 +1111,7 @@
 					//归档资料缺失说明
 					if(d.projectReportStatusTwo == 0){
 						if(d.projectReportStatus == 5){
-							if(d.submitMoney != 2){
+							if(d.emergencyProject == 1){
 								if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
 									if (d.defectRecordStatus==0) {
 										xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
@@ -1121,10 +1121,14 @@
 									}
 									if (d.defectRecordStatus==3){
 										xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+										xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
+
 									}
 									if(d.defectRecordStatus == 4){
 										//驳回操作
 										xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+										xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
+
 									}
 								}
 							}
@@ -1140,10 +1144,12 @@
 								}
 								if (d.defectRecordStatus==3){
 									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+"&view=zixun ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
 								}
 								if(d.defectRecordStatus == 4){
 									//驳回操作
-									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明1</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=zixunModify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改资料说明</a>";
+									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 说明作废</a>";
 								}
 							}
 						}