fix(解读流程): 译文调整

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java

@@ -41,6 +41,10 @@ public class ProcessStandardInterpretClause extends BaseEntity {
     @TableField(exist = false)
     @Excel(name = "条款内容", width = 15)
     private String itemContent;
+    /**译文*/
+    @ApiModelProperty(value = "译文")
+    @TableField(exist = false)
+    private String translation;
     /**各涉及部门解读人*/
     @ApiModelProperty(value = "各涉及部门解读人")
     @Excel(name = "各涉及部门解读人", width = 18, dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java

@@ -51,6 +51,7 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity {
     /**译文*/
     @ApiModelProperty(value = "译文")
     @Excel(name = "译文", width = 15)
+    @TableField(exist = false)
     private String translation;
     /**是否与上一版相同（字典：1：是，0：否）*/
     @ApiModelProperty(value = "是否与上一版相同（字典：1：是，0：否）")

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml

@@ -8,6 +8,7 @@
                               IF(lds.id is not null, lds.standard_number, lds2.item_num) itemNum,
                               IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle,
                               IF(lds.id is not null, null, lds2.item_content) itemContent,
+                              lds2.translation,
                               standard_interpret_id,
                               psic.clause_id,
                               interpret_person_ids,

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java

@@ -468,8 +468,6 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                             // 合并
                             first.setInterpretPersonId(mergeString(first.getInterpretPersonId(),
                                     standardInterpretClauseSublist.getInterpretPersonId()));
-//                            first.setTranslation(mergeString(first.getTranslation(),
-//                                    standardInterpretClauseSublist.getTranslation()));
                             first.setIsSameAsPrevVersion(mergeString(first.getIsSameAsPrevVersion(),
                                     standardInterpretClauseSublist.getIsSameAsPrevVersion()));
                             first.setChangeDescription(mergeString(first.getChangeDescription(),
@@ -748,6 +746,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                         .map(SarFileSplitItemsValEO::getItemContent)
                         .collect(Collectors.joining("\n\r"));
                 processStandardInterpretClause.setItemContent(itemContents);
+                String translation = sarFileSplitItemsValEOS.stream()
+                        .map(SarFileSplitItemsValEO::getTranslation)
+                        .collect(Collectors.joining("\n\r"));
+                processStandardInterpretClause.setTranslation(translation);
             }
         }
 
@@ -862,6 +864,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                             .map(SarFileSplitItemsValEO::getItemContent)
                             .collect(Collectors.joining("\n\r"));
                     processStandardInterpretClauseSublist.setItemContent(itemContents);
+                    String translation = sarFileSplitItemsValEOS.stream()
+                            .map(SarFileSplitItemsValEO::getTranslation)
+                            .collect(Collectors.joining("\n\r"));
+                    processStandardInterpretClauseSublist.setTranslation(translation);
                 }
             }
         }else {
@@ -890,6 +896,10 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                             .map(SarFileSplitItemsValEO::getItemContent)
                             .collect(Collectors.joining("\n\r"));
                     processStandardInterpretClause.setItemContent(itemContents);
+                    String translation = sarFileSplitItemsValEOS.stream()
+                            .map(SarFileSplitItemsValEO::getTranslation)
+                            .collect(Collectors.joining("\n\r"));
+                    processStandardInterpretClause.setTranslation(translation);
                 }
             }