QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(88091): 增加对比校验

Browse Source
This commit is contained in:
yjz
2024-08-07 20:06:00 +08:00
parent 96678bfe72
commit 170fe1aa7a
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standard/util/StandardUtil.java
+17 -2
View File
@@ -8,6 +8,8 @@ import com.jero.modules.activiti.enums.ProcessStatusEnum;
import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret;
import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService; import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService;
import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.compare.entity.SarFileCompareInfo;
import com.jero.modules.compare.service.ISarFileCompareInfoService;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.service.DoNotSplitStandardProvider; import com.jero.modules.laws.standard.service.DoNotSplitStandardProvider;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
@@ -34,6 +36,9 @@ public class StandardUtil {
@Resource @Resource
private ILawsDomesticStandardService lawsDomesticStandardService; private ILawsDomesticStandardService lawsDomesticStandardService;
@Resource
private ISarFileCompareInfoService sarFileCompareInfoService;
@Resource @Resource
private ProcessStandardInterpretService processStandardInterpretService; private ProcessStandardInterpretService processStandardInterpretService;
@@ -94,11 +99,21 @@ public class StandardUtil {
.collect(Collectors.toList()); .collect(Collectors.toList());
int count = sarFileSplitInfoService.count( int count = sarFileSplitInfoService.count(
new LambdaQueryWrapper<SarFileSplitInfoEO>() new LambdaQueryWrapper<SarFileSplitInfoEO>()
.in(SarFileSplitInfoEO::getStandardId, needDelStandardIdList) .isNull(SarFileSplitInfoEO::getPublishBeforeId)
.or().in(SarFileSplitInfoEO::getSerialNumber, standardNumberList)); .and(w -> w.in(SarFileSplitInfoEO::getStandardId, needDelStandardIdList)
.or().in(SarFileSplitInfoEO::getSerialNumber, standardNumberList)));
if (count > 0) { if (count > 0) {
throw new JeroBootException(ResultCommon.SCC_DELETE_STANDARD_ERROR2); throw new JeroBootException(ResultCommon.SCC_DELETE_STANDARD_ERROR2);
} }
// 查询对比数据
int count2 = sarFileCompareInfoService.count(
new LambdaQueryWrapper<SarFileCompareInfo>()
.in(SarFileCompareInfo::getSerialNumberLeft, standardNumberList)
.or().in(SarFileCompareInfo::getSerialNumberRight, standardNumberList));
if (count2 > 0) {
throw new JeroBootException(ResultCommon.SCC_DELETE_STANDARD_ERROR4);
}
} }
} }