From 18d7faac2a7ea15196439462d0cb3dfa5ed96641 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 5 Jan 2024 16:02:53 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E7=AB=8B=E9=A1=B9=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessEsInitChangeServiceImpl.java | 17 +---- .../util/EnterpriseStandardUtil.java | 69 ++++++++++--------- 2 files changed, 38 insertions(+), 48 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index 67f5492a..741e4bf1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -50,8 +50,7 @@ import java.util.stream.Collectors; @Service @Transactional(rollbackFor = JeroBootException.class) @Slf4j -public class ProcessEsInitChangeServiceImpl extends ServiceImpl - implements ProcessEsInitChangeService, ESSequenceNumberProvider { +public class ProcessEsInitChangeServiceImpl extends ServiceImpl implements ProcessEsInitChangeService, ESSequenceNumberProvider { @Resource private ActFlowCommonService actFlowCommonService; @@ -214,14 +213,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId) - .set(ProcessEsInitChange::getDelFlag, YesOrNoEnum.YES.getValue()); + updateWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId).set(ProcessEsInitChange::getDelFlag, YesOrNoEnum.YES.getValue()); update(updateWrapper); } @@ -303,8 +293,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl list = this.list(lambdaQueryWrapper); - return list.stream().map(ProcessEsInitChange::getNewEnStandardNo) - .map(EnterpriseStandardUtil::getSequenceNoFromStandardNo).collect(Collectors.toList()); + return list.stream().map(ProcessEsInitChange::getNewEnStandardNo).map(EnterpriseStandardUtil::getSequenceNoFromStandardNo).collect(Collectors.toList()); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java index c98d5f33..826c32e0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java @@ -241,43 +241,44 @@ public class EnterpriseStandardUtil { } } - /** - * 校验企标编号是否不重复 - * @param StandardNumber - * @return - */ - public boolean verifyEnStandardNumber (String StandardNumber){ - List numList = new ArrayList<>(); - // 判断是否和企标库中重复 - numList.addAll(esService.list().stream().map(LawsEnterpriseStandard::getStandardNumber).collect(Collectors.toList())); - // 判断是否和立项流程中重复 - numList.addAll(initChangeService.list().stream().map(ProcessEsInitChange::getNewEnStandardNo).collect(Collectors.toList())); - return !numList.contains(StandardNumber); - } + /** + * 校验企标编号是否不重复 + * + * @param StandardNumber + * @return + */ + public boolean verifyEnStandardNumber(String StandardNumber) { + List numList = new ArrayList<>(); + // 判断是否和企标库中重复 + numList.addAll(esService.list().stream().map(LawsEnterpriseStandard::getStandardNumber).collect(Collectors.toList())); + // 判断是否和立项流程中重复 + numList.addAll(initChangeService.list().stream().map(ProcessEsInitChange::getNewEnStandardNo).collect(Collectors.toList())); + return !numList.contains(StandardNumber); + } - // 判断是否是空Excel - public void isEmptyExcel (Sheet sheet){ - // 验证前三行是否有数据 - for (int rowIndex = 0; rowIndex < 3; rowIndex++) { - Row row = sheet.getRow(rowIndex); - if (row == null) { - // 如果行对象为null，表示这一行不存在，抛出异常 + // 判断是否是空Excel + public void isEmptyExcel(Sheet sheet) { + // 验证前三行是否有数据 + for (int rowIndex = 0; rowIndex < 3; rowIndex++) { + Row row = sheet.getRow(rowIndex); + if (row == null) { + // 如果行对象为null，表示这一行不存在，抛出异常 + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); + } else { + boolean isRowEmpty = true; + for (int cellIndex = row.getFirstCellNum(); cellIndex < row.getLastCellNum(); cellIndex++) { + Cell cell = row.getCell(cellIndex); + if (cell != null && cell.getCellType() != CellType.BLANK) { + // 如果找到非空单元格，设置标志为false并跳出循环 + isRowEmpty = false; + break; + } + } + if (isRowEmpty) { + // 如果行是空的，抛出异常 throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); - } else { - boolean isRowEmpty = true; - for (int cellIndex = row.getFirstCellNum(); cellIndex < row.getLastCellNum(); cellIndex++) { - Cell cell = row.getCell(cellIndex); - if (cell != null && cell.getCellType() != CellType.BLANK) { - // 如果找到非空单元格，设置标志为false并跳出循环 - isRowEmpty = false; - break; - } - } - if (isRowEmpty) { - // 如果行是空的，抛出异常 - throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); - } } } } } +}