diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java index 92b8147e..41734ac3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java @@ -125,5 +125,11 @@ public interface ILawsCustomCompareInfoService extends IService ccsWrapper = new LambdaQueryWrapper<>(); + ccsWrapper.in(LawsCustomCompareInfoStandard::getStandardId, Arrays.asList(ids.split(","))); + List list = lawsCustomCompareInfoStandardService.list(ccsWrapper); + Set infoIdsSet = new HashSet<>(); + list.forEach(i -> infoIdsSet.add(i.getInfoId())); + removeByIds(infoIdsSet); + } + private void createTableCellContent(HSSFSheet sheet, List standardVOS, List featureList, List compareList, List list, CellStyle cellStyle) { for (int i = 2; i <= compareList.size() + 2; i++) { // 创建行 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 a221cc64..72a3e763 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 @@ -12,6 +12,7 @@ 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.customcompare.service.ILawsCustomCompareInfoService; import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; @@ -63,6 +64,9 @@ public class LawsDomesticController { @Resource private ISarFileCompareInfoService compareInfoService; + @Resource + private ILawsCustomCompareInfoService customCompareService; + private static final String MODULE_VALUE = TableNameEnum.DOMESTIC_REGULATIONS.getValue(); @AutoLog(value = "国内法规标准-分页列表查询") @@ -164,6 +168,7 @@ public class LawsDomesticController { // 删除标准时同步删除比对和拆分的相关数据 splitInfoService.deleteByStandardId((String) parameterMap.get("ids")); compareInfoService.deleteByStandardId((String) parameterMap.get("ids")); + customCompareService.deleteByStandardId((String) parameterMap.get("ids")); return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); }