From 95a6be7098f51967308a0f4b4bc4885f86db73ac Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 15 Oct 2024 16:13:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=A2=AB=E4=BB=A3=E6=9B=BF=E8=AE=BE=E4=B8=BA=E5=BA=9F=E6=AD=A2?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 OldSystemController 中添加 esReplaceDataFix 方法，用于执行企标被代替设为废止的操作 - 在 OldSystemService 接口中添加 esReplaceDataFix 方法声明 - 在 OldSystemServiceImpl 中实现 esReplaceDataFix 方法，逻辑为将所有企标中被代替的标准设为废止状态- 从 UpdateStandardStatusJob 中移除了代替标准状态改为废止的逻辑，该功能已由新增的方法覆盖 --- .../controller/OldSystemController.java | 8 +++++++ .../oldSystem/service/OldSystemService.java | 6 +++++ .../service/impl/OldSystemServiceImpl.java | 24 ++++++++++++++----- .../standard/job/UpdateStandardStatusJob.java | 3 --- 4 files changed, 32 insertions(+), 9 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 cba380c5..bb9d04bc 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 @@ -234,4 +234,12 @@ public class OldSystemController { @RequestParam(value = "id", required = false) String id) { return Result.OK(oldSystemDeptRelationService.sendDoneTask(endTime, taskId, id)); } + + @GetMapping("/esReplaceDataFix") + @AutoLog(value = "老法规系统-企标被代替的标准设为废止") + @ApiOperation(value="老法规系统-企标被代替的标准设为废止", notes="老法规系统-企标被代替的标准设为废止") + @ApiOperationSupport(order = 100) + public Result esReplaceDataFix() { + return Result.OK(oldSystemService.esReplaceDataFix()); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java index 43b31274..9e13eaa8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java @@ -125,4 +125,10 @@ public interface OldSystemService { * @param response */ String fbDataFix(HttpServletResponse response); + + /** + * 企标被代替的标准设为废止 + * @return + */ + String esReplaceDataFix(); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java index 86fd73ff..7a7e133e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.jero.common.api.CommonAPI; import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.enums.YesOrNoEnum; @@ -12,12 +11,11 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.SysDictItemCore; import com.jero.common.util.MessageUtils; import com.jero.common.util.MinioUtil; +import com.jero.modules.activiti.process.common.enums.StandardStateEnum; import com.jero.modules.activiti.util.ExcelUtils; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; -import com.jero.modules.laws.enterprise.entity.vo.LawsTreeNodeModel; -import com.jero.modules.laws.oldSystem.entity.OldSystemImportDTO; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; @@ -38,7 +36,6 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.tag.enums.TableNameEnum; import io.minio.errors.MinioException; import lombok.Cleanup; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; @@ -46,7 +43,6 @@ import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -55,7 +51,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.Field; import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Matcher; @@ -482,6 +477,23 @@ public class OldSystemServiceImpl implements OldSystemService { return "共新增" + esAdList.size() + "条权限数据"; } + @Override + public String esReplaceDataFix() { + // 获取所有企标数据 + LambdaQueryWrapper replacedStandardLambdaQueryWrapper = new LambdaQueryWrapper<>(); + replacedStandardLambdaQueryWrapper.eq(LawsReplacedStandard::getType, "1"); + List list = lawsReplacedStandardService.list(replacedStandardLambdaQueryWrapper); + List replaceBzList = list.stream().map(LawsReplacedStandard::getReplaced) + .filter(StringUtils::isNotBlank) + .collect(Collectors.toList()); + // 将这些标准设为废止状态 + LambdaUpdateWrapper esLambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + esLambdaUpdateWrapper.in(LawsEnterpriseStandard::getStandardNumber, replaceBzList); + esLambdaUpdateWrapper.set(LawsEnterpriseStandard::getStandardState, StandardStateEnum.ABOLISH.getStateValue()); + esService.update(esLambdaUpdateWrapper); + return "处理完毕，共" + replaceBzList.size() + "条数据"; + } + private void oldSysFBDataFileDocPath(List allDatalist, List errImportList) { List fbDatalist = allDatalist.stream().filter(o -> o.getBzfl().contains("ISO") || o.getBzfl().contains("引进") || diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java index 80117cf7..694928ad 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java @@ -64,7 +64,6 @@ public class UpdateStandardStatusJob implements Job { } } esService.updateBatchById(needUpdateEsList); - // 代替标准状态改为废止 for (LawsEnterpriseStandard es : needUpdateEsList) { Map esMap = commonService.getByIdAndModule(es.getId(), TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "2", es.getStandardNumber()); esMap.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); @@ -101,7 +100,6 @@ public class UpdateStandardStatusJob implements Job { } } gbService.updateBatchById(needUpdateGbList); - // 代替标准状态改为废止 for (LawsDomesticStandard standard : processReplaceList) { Map map = commonService.getByIdAndModule(standard.getId(), TableNameEnum.DOMESTIC_REGULATIONS.getValue(), "2", standard.getStandardNumber()); map.put(FieldCommon.MODULE, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); @@ -137,7 +135,6 @@ public class UpdateStandardStatusJob implements Job { } } fbService.updateBatchById(needUpdateFbList); - // 代替标准状态改为废止 for (LawsOverseasStandard standard : processReplaceList) { Map map = commonService.getByIdAndModule(standard.getId(), TableNameEnum.FOREIGN_REGULATIONS.getValue(), "2", standard.getStandardNumber()); map.put(FieldCommon.MODULE, TableNameEnum.FOREIGN_REGULATIONS.getValue());