From 430477c7e0777531f22fc18dc8906ea75cdc21d9 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 03 十二月 2025 16:53:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditCheckServiceImpl.java | 102 ++++++++++++++++++++++++++-------------------------
1 files changed, 52 insertions(+), 50 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditCheckServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditCheckServiceImpl.java
index ffffc8d..31e852d 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditCheckServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditCheckServiceImpl.java
@@ -24,10 +24,7 @@
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -82,13 +79,6 @@
.map(InternalAuditCheckCatalogue::getId)
.collect(Collectors.toList());
- //批量查询所有内容
- List<InternalAuditCheckContent> allContents = checkContentMapper.selectByCatalogueIds(catalogueIds);
-
- //按目录ID分组内容
- Map<Integer, List<InternalAuditCheckContent>> contentMap = allContents.stream()
- .collect(Collectors.groupingBy(InternalAuditCheckContent::getCheckCatalogueId));
-
//按检查ID分组目录
Map<Integer, List<InternalAuditCheckCatalogue>> catalogueMap = allCatalogues.stream()
.collect(Collectors.groupingBy(InternalAuditCheckCatalogue::getCheckId));
@@ -97,10 +87,6 @@
for (InternalAuditCheck check : checks) {
List<InternalAuditCheckCatalogue> catalogues = catalogueMap.get(check.getId());
if (!CollectionUtils.isEmpty(catalogues)) {
- for (InternalAuditCheckCatalogue catalogue : catalogues) {
- List<InternalAuditCheckContent> contents = contentMap.get(catalogue.getId());
- catalogue.setCheckContents(contents != null ? contents : new ArrayList<>());
- }
check.setCheckCatalogues(catalogues);
}
}
@@ -109,6 +95,17 @@
@Override
@Transactional
public CommonResult insertInternalAuditCheck(InternalAuditCheck internalAuditCheck) {
+
+ Map<String, Object> stringObjectHashMap = new HashMap<>();
+ stringObjectHashMap.put("dept_id",internalAuditCheck.getDeptId());
+ stringObjectHashMap.put("year",internalAuditCheck.getYear());
+ stringObjectHashMap.put("company_id",internalAuditCheck.getCompanyId());
+ stringObjectHashMap.put("del_flag",0);
+ List<InternalAuditCheck> internalAuditChecks = internalAuditCheckMapper.selectByMap(stringObjectHashMap);
+ if (!CollectionUtils.isEmpty(internalAuditChecks)){
+ return CommonResult.failed("当前部门存在，请勿重复添加");
+ }
+
internalAuditCheck.setCreateBy(SecurityUtils.getUsername());
internalAuditCheck.setCreateTime(LocalDateTime.now());
int insert = internalAuditCheckMapper.insert(internalAuditCheck);
@@ -121,44 +118,18 @@
return CommonResult.success();
}
//批量处理目录和内容
- batchInsertCataloguesAndContents(internalAuditCheck.getId(), checkCatalogues);
- return CommonResult.success();
-
- }
-
- private void batchInsertCataloguesAndContents(Integer checkId, List<InternalAuditCheckCatalogue> catalogues) {
- // 1. 设置目录的检查ID并批量插入
- for (InternalAuditCheckCatalogue catalogue : catalogues) {
- catalogue.setCheckId(checkId);
+ for (InternalAuditCheckCatalogue catalogue : checkCatalogues) {
+ catalogue.setCheckId(internalAuditCheck.getId());
}
// 批量插入目录
- int catalogueInsertCount = checkCatalogueMapper.insertBatch(catalogues);
- if (catalogueInsertCount != catalogues.size()) {
+ int catalogueInsertCount = checkCatalogueMapper.insertBatch(checkCatalogues);
+
+ if (catalogueInsertCount != checkCatalogues.size()) {
throw new RuntimeException("插入目录记录数量不匹配");
}
+ return CommonResult.success();
- // 2. 收集所有内容并设置目录ID
- List<InternalAuditCheckContent> allContents = new ArrayList<>();
- for (int i = 0; i < catalogues.size(); i++) {
- InternalAuditCheckCatalogue catalogue = catalogues.get(i);
- List<InternalAuditCheckContent> contents = catalogue.getCheckContents();
-
- if (!CollectionUtils.isEmpty(contents)) {
- for (InternalAuditCheckContent content : contents) {
- content.setCheckCatalogueId(catalogue.getId());
- }
- allContents.addAll(contents);
- }
- }
-
- // 3. 批量插入内容
- if (!CollectionUtils.isEmpty(allContents)) {
- int contentInsertCount = checkContentMapper.insertBatchs(allContents);
- if (contentInsertCount != allContents.size()) {
- throw new RuntimeException("插入内容记录数量不匹配");
- }
- }
}
@Override
@@ -167,14 +138,17 @@
internalAuditCheck.setUpdateTime(LocalDateTime.now());
int update = internalAuditCheckMapper.updateById(internalAuditCheck);
if (update>0){
- checkCatalogueMapper.updatebyCheckId(internalAuditCheck.getId());
-
List<InternalAuditCheckCatalogue> checkCatalogues = internalAuditCheck.getCheckCatalogues();
if (CollectionUtils.isEmpty(checkCatalogues)) {
return CommonResult.success();
}
+ for (InternalAuditCheckCatalogue catalogue : checkCatalogues) {
+ catalogue.setCheckId(internalAuditCheck.getId());
+ }
- batchInsertCataloguesAndContents(internalAuditCheck.getId(), checkCatalogues);
+ // 批量插入目录
+ checkCatalogueMapper.updateCheckCatalogues(checkCatalogues);
+
return CommonResult.success();
}
return CommonResult.failed();
@@ -192,6 +166,34 @@
return CommonResult.success();
}
+ @Override
+ public CommonResult updateByYearAndDeptId(InternalAuditCheck internalAuditCheck) {
+
+ internalAuditCheck.setUpdateBy(SecurityUtils.getUsername());
+ internalAuditCheck.setUpdateTime(LocalDateTime.now());
+ Integer update = internalAuditCheckMapper.updateByYearAndDeptId(internalAuditCheck);
+ if (update>0){
+ checkCatalogueMapper.updatebyCheckId(internalAuditCheck.getId());
+ List<InternalAuditCheckCatalogue> checkCatalogues = internalAuditCheck.getCheckCatalogues();
+ for (InternalAuditCheckCatalogue catalogue : checkCatalogues) {
+ catalogue.setCheckId(internalAuditCheck.getId());
+ }
+
+ // 批量插入目录
+ int catalogueInsertCount = checkCatalogueMapper.saveBatch(checkCatalogues);
+
+ if (catalogueInsertCount != checkCatalogues.size()) {
+ throw new RuntimeException("插入目录记录数量不匹配");
+ }
+ }
+ return CommonResult.success();
+ }
+
+ @Override
+ public List<InternalAuditCheck> selectByMap(Map<String, Object> stringObjectHashMap) {
+ return internalAuditCheckMapper.selectByMap(stringObjectHashMap);
+ }
+
// @Override
// public CommonResult internalAuditCheckInfo(Integer id) {
// InternalAuditCheck internalAuditCheck = internalAuditCheckMapper.selectById(id);
--
Gitblit v1.9.2