fix(标准解读流程): 完善

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

@@ -30,6 +30,10 @@ public class StandardInterpretFlow implements WorkCenterService {
         // 删除业务表数据
         ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
         processAllService.physicalDeleteByProjectId("process_standard_interpret", processAll.getProjectId());
+        processAllService.physicalDeleteByProjectId("process_standard_interpret_clause",
+                processAll.getProjectId());
+        processAllService.physicalDeleteByProjectId("process_standard_interpret_clause_sublist",
+                processAll.getProjectId());
     }
 
     /**

laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java

@@ -447,8 +447,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         int count;
 
         //拆分
-        if (SplitFileTypeTypeEnum.EU.getValue().equals(sarFileSplitInfoEO.getStandardClass())){
-            count = fileSpiltService.fileEU(sarFileSplitInfoEO, SplitFileTypeTypeEnum.EU);
+        if (SplitFileTypeTypeEnum.UN.getValue().equals(sarFileSplitInfoEO.getStandardClass())){
+            count = fileSpiltService.fileEU(sarFileSplitInfoEO, SplitFileTypeTypeEnum.UN);
         }else {
             count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT);
         }

laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java

@@ -12,6 +12,7 @@ import com.google.common.base.CaseFormat;
 import com.jero.common.api.CommonAPI;
 import com.jero.common.api.vo.Result;
 import com.jero.common.api.vo.ResultCommon;
+import com.jero.common.constant.CommonConstant;
 import com.jero.common.es.JeroElasticsearchTemplate;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -42,6 +43,8 @@ import com.jero.modules.laws.standard.service.ILawsNewsFeedService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
+import com.jero.modules.split.entity.SarFileSplitItemsValEO;
+import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysDictService;
@@ -117,6 +120,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
     @Resource
     private ISysDictItemService sysDictItemService;
     @Resource
+    private SarFileSplitItemsValEOMapper sarFileSplitItemsValEOMapper;
+    @Resource
     private IDocumentSplitService documentSplitService;
     @Resource
     private ISarFileSplitInfoService sarFileSplitInfoService;
@@ -1382,6 +1387,22 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
             List<Map<String, Object>> clauseList = lawsHomeAdvancedSearchClauseVO.getClauseList();
             List<LawsHomeAdvancedSearchClauseExcelVO> lawsHomeAdvancedSearchClauseExcelVOS =
                     JSON.parseArray(JSON.toJSONString(clauseList), LawsHomeAdvancedSearchClauseExcelVO.class);
+            // 条款详情
+            for (LawsHomeAdvancedSearchClauseExcelVO lawsHomeAdvancedSearchClauseExcelVO :
+                    lawsHomeAdvancedSearchClauseExcelVOS) {
+                List<SarFileSplitItemsValEO> sarFileSplitItemsValEOS = sarFileSplitItemsValEOMapper.findList(
+                        new QueryWrapper<SarFileSplitItemsValEO>()
+                                .eq("item_id", lawsHomeAdvancedSearchClauseExcelVO.getId())
+                                .eq("type", "TEXT")
+                                .eq("valid_flag", CommonConstant.DEL_FLAG_0)
+                                .orderByAsc("display_seq"));
+                if (!Objects.isNull(sarFileSplitItemsValEOS)){
+                    String itemContents = sarFileSplitItemsValEOS.stream()
+                            .map(SarFileSplitItemsValEO::getItemContent)
+                            .collect(Collectors.joining("\n\r"));
+                    lawsHomeAdvancedSearchClauseExcelVO.setItemContent(itemContents);
+                }
+            }
             // 条款sheet页
             Map<String, Object> clauseSheet = new HashMap<>();
             clauseSheet.put(NormalExcelConstants.CLASS, LawsHomeAdvancedSearchClauseExcelVO.class);
@@ -1549,6 +1570,9 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         // 过滤已发布数据
         List<String> infoIdList = data.stream().map(v -> String.valueOf(v.get("info_id")))
                 .distinct().collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(infoIdList)){
+            return lawsHomeAdvancedSearchClauseVOList;
+        }
         List<SarFileSplitInfoEO> list = sarFileSplitInfoService.list(new LambdaQueryWrapper<SarFileSplitInfoEO>()
                 .in(SarFileSplitInfoEO::getId, infoIdList).isNull(SarFileSplitInfoEO::getPublishBeforeId));
         List<String> idList = list.stream().map(v -> v.getId()).collect(Collectors.toList());

laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchClauseExcelVO.java

@@ -16,6 +16,12 @@ import java.io.Serializable;
  **/
 @Data
 public class LawsHomeAdvancedSearchClauseExcelVO implements Serializable {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
     /**
      * 条款号
      */

laws-modules/src/main/java/com/jero/modules/split/enums/SplitFileTypeTypeEnum.java

@@ -11,7 +11,7 @@ public enum SplitFileTypeTypeEnum {
 	KMVSS_TABLE("KMVSS_Table","KMVSS_Table"),
 	KMVSS_ARTICLE("KMVSS_Article","KMVSS_Article"),
 	US("CFR","美国"),
-	EU("UNECE","欧洲"),
+	UN("UN","欧洲"),
 	/**
 	 * Japan Attachment
 	 */