Przeglądaj źródła

成绩管理1对多

wangliang 8 miesięcy temu
rodzic
commit
91a5d6d87b

+ 8 - 0
distributed-print-business/src/main/resources/db/log/wl.sql

@@ -0,0 +1,8 @@
+-- 2024-10-24
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(2114, '试卷清除信息', '/api/admin/course/degree/final_score/paper_struct/clear', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+
+UPDATE sys_privilege
+SET name='管理成绩', url='Score', `type`='LINK', parent_id=2001, `sequence`=1, property='AUTH', related='2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2029,2030,2031,2032,2033,2034,3018,2111,2114', enable=1, default_auth=0, front_display=1
+WHERE id=2006;

+ 9 - 0
distributed-print/install/mysql/upgrade/3.4.2.sql

@@ -106,3 +106,12 @@ CREATE TABLE `mark_question_answer` (
     COMMENT = '客观题信息';
 
 ALTER TABLE `exam_task` ADD COLUMN `exam_task_detail_enable` TINYINT(1) NULL DEFAULT 0 COMMENT '卷库启用禁用状态。是否启用,false:停用,true:启用' AFTER `enable`;
+
+-- 2024-10-24
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(2114, '试卷清除信息', '/api/admin/course/degree/final_score/paper_struct/clear', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+
+UPDATE sys_privilege
+SET name='管理成绩', url='Score', `type`='LINK', parent_id=2001, `sequence`=1, property='AUTH', related='2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2029,2030,2031,2032,2033,2034,3018,2111,2114', enable=1, default_auth=0, front_display=1
+WHERE id=2006;

+ 16 - 0
distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TCPaperStructController.java

@@ -255,6 +255,22 @@ public class TCPaperStructController {
         return ResultUtil.ok(paperStructDimensionResultList);
     }
 
+    @ApiOperation(value = "期末成绩试卷结构清除")
+    @RequestMapping(value = "/final_score/paper_struct/clear", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "试卷蓝图清除", response = Boolean.class)})
+    @Transactional
+    public Result finalScorePaperStructClear(@ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
+                                             @ApiParam(value = "科目id", required = true) @RequestParam Long courseId,
+                                             @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
+                                             @ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId) {
+        TCPaperStruct tcPaperStruct = tcPaperStructService.queryPaperStruct(cultureProgramId, courseId, paperNumber, examId);
+        Objects.requireNonNull(tcPaperStruct, "未找到试卷结构");
+        trBasicInfoService.clearReportData(cultureProgramId, courseId, paperNumber, examId, false);
+        tcFinalScoreService.remove(cultureProgramId, courseId, paperNumber, examId);
+        tcPaperStructService.removeById(tcPaperStruct.getId());
+        return ResultUtil.ok(true);
+    }
+
     /**
      * 获取试卷结构蓝图数据
      *

+ 0 - 2
distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TRBasicInfoController.java

@@ -144,7 +144,6 @@ public class TRBasicInfoController {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         BasicCourse basicCourse = basicCourseService.getById(courseId);
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(), sysUser.getId(), ServletUtil.getRequest().getServletPath());
-//        dpr.setOrgIdSet(ImmutableSet.of(1L));
         Long createId = CollectionUtils.isEmpty(dpr.getOrgIdSet()) ? sysUser.getId() : -1L;
         List<TRBasicInfo> trBasicInfoList = trBasicInfoService.queryBasicInfo(cultureProgramId, courseId, paperNumber, examId, createId);
         ObeCourseOutline obeCourseOutline = obeCourseOutlineService.findByCultureProgramIdAndCourseId(cultureProgramId,
@@ -243,7 +242,6 @@ public class TRBasicInfoController {
         try {
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
             DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(), sysUser.getId(), ServletUtil.getRequest().getServletPath());
-//            dpr.setOrgIdSet(ImmutableSet.of(1L));
             Long createId = CollectionUtils.isEmpty(dpr.getOrgIdSet()) ? sysUser.getId() : -1L;
             ObeCourseOutline obeCourseOutline = obeCourseOutlineService.findByCultureProgramIdAndCourseId(cultureProgramId, courseId);
             ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId(), true);