fix: 80755 删除标准后,文档拆分的相关数据没被删除,但点击无法进入详情也没提示
This commit is contained in:
+6
@@ -125,5 +125,11 @@ public interface ILawsCustomCompareInfoService extends IService<LawsCustomCompar
|
|||||||
* @param listName
|
* @param listName
|
||||||
*/
|
*/
|
||||||
void uniqueVerify(String id, String listName);
|
void uniqueVerify(String id, String listName);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 标准删除时
|
||||||
|
* @param ids
|
||||||
|
*/
|
||||||
|
void deleteByStandardId(String ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+14
@@ -1,5 +1,6 @@
|
|||||||
package com.jero.modules.laws.customcompare.service.impl;
|
package com.jero.modules.laws.customcompare.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
@@ -498,6 +499,19 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteByStandardId(String ids) {
|
||||||
|
if (StrUtil.isBlank(ids)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
LambdaQueryWrapper<LawsCustomCompareInfoStandard> ccsWrapper = new LambdaQueryWrapper<>();
|
||||||
|
ccsWrapper.in(LawsCustomCompareInfoStandard::getStandardId, Arrays.asList(ids.split(",")));
|
||||||
|
List<LawsCustomCompareInfoStandard> list = lawsCustomCompareInfoStandardService.list(ccsWrapper);
|
||||||
|
Set<String> infoIdsSet = new HashSet<>();
|
||||||
|
list.forEach(i -> infoIdsSet.add(i.getInfoId()));
|
||||||
|
removeByIds(infoIdsSet);
|
||||||
|
}
|
||||||
|
|
||||||
private void createTableCellContent(HSSFSheet sheet, List<StandardVO> standardVOS, List<LawsCustomCompareInventory> featureList, List<LawsCustomCompareInventory> compareList, List<LawsCustomCompareCell> list, CellStyle cellStyle) {
|
private void createTableCellContent(HSSFSheet sheet, List<StandardVO> standardVOS, List<LawsCustomCompareInventory> featureList, List<LawsCustomCompareInventory> compareList, List<LawsCustomCompareCell> list, CellStyle cellStyle) {
|
||||||
for (int i = 2; i <= compareList.size() + 2; i++) {
|
for (int i = 2; i <= compareList.size() + 2; i++) {
|
||||||
// 创建行
|
// 创建行
|
||||||
|
|||||||
+5
@@ -12,6 +12,7 @@ import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService
|
|||||||
import com.jero.modules.compare.service.ISarFileCompareInfoService;
|
import com.jero.modules.compare.service.ISarFileCompareInfoService;
|
||||||
import com.jero.modules.laws.common.constant.FieldCommon;
|
import com.jero.modules.laws.common.constant.FieldCommon;
|
||||||
import com.jero.modules.laws.common.service.ILawsCommonService;
|
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.entity.LawsUpdateRecord;
|
||||||
import com.jero.modules.laws.standard.service.ILawsNodeRelationService;
|
import com.jero.modules.laws.standard.service.ILawsNodeRelationService;
|
||||||
import com.jero.modules.laws.standard.service.ILawsUpdateRecordService;
|
import com.jero.modules.laws.standard.service.ILawsUpdateRecordService;
|
||||||
@@ -63,6 +64,9 @@ public class LawsDomesticController {
|
|||||||
@Resource
|
@Resource
|
||||||
private ISarFileCompareInfoService compareInfoService;
|
private ISarFileCompareInfoService compareInfoService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private ILawsCustomCompareInfoService customCompareService;
|
||||||
|
|
||||||
private static final String MODULE_VALUE = TableNameEnum.DOMESTIC_REGULATIONS.getValue();
|
private static final String MODULE_VALUE = TableNameEnum.DOMESTIC_REGULATIONS.getValue();
|
||||||
|
|
||||||
@AutoLog(value = "国内法规标准-分页列表查询")
|
@AutoLog(value = "国内法规标准-分页列表查询")
|
||||||
@@ -164,6 +168,7 @@ public class LawsDomesticController {
|
|||||||
// 删除标准时同步删除比对和拆分的相关数据
|
// 删除标准时同步删除比对和拆分的相关数据
|
||||||
splitInfoService.deleteByStandardId((String) parameterMap.get("ids"));
|
splitInfoService.deleteByStandardId((String) parameterMap.get("ids"));
|
||||||
compareInfoService.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));
|
return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user