报告、审定单签章代码提交

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

@@ -532,7 +532,16 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         Boolean success = (Boolean) map.get("success");
         //如果数据报错，则数据撤回到暂存环节
         if(!success){
-            String message = (String) map.get("message");
+
+            //如果发起签章不正确，则需要将已发起的流程撤回 并调整为暂存状态
+            if (projectReportSignature.getSignatureType().equals("1")){
+                //报告撤回
+                this.cancelInvalidate(signature);
+            }else {
+                //审定单撤回
+                this.cancelInvalidateApproval(signature);
+            }
+            String message = (String) map.get("str");
             return message;
         }
         return "保存签章申请成功";
@@ -620,7 +629,15 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         Boolean success = (Boolean) map.get("success");
         //如果数据报错，则数据撤回到暂存环节
         if(!success){
-            String message = (String) map.get("message");
+            //如果发起签章不正确，则需要将已发起的流程撤回 并调整为暂存状态
+            if (projectReportSignature.getSignatureType().equals("1")){
+                //报告撤回
+                this.cancelInvalidate(signature);
+            }else {
+                //审定单撤回
+                this.cancelInvalidateApproval(signature);
+            }
+            String message = (String) map.get("str");
             return message;
         }
         return "保存签章申请成功";
@@ -1116,6 +1133,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                 }
             }else{
                 map.put("str",contractIdHashMap.get("message").toString());
+                map.put("success",false);
+                return map;
             }
 
             String documents = String.join(",", documentList);