ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(自定义对比): 78387

Browse Source
This commit is contained in:
yjz
2023-11-14 15:52:50 +08:00
parent 160dc54d45
commit 4fb2332737
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+14 -8
View File
@@ -113,6 +113,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
private static final String INTERPRETATION_ARTICLES = "interpretation_articles"; private static final String INTERPRETATION_ARTICLES = "interpretation_articles";
private static final String INTERPRETATION_ARTICLES_LIST = "interpretationArticlesList"; private static final String INTERPRETATION_ARTICLES_LIST = "interpretationArticlesList";
private static final String MENU_ID = "menu_id"; private static final String MENU_ID = "menu_id";
private static final String CREATE_TIME = "create_time";
public DocumentSplitServiceImpl(DocumentSplitMapper documentSplitMapper, public DocumentSplitServiceImpl(DocumentSplitMapper documentSplitMapper,
ISarFileSplitInfoService sarFileSplitInfoService, ISarFileSplitInfoService sarFileSplitInfoService,
LawsCommonMapper lawsCommonMapper, LawsCommonMapper lawsCommonMapper,
@@ -649,13 +650,18 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
@Override @Override
public void deleteDocumentSplitDetail(Map<String, Object> parameter) { public void deleteDocumentSplitDetail(Map<String, Object> parameter) {
String id = (String) parameter.get(ID); String id = (String) parameter.get(ID);
// 获取原始据信息
Map<String, Object> documentSplitDetail = documentSplitMapper.queryDocumentSplitDetailById(id);
String menuId = (String) documentSplitDetail.get(MENU_ID);
// 删除文档拆分详情数据 // 删除文档拆分详情数据
documentSplitMapper.deleteDocumentSplitDetail(id); documentSplitMapper.deleteDocumentSplitDetail(id);
// 删除对应目录
documentSplitMapper.sarFileSplitMenuDeleteByIdList(Collections.singletonList(menuId)); /**
* // 获取原始据信息
* Map<String, Object> documentSplitDetail = documentSplitMapper.queryDocumentSplitDetailById(id);
* String menuId = (String) documentSplitDetail.get(MENU_ID);
* // 删除对应目录
* documentSplitMapper.sarFileSplitMenuDeleteByIdList(Collections.singletonList(menuId));
*/
//删除对应条目信息 //删除对应条目信息
// 条款解读 // 条款解读
documentSplitMapper.deleteItemsValByItemId(id, DocumentSplitCommon.INTERPRETATION); documentSplitMapper.deleteItemsValByItemId(id, DocumentSplitCommon.INTERPRETATION);
@@ -691,7 +697,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
String newItemValId = UUID.randomUUID().toString().replace("-", ""); String newItemValId = UUID.randomUUID().toString().replace("-", "");
resultMap.put(ID, newItemValId); resultMap.put(ID, newItemValId);
resultMap.put("create_by", loginUser.getUsername()); resultMap.put("create_by", loginUser.getUsername());
resultMap.put("create_time", format); resultMap.put(CREATE_TIME, format);
resultMap.put("update_by", loginUser.getUsername()); resultMap.put("update_by", loginUser.getUsername());
resultMap.put("update_time", format); resultMap.put("update_time", format);
// 字段名和值 // 字段名和值
@@ -1034,7 +1040,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
queryWrapper.like(StringUtils.isNotBlank(splitFileInfo.getStandardFileType()), "standard_file_type", splitFileInfo.getStandardFileType()); queryWrapper.like(StringUtils.isNotBlank(splitFileInfo.getStandardFileType()), "standard_file_type", splitFileInfo.getStandardFileType());
queryWrapper.likeLeft("file_name", ".docx"); queryWrapper.likeLeft("file_name", ".docx");
queryWrapper.isNotNull("o.standard_id"); queryWrapper.isNotNull("o.standard_id");
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc(CREATE_TIME);
return documentSplitMapper.querySplitFileInfoByPage(queryWrapper, new Page<>(pageNo, pageSize)); return documentSplitMapper.querySplitFileInfoByPage(queryWrapper, new Page<>(pageNo, pageSize));
} }
@@ -1214,7 +1220,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
// 逻辑删除 // 逻辑删除
queryWrapper.eq("del_flag", 0); queryWrapper.eq("del_flag", 0);
// 排序 // 排序
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc(CREATE_TIME);
return queryWrapper; return queryWrapper;
} }
} }