TASK: 印花逻辑;
This commit is contained in:
@@ -416,16 +416,23 @@ public class PythonService {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
long pinNum = printBoardElements.stream().filter(f -> f.getHasPin() == 1).count();
|
long pinNum = printBoardElements.stream().filter(f -> f.getHasPin() == 1).count();
|
||||||
|
long noPinNum = printBoardElements.stream().filter(f -> f.getHasPin() == 0).count();
|
||||||
if (pinNum <= 4) {
|
if (pinNum <= 4) {
|
||||||
return RandomsUtil.randomSysFile(0L, 5L);
|
if (noPinNum <= 4) {
|
||||||
|
return RandomsUtil.randomSysFile(0L, noPinNum + 1);
|
||||||
|
}else {
|
||||||
|
return RandomsUtil.randomSysFile(0L, 5L);
|
||||||
|
}
|
||||||
}else if (pinNum < 8) {
|
}else if (pinNum < 8) {
|
||||||
long maxNum = 8 - pinNum;
|
if (noPinNum <= 8 - pinNum) {
|
||||||
return RandomsUtil.randomSysFile(0L, maxNum + 1);
|
return RandomsUtil.randomSysFile(0L, noPinNum + 1);
|
||||||
|
}else {
|
||||||
|
long maxNum = 8 - pinNum;
|
||||||
|
return RandomsUtil.randomSysFile(0L, maxNum + 1);
|
||||||
|
}
|
||||||
}else {
|
}else {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<DesignPythonItem> coverToDesignPythonItem(ValidateElementVO elementVO, CurrentDesignPictureTypeEnum designPictureType) {
|
private List<DesignPythonItem> coverToDesignPythonItem(ValidateElementVO elementVO, CurrentDesignPictureTypeEnum designPictureType) {
|
||||||
|
|||||||
Reference in New Issue
Block a user