jiangwenjun
/
reference
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

二审人员的列表页面返回编辑人员信息

This commit is contained in:
sunflower2014 2025-09-28 20:43:53 +08:00
parent c571f8bd28
commit bef193635a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java
View File

@ -19,7 +19,7 @@ import com.jinrui.reference.core.typehandler.JsonArrayTypeHandler;
public interface NewsMapper { public interface NewsMapper {
@Delete("update news set is_delete = 1, update_time = now(), editor_id = #{editorId} where id = #{newsId} and status = 1") @Delete("update news set is_delete = 1, update_time = now(), editor_id = #{editorId} where id = #{newsId} and status in (-1, 1) ")
int deleteNews(@Param("newsId") Long newsId, @Param("editorId") Long editorId); int deleteNews(@Param("newsId") Long newsId, @Param("editorId") Long editorId);
@Delete("update news set is_delete = 0, update_time = now(), editor_id = #{editorId} where id = #{newsId}") @Delete("update news set is_delete = 0, update_time = now(), editor_id = #{editorId} where id = #{newsId}")

21
core/src/main/java/com/jinrui/reference/core/service/NewsService.java
View File

@ -162,8 +162,8 @@ public class NewsService {
Map<Long, Industry> industryMap = allIndustrys.stream().collect(Collectors.toMap(Industry::getId, Function.identity())); Map<Long, Industry> industryMap = allIndustrys.stream().collect(Collectors.toMap(Industry::getId, Function.identity()));
Long draftId = news.getDraftId(); Long draftId = news.getDraftId();
if (draftId != null) { NewsDraft newsDraft = Optional.ofNullable(draftId).map(e -> newsMapper.getDraftDetail(e)).orElse(null);
NewsDraft newsDraft = newsMapper.getDraftDetail(draftId); if (newsDraft != null) {
NewsDetailVO newsDetailVO = new NewsDetailVO(newsDraft); NewsDetailVO newsDetailVO = new NewsDetailVO(newsDraft);
newsDetailVO.setId(id); newsDetailVO.setId(id);
newsDetailVO.setDeleted(news.getDeleted()); newsDetailVO.setDeleted(news.getDeleted());
@ -379,12 +379,10 @@ public class NewsService {
return llmFlag; return llmFlag;
} }
@Deprecated
public ResultObject<Void> createPublish(Long editorId, SaveNewsDTO saveNewsDTO, boolean isReviewer) { public ResultObject<Void> createPublish(Long editorId, SaveNewsDTO saveNewsDTO, boolean isReviewer) {
Long id = saveNewsDTO.getId(); Long id = saveNewsDTO.getId();
Long newsId = saveNewsDTO.getId(); Long newsId = saveNewsDTO.getId();
Integer newStatus = 2; Integer newStatus = 2;
Integer oldStatus = (isReviewer ? 4: 3);
News news; News news;
Long draftId = null; Long draftId = null;
String newsInfoId = null; String newsInfoId = null;
@ -402,7 +400,7 @@ public class NewsService {
// 已发布 // 已发布
saveNewsDTO.setStatus(2); saveNewsDTO.setStatus(2);
saveNewsDTO.setPublishTime(new Date()); saveNewsDTO.setPublishTime(new Date());
// saveNewDraft(saveNewsDTO, null, isReviewer); saveNewDraft(saveNewsDTO, null, isReviewer?"01":"02");
} }
Long newIdRl = saveNewsDTO.getId(); Long newIdRl = saveNewsDTO.getId();
@ -412,9 +410,14 @@ public class NewsService {
news.setNewsinfoId(newsInfoId); news.setNewsinfoId(newsInfoId);
news.setDraftId(isReviewer ? null: draftId); news.setDraftId(isReviewer ? null: draftId);
int count = newsMapper.updateNews(news, oldStatus); int count = newsMapper.updateNews(news, 4);
if (count == 0) { if (count == 0) {
return ResultObject.failed("该资讯正在审核中，请勿重复操作"); if (!isReviewer) {
count = newsMapper.updateNews(news, 3);
}
if (count == 0) {
return ResultObject.failed("该资讯正在审核中，请勿重复操作");
}
} }
// zzp // zzp
deleteNewsRel(newsId); deleteNewsRel(newsId);
@ -558,7 +561,7 @@ public class NewsService {
return ResultObject.failed("请先手动下架新闻然后进行删除!"); return ResultObject.failed("请先手动下架新闻然后进行删除!");
} }
if (status == 3) { if (status == 3 || status == 4) {
return ResultObject.failed("该资讯正在审核中，请勿重复操作"); return ResultObject.failed("该资讯正在审核中，请勿重复操作");
} }
@ -935,7 +938,7 @@ public class NewsService {
newsMap.put(newsVO.getId(), newsVO); newsMap.put(newsVO.getId(), newsVO);
} }
resultList.add(newsVO); resultList.add(newsVO);
if (isReviewer) { if (isReviewer||isSecondReviewRange) {
newsVO.setSubmitter(this.getNewsLastSubmitter(news.getId())); newsVO.setSubmitter(this.getNewsLastSubmitter(news.getId()));
} }
} }