Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/thread/ApprovalThread.java

@@ -170,7 +170,7 @@ public class ApprovalThread extends Thread {
                             //将空白单的documentId存入数据库种
                             projectReportData.setSignatureInvalidDocumentId(String.join(",", invalidDocumentList));
                             //根据项目id 和 documentId生成合同id
-                            HashMap contractIdHashMap = ruralProjectMessageService.getSignatureContractId1(ruralProjectRecords.getId(), documentList,ruralProjectRecords.getProjectMasterId(),"");
+                            HashMap contractIdHashMap = ruralProjectMessageService.getSignatureContractId(ruralProjectRecords.getId(), documentList,ruralProjectRecords.getProjectMasterId(),"");
                             String contractIdCode = contractIdHashMap.get("code").toString();
                             String contractId = "";
                             if("0".equals(contractIdCode)){