فهرست منبع

图片生成类

wangliang 3 سال پیش
والد
کامیت
df94488bf9

+ 3 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/PushLogicServiceImpl.java

@@ -98,15 +98,14 @@ public class PushLogicServiceImpl implements PushLogicService {
     @Override
     @Transactional
     public Map<String, Object> executeScorePushLogic(Map<String, Object> map) throws Exception {
-        SysUser sysUser = (SysUser) map.get(SystemConstant.SYS_USER);
+        SysUser sysUser = (SysUser) map.get(SystemConstant.USER);
         Long schoolId = sysUser.getSchoolId();
         Integer examId = (Integer) map.get("examId");
-        String examCode = (String) map.get("examCode");
         Long examIdLong = Long.parseLong(String.valueOf(examId));
         List<TSyncExamStudentScore> tSyncExamStudentScoreList = null;
         List<String> errorTSyncExamStudentScoreList = null;
         try {
-            int totalCount = stmmsUtils.getStudentCount(schoolId, examId, examCode, null, null, null, null, null, null, true);
+            int totalCount = stmmsUtils.getStudentCount(schoolId, examId, null, null, null, null, null, null, null, true);
             log.info("云阅卷:考试成绩考生数量查询接口调用,返回数量:{}", totalCount);
             if (totalCount > 0) {
                 int pageSize = stmmsUtils.getDefaultPageSize();
@@ -118,7 +117,7 @@ public class PushLogicServiceImpl implements PushLogicService {
                 tSyncExamStudentScoreList = new ArrayList<>();
                 errorTSyncExamStudentScoreList = new ArrayList<>();
                 for (int i = 1; i <= pageNos; i++) {
-                    List<Map> students = stmmsUtils.getStudentScore(schoolId, examId, examCode, null, null, null, null, null, null, true, i, pageSize);
+                    List<Map> students = stmmsUtils.getStudentScore(schoolId, examId, null, null, null, null, null, null, null, true, i, pageSize);
                     for (Map student : students) {
                         try {
                             //查学院id

+ 3 - 3
distributed-print/src/main/java/com/qmth/distributed/print/api/TSyncExamStudentScoreController.java

@@ -121,8 +121,8 @@ public class TSyncExamStudentScoreController {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<ExamPrintPlan>();
         examPrintPlanQueryWrapper.select(" DISTINCT third_relate_id ").eq("school_id", sysUser.getSchoolId())
-                .eq("semester_id", SystemConstant.convertIdToInteger(semesterId))
-                .eq("org_id", SystemConstant.convertIdToInteger(orgId));
+                .eq("semester_id", SystemConstant.convertIdToLong(semesterId))
+                .eq("org_id", SystemConstant.convertIdToLong(orgId));
         List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.list(examPrintPlanQueryWrapper);
         if (Objects.isNull(examPrintPlanList) || examPrintPlanList.size() == 0) {
             throw ExceptionResultEnum.ERROR.exception("此学期学院下未找到需要同步的考试记录");
@@ -130,7 +130,7 @@ public class TSyncExamStudentScoreController {
             throw ExceptionResultEnum.ERROR.exception("此学期学院下找到了多条考试记录");
         }
         Map<String, Object> map = printCommonService.savePush(PushTypeEnum.SCORE_PUSH);
-        map.computeIfAbsent("examId", v -> examPrintPlanList.get(0).getThirdRelateId());
+        map.computeIfAbsent("examId", v -> Integer.parseInt(String.valueOf(examPrintPlanList.get(0).getThirdRelateId())));
         asyncScorePushService.pushTask(map);
         TBSyncTask tbSyncTask = Objects.nonNull(map.get(SystemConstant.TB_SYNC_TASK)) ? (TBSyncTask) map.get(SystemConstant.TB_SYNC_TASK) : null;
         return Objects.nonNull(tbSyncTask) ? ResultUtil.ok(tbSyncTask.getId()) : ResultUtil.error("创建同步推送任务失败");