Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

2022-08-19 16:32:03 +08:00
parent e543d213d6 1768dd0fe3
commit e958f3f5f1
1 changed files with 7 additions and 4 deletions
@@ -141,12 +141,17 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 		String id = lawsMonthlyReportManageEO.getId();
 		String issueStatus = lawsMonthlyReportManageEO.getIssueStatus();

-		LawsMonthlyReportManageEO monthlyReportManageEO = getById(id);
-
 		Date issueTime = new Date();
 		lawsMonthlyReportManageEO.setUpdateTime(issueTime);
 		this.updateById(lawsMonthlyReportManageEO);

+		// 同步es
+//		syncElasticsearch(id, issueStatus, issueTime);
+	}
+
+	private void syncElasticsearch(String id, String issueStatus, Date issueTime) {
+		LawsMonthlyReportManageEO monthlyReportManageEO = getById(id);
+
 		if ("1".equals(issueStatus)) { // 已发布---发布操作
 			// 添加月报到es
 			OSSFile ossFile = iOSSFileService.getById(monthlyReportManageEO.getFileId());
@@ -240,9 +245,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 				log.error("文档库删除es失败");
 			}
 		}
-
 	}
-
 	private void putMap(String id, String moduleType,
 						  String content, String title , String fileText,
 						  String fileName, String fileId, Date issueTime, String cut,