From ae81492f5c4646b8d2ce7b543774e883a7bf6942 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 6 Nov 2023 17:21:03 +0800 Subject: [PATCH 1/3] fix: 78217 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企业标准-编辑 添加授权部门，没有存上 --- .../common/service/impl/LawsCommonServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 1d102b48..90bb9031 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 @@ -20,7 +20,9 @@ import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.util.ImportUtil; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; @@ -133,6 +135,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { private ILawsOverseasStandardService lawsOverseasStandardService; @Autowired private ILawsEnterpriseStandardService lawsEnterpriseStandardService; + @Resource + private EnterpriseStandardAuthDeptService enterpriseAuthDeptService; /** * @Author: liao @@ -1076,6 +1080,14 @@ public class LawsCommonServiceImpl implements ILawsCommonService { esIcWrapper.eq(EnterpriseStandardInspectContent::getStandardId, id); List list = esInspectContentService.list(esIcWrapper); stringObjectMap.put("checkList", list); + // 企标独有的授权部门 + LambdaQueryWrapper authDeptWrapper = new LambdaQueryWrapper<>(); + authDeptWrapper.eq(EnterpriseStandardAuthDept::getStandardId, id); + List authDeptList = enterpriseAuthDeptService.list(authDeptWrapper); + // 将authDeptList的所有auth_dept取出来转换成逗号拼接的字符串 + String authDept = authDeptList.stream().map(EnterpriseStandardAuthDept::getAuthDept) + .collect(Collectors.joining(",")); + stringObjectMap.put(FieldCommon.AUTH_DEPT, authDept); } // 标准拆分标识 From 5c2e7328892367c3b72f573a6d322cfe13e69e9a Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 6 Nov 2023 17:46:09 +0800 Subject: [PATCH 2/3] fix: 78168 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企标计划-查询 制修订类型不能查询出对应的数据 --- .../mapper/xml/EnterpriseStandardPlanMapper.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml index dc198108..2ae61d39 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml @@ -150,27 +150,27 @@ AND p.change_status = #{param.changeStatus} - + AND u3.username LIKE CONCAT('%',#{param.standardPromoterWorkNo},'%') - + AND p.standard_type = #{param.standardType} - + AND p.application_category = #{param.revisionType} - + AND p.application_category = #{param.applicationCategory} - + AND p.plan_approval_date BETWEEN #{param.planApprovalStartDate} AND #{param.planApprovalEndDate} - + AND p.create_time BETWEEN #{param.createStartDate} AND #{param.createEndDate} From bb0875bb4f0193d6cdc7774f7367821e38dee1fe Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 6 Nov 2023 18:15:21 +0800 Subject: [PATCH 3/3] fix: 78190 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企标--导入--导入文件夹内的excel文件与下载模板的名称不一样提示语不对 --- .../service/impl/LawsCommonServiceImpl.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) 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 90bb9031..91f956e7 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 @@ -1452,7 +1452,28 @@ public class LawsCommonServiceImpl implements ILawsCommonService { FileUnZip.deleteDir(saveDirectory); throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); } - + String excelName = excelfilelist.get(0).getName(); + if (tableName.equals(TableNameEnum.ENTERPRISE_STANDARDS.getTableName())) { + // 检查Excel的文件名 + if (!excelName.equals("企业标准导入模板.xlsx")) { + FileUnZip.deleteDir(saveDirectory); + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); + } + } + if (tableName.equals(TableNameEnum.DOMESTIC_REGULATIONS.getTableName())) { + // 检查Excel的文件名 + if (!excelName.equals("国内标准导入模板.xlsx")) { + FileUnZip.deleteDir(saveDirectory); + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); + } + } + if (tableName.equals(TableNameEnum.FOREIGN_REGULATIONS.getTableName())) { + // 检查Excel的文件名 + if (!excelName.equals("海外标准导入模板.xlsx")) { + FileUnZip.deleteDir(saveDirectory); + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); + } + } // 数据内容格式校验 Map fileMap = new HashMap<>(); try (Workbook workbook = new XSSFWorkbook(Files.newInputStream(excelfilelist.get(0).toPath()))) { @@ -1967,7 +1988,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { ByteArrayOutputStream baosZip = new ByteArrayOutputStream(); try (ZipOutputStream zos = new ZipOutputStream(baosZip)) { // 添加第一个文件到ZIP中 - ZipEntry entry1 = new ZipEntry("企标导入模板.xlsx"); + ZipEntry entry1 = new ZipEntry("企标标准导入模板.xlsx"); zos.putNextEntry(entry1); zos.write(mainWorkbookBytes); zos.closeEntry();