updates
This commit is contained in:
parent
a904dd941f
commit
d8a988e57c
|
|
@ -146,11 +146,11 @@ public class MiniTestCulturalService {
|
||||||
artTestCulturalDto.setDetail(yxSchoolMajor.getDetail());
|
artTestCulturalDto.setDetail(yxSchoolMajor.getDetail());
|
||||||
// artTestCulturalDto.setProbabilityOperator(yxSchoolMajor.getProbabilityOperator());
|
// artTestCulturalDto.setProbabilityOperator(yxSchoolMajor.getProbabilityOperator());
|
||||||
// artTestCulturalDto.setRulesEnrollProbability(yxSchoolMajor.getRulesEnrollProbability());
|
// artTestCulturalDto.setRulesEnrollProbability(yxSchoolMajor.getRulesEnrollProbability());
|
||||||
if(StringUtils.isBlank(yxSchoolMajor.getPrivateProbabilityOperator())){
|
if(StringUtils.isBlank(yxHistoryMajorEnroll.getProbabilityOperator())){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
artTestCulturalDto.setProbabilityOperator(yxSchoolMajor.getPrivateProbabilityOperator());
|
artTestCulturalDto.setProbabilityOperator(yxHistoryMajorEnroll.getProbabilityOperator());
|
||||||
artTestCulturalDto.setRulesEnrollProbability(yxSchoolMajor.getPrivateRulesEnrollProbability());
|
artTestCulturalDto.setRulesEnrollProbability(yxHistoryMajorEnroll.getRulesEnrollProbability());
|
||||||
artTestCulturalDto.setMajorNameAll(yxSchoolMajor.getMajorName() + "[" + yxSchoolMajor.getCategory() + "]" + "(" + yxSchoolMajor.getBatch() + ")");
|
artTestCulturalDto.setMajorNameAll(yxSchoolMajor.getMajorName() + "[" + yxSchoolMajor.getCategory() + "]" + "(" + yxSchoolMajor.getBatch() + ")");
|
||||||
|
|
||||||
if (yxHistoryMajorEnroll!=null) {
|
if (yxHistoryMajorEnroll!=null) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue