|
|
|
|
@ -53,10 +53,7 @@ import org.springblade.system.cache.DictCache; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Arrays; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
@ -129,12 +126,17 @@ public class BsAssignServiceImpl extends BaseServiceImpl<BsAssignMapper, BsAssig |
|
|
|
|
|
|
|
|
|
for (BsAssignEntity entity : entities) { |
|
|
|
|
// 单面积区间
|
|
|
|
|
if (entity.getUpArea().compareTo(entity.getLowArea()) < 0) { |
|
|
|
|
R.fail("单面积上限不能小于单面积下限") ; |
|
|
|
|
if (Objects.nonNull(entity.getLowArea()) && Objects.nonNull(entity.getUpArea())) { |
|
|
|
|
if (entity.getUpArea().compareTo(entity.getLowArea()) < 0) { |
|
|
|
|
R.fail("单面积上限不能小于单面积下限") ; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 单批面积区间
|
|
|
|
|
if (entity.getSingleUpArea().compareTo(entity.getSingleDownArea()) < 0) { |
|
|
|
|
R.fail("单批面积上限不能小于单批面积下限"); |
|
|
|
|
if (Objects.nonNull(entity.getSingleDownArea()) && Objects.nonNull(entity.getSingleUpArea())) { |
|
|
|
|
if (entity.getSingleUpArea().compareTo(entity.getSingleDownArea()) < 0) { |
|
|
|
|
R.fail("单批面积上限不能小于单批面积下限"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 拼接质量等级名称
|
|
|
|
|
|