签章数据优化

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

@@ -1699,6 +1699,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                                 new JudgementThread(ruralProjectRecords,projectReportData).start();
                             }else{
                                 fileFlag = true;
+                                projectReportData.setStatus("5");
                             }
                             //添加审核通过日期
                             projectReportData.setAuditPassDate(new Date());

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

@@ -4374,8 +4374,16 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     /*principalLocations.add(principalLocation);
                     actionUser.setLocations(principalLocations);
                     actions.add(actionUser);*/
+                }else{
+                    hashMap.put("code","2");
+                    hashMap.put("message","查询不到项目负责人 "+ user.getName() + " 的印章信息！请联系管理员");
+                    return hashMap;
                 }
             }
+        }else{
+            hashMap.put("code","2");
+            hashMap.put("message","查询不到项目负责人信息！请联系管理员");
+            return hashMap;
         }
         //总经理
         User technologyPrincipalUser = UserUtils.getByLoginName("陈红星");
@@ -4407,7 +4415,15 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 /*principalLocations.add(principalLocation);
                 actionUser.setLocations(principalLocations);
                 actions.add(actionUser);*/
+            }else{
+                hashMap.put("code","2");
+                hashMap.put("message","查询不到技术负责人 陈红星 的印章信息！请联系管理员");
+                return hashMap;
             }
+        }else{
+            hashMap.put("code","2");
+            hashMap.put("message","查询不到技术负责人信息！请联系管理员");
+            return hashMap;
         }
         List<String> serialIdList = new ArrayList<String>(serialIdSet);
         companyAction.setSealIds("[" + String.join(",", serialIdList) + "]");

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

@@ -1361,7 +1361,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档暂存失败");
             logger.error("保存报告归档暂存失败",e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
     }
 
     /**

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

@@ -346,6 +346,44 @@
 
 		}
 
+		//材料跳转
+		function openDialogreTwo(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				skin:"two-btns",
+				btn: ['送审','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2: function(index){
+				}
+			});
+
+		}
+
 		function openDialogreNew(title,url,width,height,target,buttons) {
 
 			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
@@ -848,20 +886,20 @@
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
 						if(d.emergencyProject == 1){
-							if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5 ){
+							if(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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreTwo('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
 								}
 								if (d.defectRecordStatus==2){
 									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
 								}
 								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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreTwo('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreTwo('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
 								}
 							}
@@ -869,21 +907,21 @@
 					}
 				}else{
 					if(d.projectReportStatusTwo == 5){
-						if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
+						if(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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogreTwo('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 资料缺失说明</a>";
 							}
 							if (d.defectRecordStatus==2){
 								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回说明</a>";
 							}
 							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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogreTwo('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId + "&reportId=" + d.id+" ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogreTwo('撤回修改资料缺失信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescriptionModify?id=" + d.pmdrId+ "&reportId=" + d.id+"&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改资料说明</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\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
 
 							}

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

@@ -285,6 +285,44 @@
 			});
 		}
 
+		//材料跳转
+		function openDialogreTwo(title,url,width,height,target){
+			if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+				width='auto';
+				height='auto';
+			}else{//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				content: url ,
+				skin:"two-btns",
+				btn: ['送审','关闭'],
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn2: function(index){
+				}
+			});
+
+		}
+
 		function openDialogreSub(title,url,width,height,target,formId,tableId) {
 			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 				width = 'auto';
@@ -1116,21 +1154,21 @@
 							if(d.projectReportStatusTwo == 0){
 								if(d.projectReportStatus == 5){
 									if(d.emergencyProject == 1){
-										if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
+										if( 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>";
+												xml+="<a href=\"#\" onclick=\"openDialogreTwo('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
 											}
 											if (d.defectRecordStatus==2){
 												xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回说明</a>";
 											}
 											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=\"#\" onclick=\"openDialogreTwo('撤回修改资料缺失信息', '${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=\"#\" onclick=\"openDialogreTwo('撤回修改资料缺失信息', '${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>";
 
 											}
@@ -1139,20 +1177,20 @@
 								}
 							}else{
 								if(d.projectReportStatusTwo == 5){
-									if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
+									if( 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>";
+											xml+="<a href=\"#\" onclick=\"openDialogreTwo('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 资料缺失说明</a>";
 										}
 										if (d.defectRecordStatus==2){
 											xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelDescription?id=" + d.pmdrId + "&processInstanceId=" + d.pmdrProcessInstanceId + "&view=zixun\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回说明</a>";
 										}
 										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=\"#\" onclick=\"openDialogreTwo('撤回修改资料缺失信息', '${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=\"#\" onclick=\"openDialogreTwo('撤回修改资料缺失信息', '${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>";
 										}
 									}