From a3a034120a98e1263b66737598ec5f3587317437 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 29 Jan 2024 15:38:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2080755=20=E5=88=A0=E9=99=A4=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=8E=EF=BC=8C=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE=E6=B2=A1=E8=A2=AB?= =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E4=BD=86=E7=82=B9=E5=87=BB=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=9B=E5=85=A5=E8=AF=A6=E6=83=85=E4=B9=9F=E6=B2=A1?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ISarFileCompareInfoService.java | 2 ++ .../impl/SarFileCompareInfoServiceImpl.java | 33 +++++++++++++++++++ .../controller/LawsDomesticController.java | 12 +++++++ .../controller/LawsEnterpriseController.java | 16 ++++++++- .../service/ISarFileSplitInfoService.java | 3 ++ .../impl/SarFileSplitInfoServiceImpl.java | 10 ++++++ 6 files changed, 75 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java b/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java index e56ceb8c..e3467298 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java @@ -84,4 +84,6 @@ public interface ISarFileCompareInfoService extends IService * @param ids */ void isHorizontalOverstep(String ids); + + void deleteByStandardId(String ids); } diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index 726f4bff..ff4f4bfc 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -15,6 +15,10 @@ import com.jero.modules.compare.service.ISarFileCompareMenuService; import com.jero.modules.compare.utils.CompHanLPUtils; import com.jero.modules.compare.utils.CompareConst; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsEO; import com.jero.modules.split.entity.SarFileSplitMenuEO; @@ -26,6 +30,7 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.*; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -60,6 +65,12 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl lawsEnterpriseStandards = esService.listByIds(Arrays.asList(ids.split(","))); + List lawsDomesticStandards = gbService.listByIds(Arrays.asList(ids.split(","))); + List standardNos = new ArrayList<>(); + for (LawsEnterpriseStandard lawsEnterpriseStandard : lawsEnterpriseStandards) { + standardNos.add(lawsEnterpriseStandard.getStandardNumber()); + } + for (LawsDomesticStandard lawsDomesticStandard : lawsDomesticStandards) { + standardNos.add(lawsDomesticStandard.getStandardNumber()); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SarFileCompareInfo::getSerialNumberLeft, standardNos); + queryWrapper.or().in(SarFileCompareInfo::getSerialNumberRight, standardNos); + List sarFileCompareInfos = sarFileCompareInfoService.list(queryWrapper); + List idsList = new ArrayList<>(); + for (SarFileCompareInfo sarFileCompareInfo : sarFileCompareInfos) { + idsList.add(sarFileCompareInfo.getId()); + } + this.deleteByIds(idsList); + } + private List tree(List list) { List compareMenuVos = new ArrayList<>(); //先删除name是总目录的数据 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index d046ca12..6435473f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -9,6 +9,7 @@ import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.util.MessageUtils; import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; +import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.standard.entity.LawsUpdateRecord; @@ -16,6 +17,7 @@ import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; import com.jero.modules.personal.service.ILawsStandardSharingService; +import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; @@ -26,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -54,6 +57,12 @@ public class LawsDomesticController { @Autowired private IProcessFbEntryChangeService processFbEntryChangeService; + @Resource + private ISarFileSplitInfoService splitInfoService; + + @Resource + private ISarFileCompareInfoService compareInfoService; + private static final String MODULE_VALUE = TableNameEnum.DOMESTIC_REGULATIONS.getValue(); @AutoLog(value = "国内法规标准-分页列表查询") @@ -151,6 +160,9 @@ public class LawsDomesticController { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); + // 删除标准时同步删除比对和拆分的相关数据 + splitInfoService.deleteByStandardId((String) parameterMap.get("ids")); + compareInfoService.deleteByStandardId((String) parameterMap.get("ids")); return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 46e0f960..c694cefe 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -8,6 +8,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; +import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; @@ -23,6 +24,7 @@ import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; import com.jero.modules.personal.service.ILawsStandardSharingService; +import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.sys.utils.UserUtils; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; @@ -68,6 +70,12 @@ public class LawsEnterpriseController { @Resource private EnterpriseStandardReviewMeetingRecordService esReviewMeetingService; + @Resource + private ISarFileSplitInfoService splitInfoService; + + @Resource + private ISarFileCompareInfoService compareInfoService; + private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); @AutoLog(value = "企业法规标准-分页列表查询") @@ -172,6 +180,9 @@ public class LawsEnterpriseController { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); + // 删除标准时同步删除比对和拆分的相关数据 + splitInfoService.deleteByStandardId((String) parameterMap.get("ids")); + compareInfoService.deleteByStandardId((String) parameterMap.get("ids")); return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } @@ -181,9 +192,12 @@ public class LawsEnterpriseController { @ApiOperationSupport(order = 9) @RequiresPermissions("enterpriseStandard:delete") public Result singleDelete(@RequestBody @ApiParam(name = "ids", value = "主键（多个用逗号分隔）") Map parameterMap) { - //删除标准时同步删除这个标准的收藏数据 + // 删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); + // 删除标准时同步删除比对和拆分的相关数据 + splitInfoService.deleteByStandardId((String) parameterMap.get("ids")); + compareInfoService.deleteByStandardId((String) parameterMap.get("ids")); return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java index b3a41e8b..1fdac3f8 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java @@ -79,4 +79,7 @@ public interface ISarFileSplitInfoService extends IService { // 同步更新文档拆分标准名称 void updateTitleByStandardId(String standardId, String title); + + // 根据企标Id删除数据 + void deleteByStandardId(String ids); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index e2597af9..d7dfb33c 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -455,5 +455,15 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl splitWrapper = new LambdaQueryWrapper<>(); + splitWrapper.in(SarFileSplitInfoEO::getStandardId, Arrays.asList(ids.split(","))); + List splitInfoEOList = list(splitWrapper); + if (CollectionUtil.isNotEmpty(splitInfoEOList)){ + this.deleteByIds(splitInfoEOList.stream().map(SarFileSplitInfoEO::getId).collect(Collectors.toList())); + } + } + }