|
|
|
@ -1101,7 +1101,7 @@ public class YnExportServiceImpl implements IYExportService {
|
|
|
|
|
YnSubject ynSubject1 = ynSubjectMapper.selectYnSubjectById(o); |
|
|
|
|
//判断是否为百分制
|
|
|
|
|
if (ynSubject.getScore().equals("2") ){ |
|
|
|
|
multiply = multiply.add(v1.multiply(ynSubject1.getWeight())); |
|
|
|
|
multiply = multiply.add(v1); |
|
|
|
|
}else { |
|
|
|
|
BigDecimal num = new BigDecimal(100+""); |
|
|
|
|
multiply = multiply.add(v1.multiply(ynSubject1.getWeight().multiply(num))); |
|
|
|
@ -1382,8 +1382,9 @@ public class YnExportServiceImpl implements IYExportService {
|
|
|
|
|
List<YnInterviewScore> ynInterviewScores = interviewScoreMapper.selectYnInterviewScoreStaionList(ynExaminerLead.getId().toString(),unitPostCode); |
|
|
|
|
Integer code =1; |
|
|
|
|
String sex ="男"; |
|
|
|
|
List<String> data = ListUtils.newArrayList(); |
|
|
|
|
List<String> data =null; |
|
|
|
|
for (YnInterviewScore interviewScore : ynInterviewScores) { |
|
|
|
|
data = ListUtils.newArrayList(); |
|
|
|
|
data.add(String.valueOf(code++)); |
|
|
|
|
YnExamineeLead ynExamineeLead = ynExamineeLeadMapper.selectYnExamineeLeadById(Long.valueOf(interviewScore.getExaminee())); |
|
|
|
|
if (ynExamineeLead.getSex() == 2){ |
|
|
|
@ -1414,6 +1415,7 @@ public class YnExportServiceImpl implements IYExportService {
|
|
|
|
|
data.add(""); |
|
|
|
|
list.add(data); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return list; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|