db更新

distributed-print/install/mysql/upgrade/3.3.1.sql

@@ -97,10 +97,13 @@ INSERT INTO sys_privilege
 VALUES(2024, '列表', '/api/admin/course/degree/report/list', 'URL', 2002, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2025, '查看报告', 'View', 'LINK', 2002, 1, 'AUTH', '2026,2027', 1, 0, 1);
+VALUES(2025, '查看报告', 'View', 'LINK', 2002, 1, 'AUTH', '2026,2027,2028', 1, 0, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
 VALUES(2026, '查看报告', '/api/admin/course/degree/report/view', 'URL', 2025, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2027, '导出报告', '/api/admin/course/degree/report/export', 'URL', 2025, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2027, '导出报告', '/api/admin/course/degree/report/export', 'URL', 2025, 1, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(2028, '保存报告', '/api/admin/course/degree/report/save', 'URL', 2025, 1, 'AUTH', NULL, 1, 1, 1);

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

@@ -34,7 +34,8 @@ public class CourseTargetDegreeController {
     @RequestMapping(value = "/score/template_download", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
-    public void templateDownload(@ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+    public void templateDownload(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+                                 @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                  @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                                  @ApiParam(value = "试卷类型", required = true) @RequestParam String paperType) throws IOException {
 //        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -88,7 +89,8 @@ public class CourseTargetDegreeController {
     @RequestMapping(value = "/score/end_exam/template_download", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
-    public void endExamTemplateDownload(@ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+    public void endExamTemplateDownload(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+                                        @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                         @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                                         @ApiParam(value = "试卷类型", required = true) @RequestParam String paperType) throws IOException {
 //        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -141,8 +143,8 @@ public class CourseTargetDegreeController {
 
     @ApiOperation(value = "期末成绩试卷蓝图保存")
     @RequestMapping(value = "/score/end_exam/paper_positive/save", method = RequestMethod.POST)
-    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
-    @ApiResponses({@ApiResponse(code = 200, message = "试卷蓝图保存", response = EditResult.class)})
+    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @ApiResponses({@ApiResponse(code = 200, message = "试卷蓝图保存", response = Object.class)})
     public Object scoreEndExamPaperPositive(@ApiParam(value = "试卷蓝图结构", required = true) @RequestBody Object body) throws IOException {
         return ResultUtil.ok(true);
     }
@@ -162,17 +164,28 @@ public class CourseTargetDegreeController {
     @RequestMapping(value = "/report/view", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
     @ApiResponses({@ApiResponse(code = 200, message = "查看报告", response = Object.class)})
-    public Object reportView(@ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+    public Object reportView(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+                             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                              @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                              @ApiParam(value = "试卷类型", required = true) @RequestParam String paperType) {
         return ResultUtil.ok(true);
     }
 
+    @ApiOperation(value = "保存报告")
+    @RequestMapping(value = "/report/save", method = RequestMethod.POST)
+    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
+    @ApiResponses({@ApiResponse(code = 200, message = "保存报告", response = Object.class)})
+    public Object reportSave(@ApiParam(value = "保存报告结构", required = true) @RequestBody Object body) {
+        return ResultUtil.ok(true);
+    }
+
+
     @ApiOperation(value = "导出报告")
     @RequestMapping(value = "/report/export", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
-    public void reportExport(@ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+    public void reportExport(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+                             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                              @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                              @ApiParam(value = "试卷类型", required = true) @RequestParam String paperType) throws IOException {