fix: 80755 删除标准后,文档拆分的相关数据没被删除,但点击无法进入详情也没提示
This commit is contained in:
+6
@@ -12,6 +12,7 @@ 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.common.api.vo.ResultCommon;
|
import com.jero.common.api.vo.ResultCommon;
|
||||||
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.enterprise.entity.EnterpriseStandardRmrEvaluateDetail;
|
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail;
|
||||||
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
|
import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
|
||||||
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
|
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
|
||||||
@@ -76,6 +77,9 @@ public class LawsEnterpriseController {
|
|||||||
@Resource
|
@Resource
|
||||||
private ISarFileCompareInfoService compareInfoService;
|
private ISarFileCompareInfoService compareInfoService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private ILawsCustomCompareInfoService customCompareService;
|
||||||
|
|
||||||
private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue();
|
private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue();
|
||||||
|
|
||||||
@AutoLog(value = "企业法规标准-分页列表查询")
|
@AutoLog(value = "企业法规标准-分页列表查询")
|
||||||
@@ -185,6 +189,7 @@ public class LawsEnterpriseController {
|
|||||||
// 删除标准时同步删除比对和拆分的相关数据
|
// 删除标准时同步删除比对和拆分的相关数据
|
||||||
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));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -202,6 +207,7 @@ public class LawsEnterpriseController {
|
|||||||
// 删除标准时同步删除比对和拆分的相关数据
|
// 删除标准时同步删除比对和拆分的相关数据
|
||||||
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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+5
@@ -11,6 +11,7 @@ import com.jero.common.util.MessageUtils;
|
|||||||
import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService;
|
import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService;
|
||||||
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;
|
||||||
@@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -53,6 +55,8 @@ public class LawsOverseasController {
|
|||||||
private ILawsStandardSharingService lawsStandardSharingService;
|
private ILawsStandardSharingService lawsStandardSharingService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IProcessFbEntryChangeService processFbEntryChangeService;
|
private IProcessFbEntryChangeService processFbEntryChangeService;
|
||||||
|
@Resource
|
||||||
|
private ILawsCustomCompareInfoService customCompareService;
|
||||||
|
|
||||||
private static final String MODULE_VALUE = TableNameEnum.FOREIGN_REGULATIONS.getValue();
|
private static final String MODULE_VALUE = TableNameEnum.FOREIGN_REGULATIONS.getValue();
|
||||||
|
|
||||||
@@ -152,6 +156,7 @@ public class LawsOverseasController {
|
|||||||
//删除标准时同步删除这个标准的收藏数据
|
//删除标准时同步删除这个标准的收藏数据
|
||||||
lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids"));
|
lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids"));
|
||||||
lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids"));
|
lawsStandardSharingService.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