QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(文档拆分): 合并问题

Browse Source
This commit is contained in:
yjz
2024-08-08 11:05:56 +08:00
parent ea4c92f6c1
commit 232e786c2b
1 changed files with 3 additions and 3 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
+3 -3
View File
@@ -153,7 +153,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
private static final String IS_SAME_AS_PREV_VERSION = "is_same_as_prev_version"; private static final String IS_SAME_AS_PREV_VERSION = "is_same_as_prev_version";
private static final String CHANGE_DESCRIPTION = "change_description"; private static final String CHANGE_DESCRIPTION = "change_description";
private static final String REGULATORY_NOTES = "regulatory_notes"; private static final String REGULATORY_NOTES = "regulatory_notes";
private static final String KEYWORDS = "keywords"; private static final String PART_NAME = "part_name";
private static final String KEY_CONTROLLER = "key_controller"; private static final String KEY_CONTROLLER = "key_controller";
private static final String APPLICABLE_COMPONENTS = "applicable_components"; private static final String APPLICABLE_COMPONENTS = "applicable_components";
private static final String RESPONSIBLE_DEPARTMENT = "responsible_department"; private static final String RESPONSIBLE_DEPARTMENT = "responsible_department";
@@ -666,7 +666,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
String translation = firstData.get(TRANSLATION) + mergeData(listMap, TRANSLATION, false); String translation = firstData.get(TRANSLATION) + mergeData(listMap, TRANSLATION, false);
String changeDescription = firstData.get(CHANGE_DESCRIPTION) + mergeData(listMap, CHANGE_DESCRIPTION, false); String changeDescription = firstData.get(CHANGE_DESCRIPTION) + mergeData(listMap, CHANGE_DESCRIPTION, false);
String regulatoryNotes = firstData.get(REGULATORY_NOTES) + mergeData(listMap, REGULATORY_NOTES, false); String regulatoryNotes = firstData.get(REGULATORY_NOTES) + mergeData(listMap, REGULATORY_NOTES, false);
String keywords = firstData.get(KEYWORDS) + mergeData(listMap, KEYWORDS, true); String partName = firstData.get(PART_NAME) + mergeData(listMap, PART_NAME, true);
String keyController = mergeData2(listMap, KEY_CONTROLLER, true); String keyController = mergeData2(listMap, KEY_CONTROLLER, true);
String applicableComponents = mergeData2(listMap, APPLICABLE_COMPONENTS, true); String applicableComponents = mergeData2(listMap, APPLICABLE_COMPONENTS, true);
String responsibleDepartment = mergeData2(listMap, RESPONSIBLE_DEPARTMENT, true); String responsibleDepartment = mergeData2(listMap, RESPONSIBLE_DEPARTMENT, true);
@@ -700,7 +700,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
"," + TRANSLATION + " = " + "'" + translation + "'" + "," + TRANSLATION + " = " + "'" + translation + "'" +
"," + CHANGE_DESCRIPTION + " = " + "'" + changeDescription + "'" + "," + CHANGE_DESCRIPTION + " = " + "'" + changeDescription + "'" +
"," + REGULATORY_NOTES + " = " + "'" + regulatoryNotes + "'" + "," + REGULATORY_NOTES + " = " + "'" + regulatoryNotes + "'" +
"," + KEYWORDS + " = " + "'" + keywords + "'" + "," + PART_NAME + " = " + "'" + partName + "'" +
"," + KEY_CONTROLLER + " = " + "'" + keyController + "'" + "," + KEY_CONTROLLER + " = " + "'" + keyController + "'" +
"," + APPLICABLE_COMPONENTS + " = " + "'" + applicableComponents + "'" + "," + APPLICABLE_COMPONENTS + " = " + "'" + applicableComponents + "'" +
"," + RESPONSIBLE_DEPARTMENT + " = " + "'" + responsibleDepartment + "'" + "," + RESPONSIBLE_DEPARTMENT + " = " + "'" + responsibleDepartment + "'" +