3.3.0 update

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/LoginResult.java

@@ -47,6 +47,8 @@ public class LoginResult implements Serializable {
 
     @ApiModelProperty(name = "角色集合")
     private Set<String> roleList;
+    @ApiModelProperty(name = "角色集合(扫描端登录)")
+    private Set<String> role;
 
     @ApiModelProperty(name = "服务器时间戳")
     private long time;
@@ -138,6 +140,14 @@ public class LoginResult implements Serializable {
         this.roleList = roleList;
     }
 
+    public Set<String> getRole() {
+        return role;
+    }
+
+    public void setRole(Set<String> role) {
+        this.role = role;
+    }
+
     public OrgNativeBean getOrgInfo() {
         return orgInfo;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -751,10 +751,11 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         String token = SystemConstant.getNanoId();
         commonCacheService.userCache(sysUser.getId());
         //添加用户会话缓存
-        Set<String> roleNamesSet = new HashSet<>(), roleTypes = new HashSet<>();
+        Set<String> roleNamesSet = new HashSet<>(), roleTypes = new HashSet<>(), role = new HashSet<>();
         List<RoleResult> roleSource = new ArrayList<>();
         for (SysRole s : authBean.getRoleList()) {
             roleNamesSet.add(s.getName());
+            role.add(s.getType().name());
             if (Objects.isNull(s.getSource()) && Objects.nonNull(s.getType())) {
                 roleTypes.add(s.getType().name());
             }
@@ -777,6 +778,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         LoginResult loginResult = new LoginResult(sysUser, sessionId, token, Objects.nonNull(roleTypes) && roleTypes.size() > 0 ? roleTypes : roleNamesSet, appSource, roleSource, SystemConstant.VERSION_VALUE);
         loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? Lists.newArrayList(loginResult.new SchoolNativeBean(authBean.getSchool())) : null);
         loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);
+        loginResult.setRole(role);
         loginResult.setTime(System.currentTimeMillis());
         String mobileNumber = sysUser.getMobileNumber();
         int pwdCount = sysUser.getPwdCount();

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkPaper.java

@@ -40,6 +40,9 @@ public class MarkPaper implements Serializable {
     
     @ApiModelProperty(value = "试卷编号（交互）")
     private String coursePaperId;
+
+    @ApiModelProperty(value = "签到表编号")
+    private String packageCode;
     
     @ApiModelProperty(value = "客观题满分")
     private Double objectiveScore;
@@ -108,11 +111,12 @@ public class MarkPaper implements Serializable {
     public MarkPaper() {
     }
 
-    public MarkPaper(Long examId, String courseCode, String courseName, String paperNumber) {
+    public MarkPaper(Long examId, String courseCode, String courseName, String paperNumber, String packageCode) {
         this.examId = examId;
         this.courseCode = courseCode;
         this.courseName = courseName;
         this.paperNumber = paperNumber;
+        this.packageCode = packageCode;
         this.objectiveScore = 0D;
         this.subjectiveScore = 0D;
         this.totalScore =0D;
@@ -161,6 +165,14 @@ public class MarkPaper implements Serializable {
         this.coursePaperId = coursePaperId;
     }
 
+    public String getPackageCode() {
+        return packageCode;
+    }
+
+    public void setPackageCode(String packageCode) {
+        this.packageCode = packageCode;
+    }
+
     public Double getObjectiveScore() {
         return objectiveScore;
     }

teachcloud-task/src/main/java/com/qmth/teachcloud/task/job/service/impl/JobServiceImpl.java

@@ -161,7 +161,7 @@ public class JobServiceImpl implements JobService {
         long startTime = DateDisposeUtils.parseDate("2023-10-01 00:00:00").getTime();
         List<ExamDetailCourseInitMarkDto> examDetailCourseInitMarkDtoList = examDetailService.listPrintFinishExamDetailCourse(ExamDetailStatusEnum.FINISH.name(), startTime, MarkPaperStatus.FINISH.name());
         for (ExamDetailCourseInitMarkDto dto : examDetailCourseInitMarkDtoList) {
-            printFinishService.insertMarkPaper(dto.getExamId(), dto.getCourseCode(), dto.getCourseName(), dto.getPaperNumber());
+            printFinishService.insertMarkPaper(dto.getExamId(), dto.getCourseCode(), dto.getCourseName(), dto.getPaperNumber(),dto.getPackageCode());
             printFinishService.insertMarkStudent(dto);
             printFinishService.insertScanAnswerCard(dto);
         }

teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/PrintFinishService.java

@@ -7,7 +7,7 @@ import com.qmth.distributed.print.business.bean.dto.initMarkData.ExamDetailCours
  */
 public interface PrintFinishService {
 
-    public void insertMarkPaper(Long examId, String courseCode, String courseName, String paperNumber);
+    public void insertMarkPaper(Long examId, String courseCode, String courseName, String paperNumber, String packageCode);
 
     public void insertMarkStudent(ExamDetailCourseInitMarkDto examDetail);
 

teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/impl/PrintFinishServiceImpl.java

@@ -69,14 +69,15 @@ public class PrintFinishServiceImpl implements PrintFinishService {
      * @param courseCode
      * @param courseName
      * @param paperNumber
+     * @param packageCode
      */
     @Override
-    public void insertMarkPaper(Long examId, String courseCode, String courseName, String paperNumber) {
+    public void insertMarkPaper(Long examId, String courseCode, String courseName, String paperNumber, String packageCode) {
         MarkPaper markPaper = markPaperService.getByExamIdAndPaperNumber(examId, paperNumber);
         if (markPaper != null) {
             return;
         }
-        MarkPaper insertMarkPaper = new MarkPaper(examId, courseCode, courseName, paperNumber);
+        MarkPaper insertMarkPaper = new MarkPaper(examId, courseCode, courseName, paperNumber, packageCode);
         markPaperService.save(insertMarkPaper);
     }