Merge remote-tracking branch 'origin/dev_v3.3.4' into dev_v3.3.4

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ConditionServiceImpl.java

@@ -200,8 +200,8 @@ public class ConditionServiceImpl implements ConditionService {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
         if ("client".equals(source)) {
-            String[] examDetailStatus = new String[] { ExamDetailStatusEnum.NEW.name(),
-                    PrintPlanStatusEnum.READY.name() };
+            String[] examDetailStatus = new String[]{ExamDetailStatusEnum.NEW.name(),
+                    PrintPlanStatusEnum.READY.name()};
             return conditionMapper.listPrintPlanForClient(semesterId, examId, examDetailStatus);
         } else {
             // 如果byAssignUser为true时，不能通过层级关系查询
@@ -255,8 +255,17 @@ public class ConditionServiceImpl implements ConditionService {
         Long privilegeId = ServletUtil.getCurrentPrivilegeId();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(privilegeId);
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        String privilegeIdString = privilegeId == null ? null : String.valueOf(privilegeId);
+        // 课程大纲管理、课程考核设置、课程目标达成度统计
+        if ("3000".equals(privilegeIdString) || "3001".equals(privilegeIdString) || "2002".equals(privilegeIdString)) {
+            conditionMapper.listCultureProgram(schoolId, professionalId, dpr);
+        }
+        // 成绩管理
+        else if ("2001".equals(privilegeIdString)) {
+            conditionMapper.listCultureProgram(schoolId, professionalId, dpr);
+        }
+        return new ArrayList<>();
 
-        return conditionMapper.listCultureProgram(schoolId, professionalId, dpr);
     }
 
     @Override

distributed-print-business/src/main/resources/mapper/ObeCultureProgramMapper.xml

@@ -51,6 +51,7 @@
                 </if>
             </if>
         </where>
+        order by ocp.create_time desc
     </select>
     <select id="getByCultureProgramId"
             resultType="com.qmth.distributed.print.business.bean.result.obe.cultureProgram.CultureProgramResult"

distributed-print/src/main/java/com/qmth/distributed/print/api/TCFinalScoreController.java

@@ -24,6 +24,7 @@ import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
+import com.qmth.teachcloud.common.enums.mark.MarkPaperStatus;
 import com.qmth.teachcloud.common.service.BasicCourseService;
 import com.qmth.teachcloud.common.util.*;
 import com.qmth.teachcloud.mark.entity.MarkPaper;
@@ -159,7 +160,7 @@ public class TCFinalScoreController {
         if (Objects.isNull(basicCourse)){
             throw ExceptionResultEnum.ERROR.exception("未找到课程");
         }
-        return ResultUtil.ok(markPaperService.list(new QueryWrapper<MarkPaper>().lambda().eq(MarkPaper::getExamId, examId).eq(MarkPaper::getCourseCode, basicCourse.getCode())));
+        return ResultUtil.ok(markPaperService.list(new QueryWrapper<MarkPaper>().lambda().eq(MarkPaper::getExamId, examId).eq(MarkPaper::getCourseCode, basicCourse.getCode()).eq(MarkPaper::getStatus, MarkPaperStatus.FINISH)));
     }
 
     @ApiOperation(value = "同步期末成绩")