From 5597b9212e4819591bd06c0ad72d8e9f622cd5bd Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 6 Sep 2024 19:26:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E6=A0=87=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=95=B0=E6=8D=AE=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OldSystemController.java | 9 +++ .../OldSystemDepartRelationService.java | 5 +- .../OldSystemDepartRelationServiceImpl.java | 73 +++++++++++++++---- 3 files changed, 70 insertions(+), 17 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java index 9e7e8d24..6960b40d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java @@ -217,4 +217,13 @@ public class OldSystemController { return Result.OK(oldSystemDeptRelationService.fbAuthDeptDataFix()); } + @GetMapping("/gbSplitStatusDataFix") + @AutoLog(value = "老法规系统-国标拆分状态") + @ApiOperation(value="老法规系统-国标拆分状态", notes="老法规系统-国标拆分状态") + @ApiOperationSupport(order = 100) + public Result gbSplitStatusDataFix() { + return Result.OK(oldSystemDeptRelationService.gbSplitStatusDataFix()); + } + + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemDepartRelationService.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemDepartRelationService.java index 35997d38..5ff8e7f1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemDepartRelationService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemDepartRelationService.java @@ -1,11 +1,10 @@ package com.jero.modules.laws.oldSystem.service; -import com.jero.modules.laws.oldSystem.entity.OldSystemDepartRelation; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.oldSystem.entity.OldSystemDepartRelation; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.util.Map; /** * @author ThinkBook @@ -25,4 +24,6 @@ public interface OldSystemDepartRelationService extends IService errImportList = new ArrayList<>(); @@ -370,6 +369,50 @@ public class OldSystemDepartRelationServiceImpl extends ServiceImpl documentSplitInfoIPage = documentSplitService.queryByPage(null, 1, Integer.MAX_VALUE); + List documentSplitInfoList = documentSplitInfoIPage.getRecords(); + if (documentSplitInfoList.isEmpty()) { + return "没有需要修复的数据"; + } + List splitStandardIdList = documentSplitInfoList.stream().map(DocumentSplitInfo::getStandardId).collect(Collectors.toList()); + List gbList = gbService.list(); + List esList = esService.list(); + // 遍历所有拆分的标准 + LambdaUpdateWrapper gbUpdateWrapper = new LambdaUpdateWrapper<>(); + LambdaUpdateWrapper esUpdateWrapper = new LambdaUpdateWrapper<>(); + + // 遍历所有国标 + for (LawsDomesticStandard gb : gbList) { + if (!splitStandardIdList.contains(gb.getId())) { + log.info("国标标准编号{}没有拆分数据", gb.getStandardNumber()); + gbUpdateWrapper.eq(LawsDomesticStandard::getId, gb.getId()) + .set(LawsDomesticStandard::getStandardSplitStatus, 2); + gbService.update(gbUpdateWrapper); + gbUpdateWrapper.clear(); + } else { + gbUpdateWrapper.eq(LawsDomesticStandard::getId, gb.getId()) + .set(LawsDomesticStandard::getStandardSplitStatus, 1); + gbService.update(gbUpdateWrapper); + gbUpdateWrapper.clear(); + } + + } + // 遍历所有企标 + for (LawsEnterpriseStandard es : esList) { + if (!splitStandardIdList.contains(es.getId())) { + log.info("企标标准编号{}没有拆分数据", es.getStandardNumber()); + } else { + esUpdateWrapper.eq(LawsEnterpriseStandard::getId, es.getId()) + .set(LawsEnterpriseStandard::getStandardSplitStatus, 1); + esService.update(esUpdateWrapper); + esUpdateWrapper.clear(); + } + } + return "处理完成"; + } + }