|
@@ -345,12 +345,11 @@ public class CreatePdfUtil {
|
|
*/
|
|
*/
|
|
public String getPaperType(ExamPrintPlan examPrintPlan, ExamTaskDetail examTaskDetail, ExamDetail examDetail, ExamDetailCourse examDetailCourse) {
|
|
public String getPaperType(ExamPrintPlan examPrintPlan, ExamTaskDetail examTaskDetail, ExamDetail examDetail, ExamDetailCourse examDetailCourse) {
|
|
ConcurrentMap<Integer, String> paperTypeMap = TaskLogicServiceImpl.getPaperTypeMap();
|
|
ConcurrentMap<Integer, String> paperTypeMap = TaskLogicServiceImpl.getPaperTypeMap();
|
|
- StringJoiner key = new StringJoiner("")
|
|
|
|
- .add(examDetail.getSchoolId() + "")
|
|
|
|
- .add((examDetail.getExamStartTime() + examDetail.getExamEndTime()) + "")
|
|
|
|
- .add(examDetail.getExamPlace())
|
|
|
|
- .add(examDetailCourse.getCourseCode())
|
|
|
|
- .add(examDetailCourse.getPaperNumber());
|
|
|
|
|
|
+ String key = examDetail.getSchoolId()
|
|
|
|
+ + Math.abs(examDetail.getExamStartTime() + examDetail.getExamEndTime())
|
|
|
|
+ + examDetail.getExamPlace()
|
|
|
|
+ + examDetailCourse.getCourseCode()
|
|
|
|
+ + examDetailCourse.getPaperNumber();
|
|
String paperType = null;
|
|
String paperType = null;
|
|
if (paperTypeMap.containsKey(key.hashCode())) {
|
|
if (paperTypeMap.containsKey(key.hashCode())) {
|
|
paperType = paperTypeMap.get(key.hashCode());
|
|
paperType = paperTypeMap.get(key.hashCode());
|