diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 47ed0800..d107626a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1362,7 +1362,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { Charset correctCharset = null; // 尝试不同的编码来找到正确的字符集 - String[] charsetsToBeTested = {"GB2312", "GBK", "UTF-8", "UTF-16"}; + String[] charsetsToBeTested = {"UTF-8", "GB2312", "GBK", "UTF-16"}; for (String charset : charsetsToBeTested) { try (ZipFile zipFile = new ZipFile(tempFile, Charset.forName(charset))) { if (zipFile.size() > 0) { @@ -1925,7 +1925,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { byte[] mainWorkbookBytes = baos1.toByteArray(); // 2. 生成稽查内容的模板 - Workbook workbook2 = createInspectContentExcelTemplate(); // 这是一个新函数,你需要根据第二个模板的需求来实现 + Workbook workbook2 = createInspectContentExcelTemplate(); ByteArrayOutputStream baos2 = new ByteArrayOutputStream(); workbook2.write(baos2); byte[] inspectContentBytes = baos2.toByteArray(); @@ -2079,7 +2079,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { cell2.setCellValue("填写说明:\n" + "1.所有带星号的为必填\n" + "2.导入数据从第四行开始,第一行为表头,第二行为填写说明,第三行为示例。第四行才是正式数据\n" + - "3.字段为多选属性,必须与系统中对应选项字段相匹配,填写多个时使用逗号隔开\n" + + "3.字段为多选属性,必须与系统中对应选项字段相匹配,填写多个时使用英文逗号隔开\n" + "4.字段为文件属性,填写时需在本文件同级目录下以标准号为名称建立文件夹,并在文件夹内放置文件。假设在A标准号的文件夹内放置了A1文件,那么单元格需填写:A/A1.pdf"); // 应用样式到单元格 cell2.setCellStyle(style); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index bf541e47..e49f7990 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -263,7 +263,7 @@ public class ImportUtil { } private String multiDateConvert(String cellValue) { - String[] dates = cellValue.split(","); + String[] dates = cellValue.split(","); // 用英文逗号拼接 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); StringBuilder dateBuilder = new StringBuilder(); @@ -274,7 +274,7 @@ public class ImportUtil { } private boolean multiDateValid(String cellValue) { - String[] dates = cellValue.split(","); + String[] dates = cellValue.split(","); // 创建一个SimpleDateFormat对象,并指定所需的格式 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); // 使用SimpleDateFormat对象的format方法将Date对象转换为字符串 @@ -290,7 +290,7 @@ public class ImportUtil { } private String convertFileIds(String cellValue, Map fileMap) { - String[] pathList = cellValue.split(","); + String[] pathList = cellValue.split(","); StringBuilder fileIds = new StringBuilder(); for (String path : pathList) { try { @@ -320,7 +320,7 @@ public class ImportUtil { // 体系转换 public String convertStandardSystem(String cellValue) { - List valueList = Arrays.asList(cellValue.split(",")); + List valueList = Arrays.asList(cellValue.split(",")); LambdaQueryWrapper treeNodeLambdaQueryWrapper = new LambdaQueryWrapper<>(); treeNodeLambdaQueryWrapper.in(LawsTreeNode::getNodeName, valueList); List treeNodeList = lawsTreeNodeService.list(treeNodeLambdaQueryWrapper); @@ -343,7 +343,7 @@ public class ImportUtil { // 零部件转换 public String convertPartId(String cellValue) { - List valueList = Arrays.asList(cellValue.split(",")); + List valueList = Arrays.asList(cellValue.split(",")); LambdaQueryWrapper sysDictItemLambdaQueryWrapper = new LambdaQueryWrapper<>(); sysDictItemLambdaQueryWrapper.in(SysDictItem::getItemText, valueList); Map idMap = sysDictItemService.list(sysDictItemLambdaQueryWrapper).stream() @@ -358,7 +358,7 @@ public class ImportUtil { // 多选部门转换 public String convertMultiOrgId(String cellValue) { - List valueList = Arrays.asList(cellValue.split(",")); + List valueList = Arrays.asList(cellValue.split(",")); LambdaQueryWrapper sysDepartLambdaQueryWrapper = new LambdaQueryWrapper<>(); sysDepartLambdaQueryWrapper.in(SysDepart::getDepartName, valueList); List deptList = sysDepartService.list(sysDepartLambdaQueryWrapper); @@ -381,7 +381,7 @@ public class ImportUtil { // 字典转换 public String convertDictValue(String dictCode, String cellValue) { - String[] valueList = cellValue.split(","); + String[] valueList = cellValue.split(","); Map sexDictModelMap = sysBaseAPI.getDictItems(dictCode).stream() .collect(Collectors.toMap(DictModel::getText, d -> d)); @@ -405,7 +405,7 @@ public class ImportUtil { // 字典验证(判断填写的是否是选项中的一个) public boolean dictValid(String dictCode, String cellValue) { - String[] valueList = cellValue.split(","); + String[] valueList = cellValue.split(","); Map sexDictModelMap = sysBaseAPI.getDictItems(dictCode).stream() .collect(Collectors.toMap(DictModel::getText, d -> d)); @@ -434,7 +434,7 @@ public class ImportUtil { // 多选组织机构 public boolean multiOrgValid(String cellValue) { - List valueList = Arrays.asList(cellValue.split(",")); + List valueList = Arrays.asList(cellValue.split(",")); LambdaQueryWrapper sysDepartLambdaQueryWrapper = new LambdaQueryWrapper<>(); sysDepartLambdaQueryWrapper.in(SysDepart::getDepartName, valueList); List list = sysDepartService.list(sysDepartLambdaQueryWrapper); @@ -443,7 +443,7 @@ public class ImportUtil { // 零部件 public boolean partValid(String cellValue) { - String[] valueList = cellValue.split(","); + String[] valueList = cellValue.split(","); List partDictModelList = sysBaseAPI.getDictItems("Part Name"); Map partDictModelMap = partDictModelList.stream() .collect(Collectors.toMap(DictModel::getText, d -> d)); @@ -457,7 +457,7 @@ public class ImportUtil { // 体系校验 public boolean standardSystemValid(String cellValue) { - List valueList = Arrays.asList(cellValue.split(",")); + List valueList = Arrays.asList(cellValue.split(",")); LambdaQueryWrapper treeNodeLambdaQueryWrapper = new LambdaQueryWrapper<>(); treeNodeLambdaQueryWrapper.in(LawsTreeNode::getNodeName, valueList); List treeNodeList = lawsTreeNodeService.list(treeNodeLambdaQueryWrapper); @@ -472,7 +472,7 @@ public class ImportUtil { // 文件校验 private boolean fileValid(String cellValue, Map fileMap) { - String[] pathList = cellValue.split(","); + String[] pathList = cellValue.split(","); for (String path : pathList) { // 校验是否真的有这个文件 File file = fileMap.get(path);