【删除】注释掉以前拉过来的无用代码：文档库、文档库阶段分析、旧收藏、旧搜索中心、旧的状态自动更新日志

【修改】对外报告注释整体修改为资料中心

laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java

@@ -8,7 +8,6 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.enums.LanguageEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.oConvertUtils;
-import com.jero.modules.lanswitch.service.ILanguageSwitchService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
@@ -49,9 +48,6 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
     @Autowired
     private FileSplitItemsEOServiceImpl fileSplitItemsEOService;
 
-    @Autowired
-    private ILanguageSwitchService languageSwitchService;
-
     @Autowired
     private IOSSFileService ossFileService;
 
@@ -262,36 +258,6 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
         return Result.OK(list);
     }
 
-    /**
-     * 查询条件中英文切换
-     *
-     * @return
-     */
-    @AutoLog(value = "查询条件中英文切换")
-    @ApiOperation(value="查询条件中英文切换", notes="查询条件中英文切换")
-    @GetMapping(value = "/queryCondition")
-    @RequiresPermissions("split:sarFileSplitItems:page")
-    public Result<List<Map<String, Object>>> queryCondition(@RequestParam(name = "flag") String flag,
-                                                            @RequestParam(name = "cut") String cut) {
-        List<Map<String, Object>> list = languageSwitchService.queryCondition(flag, cut);
-        return Result.OK(list);
-    }
-
-    /**
-     * 表单中英文切换
-     *
-     * @return
-     */
-    @AutoLog(value = "表单中英文切换")
-    @ApiOperation(value="表单中英文切换", notes="表单中英文切换")
-    @GetMapping(value = "/getForm")
-    @RequiresPermissions("split:sarFileSplitItems:page")
-    public Result<List<Map<String, Object>>> getForm(@RequestParam(name = "flag") String flag,
-                                                     @RequestParam(name = "cut") String cut) {
-        List<Map<String, Object>> list = languageSwitchService.getForm(flag, cut);
-        return Result.OK(list);
-    }
-
     /**
      * 文件上传统一方法
      *

laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java

@@ -10,7 +10,6 @@ import com.jero.common.constant.enums.LanguageEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
-import com.jero.modules.lanswitch.service.ILanguageSwitchService;
 import com.jero.modules.laws.common.constant.ResultCommon;
 import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.oss.entity.OSSFile;
@@ -55,8 +54,6 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@Autowired
 	private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
 
-	@Autowired
-	private ILanguageSwitchService languageSwitchService;
 	@Autowired
 	private IOSSFileService ossFileService;
 
@@ -230,7 +227,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	}
 
 	/**
-	 * ocr识别调取已入库文件
+	 * 拆分调取已入库文件
 	 * @param parameter
 	 * @return
 	 */
@@ -240,7 +237,10 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@ResponseBody
 //	@RequiresPermissions("split:sarFileSplitInfo:splitResult")
 	public Result<IPage<Map<String,Object>>> splitResultPageInfo(@RequestBody Map<String,Object> parameter) {
-		IPage<Map<String,Object>> infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
+//		IPage<Map<String,Object>> infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
+
+		// TODO 数据获取需要从企标和国标里拿，需要重写
+		IPage<Map<String,Object>> infoPage = new Page<>();
 		return Result.OK(infoPage);
 	}
 
@@ -282,18 +282,18 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 		return Result.OK(list);
 	}
 
-	/**
-	 * 查询条件中英文切换
-	 *
-	 * @return
-	 */
-	@AutoLog(value = "查询条件中英文切换")
-	@ApiOperation(value="查询条件中英文切换", notes="查询条件中英文切换")
-	@GetMapping(value = "/queryCondition")
-//	@RequiresPermissions("split:sarFileSplitInfo:page")
-	public Result<List<Map<String, Object>>> queryCondition(@RequestParam(name = "flag") String flag,
-                                                            @RequestParam(name = "cut") String cut) {
-		List<Map<String, Object>> list = languageSwitchService.queryCondition(flag, cut);
-		return Result.OK(list);
-	}
+//	/**
+//	 * 查询条件中英文切换
+//	 *
+//	 * @return
+//	 */
+//	@AutoLog(value = "查询条件中英文切换")
+//	@ApiOperation(value="查询条件中英文切换", notes="查询条件中英文切换")
+//	@GetMapping(value = "/queryCondition")
+////	@RequiresPermissions("split:sarFileSplitInfo:page")
+//	public Result<List<Map<String, Object>>> queryCondition(@RequestParam(name = "flag") String flag,
+//                                                            @RequestParam(name = "cut") String cut) {
+//		List<Map<String, Object>> list = languageSwitchService.queryCondition(flag, cut);
+//		return Result.OK(list);
+//	}
 }

laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java

@@ -536,22 +536,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList())))
                     .collect(Collectors.toList());
         }
-//        List<String> fieldListTemp = fieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
-        //sql查询字段
-//        List<String> fieldListNew = new ArrayList<>();
-//        fieldListNew.add("id"); // 加上主键
-        // 处理数据为空的字段，如果字段值为空，显示斜杠
-//        for (String field : fieldListTemp) {
-//            String fieldTemp = null;
-//            if(fieldDateList.contains(field)){
-//                String fieldNew = "date_format(" + field + ", '%Y-%m-%d')"; // 转时间格式
-//                fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field;
-//                fieldListNew.add(fieldTemp);
-//            }else{
-//                fieldTemp = "case when " + field + " is null then \"\" else " + field + " end " + field;
-//                fieldListNew.add(fieldTemp);
-//            }
-//        }
+
         //sql查询条件
         String condition = getConditionStr(parameter, "page");
         int pageNo = Integer.parseInt((String) parameter.get("pageNo"));
@@ -608,7 +593,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 // 标准选择
                 if(fieldStanList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) {
                     if (entry.getValue().toString().split(",").length > 0) {
-                        List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(entry.getValue().toString());
+                        // TODO 选取的库错误，需要改为国标库 企标库 。需修改
+//                        List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(entry.getValue().toString());
+                        List<Map<String, Object>> documentLibraryEOList = new ArrayList<>();
+
                         Map<String, String> idSerialNumberMap = new HashMap<>();
                         List<String> idList = new ArrayList<>();
                         for (Map<String, Object> map : documentLibraryEOList) {
@@ -722,6 +710,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         return result;
     }
 
+    // TODO 挪到FileSplitItemsEOServiceImpl中
     @NotNull
     private String getConditionStr(Map<String, Object> parameter, String type) {
         //查询条件