1.0.4 bug

src/main/java/com/qmth/eds/api/ExamAssignController.java

@@ -45,6 +45,15 @@ public class ExamAssignController {
         return ResultUtil.ok(examAssignService.pageData(semesterId, examTypeId, courseCode, pageNumber, pageSize));
     }
 
+    @ApiOperation(value = "准备试算")
+    @PostMapping("/to_calc")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result toCalc(@RequestParam(value = "semesterId", required = false) Long semesterId,
+                           @RequestParam(value = "examTypeId", required = false) Long examTypeId,
+                           @RequestParam(value = "courseCode", required = false) String courseCode) {
+        return ResultUtil.ok(examAssignService.toCalc(semesterId, examTypeId, courseCode));
+    }
+
 
     @ApiOperation(value = "计算")
     @PostMapping("/calc")
@@ -68,10 +77,9 @@ public class ExamAssignController {
                          @RequestParam(value = "courseCode", required = false) String courseCode,
                          @RequestParam(value = "courseName", required = false) String courseName,
                          @RequestParam(value = "formula", required = false) String formula,
-                         @RequestParam(value = "fullScore", required = false) Double fullScore,
                          @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                          @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(examAssignService.result(semesterId, examTypeId, courseCode, courseName, formula, fullScore, pageNumber, pageSize));
+        return ResultUtil.ok(examAssignService.result(semesterId, examTypeId, courseCode, courseName, formula, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "计算结果对比")

src/main/java/com/qmth/eds/bean/dto/ExamAssignDto.java

@@ -0,0 +1,6 @@
+package com.qmth.eds.bean.dto;
+
+import com.qmth.eds.common.entity.ExamAssign;
+
+public class ExamAssignDto extends ExamAssign {
+}

src/main/java/com/qmth/eds/common/entity/ExamAssign.java

@@ -36,10 +36,6 @@ public class ExamAssign extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "公式类型")
     private String formula;
-    @ApiModelProperty(value = "满分")
-    private Double fullScore;
-    @ApiModelProperty(value = "及格分")
-    private Double passScore;
 
     @ApiModelProperty(value = "系数json")
     private String coefficient;
@@ -93,22 +89,6 @@ public class ExamAssign extends BaseEntity implements Serializable {
         this.formula = formula;
     }
 
-    public Double getFullScore() {
-        return fullScore;
-    }
-
-    public void setFullScore(Double fullScore) {
-        this.fullScore = fullScore;
-    }
-
-    public Double getPassScore() {
-        return passScore;
-    }
-
-    public void setPassScore(Double passScore) {
-        this.passScore = passScore;
-    }
-
     public String getCoefficient() {
         return coefficient;
     }

src/main/java/com/qmth/eds/service/ExamAssignService.java

@@ -3,6 +3,7 @@ package com.qmth.eds.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.eds.bean.dto.AssignListDto;
+import com.qmth.eds.bean.dto.ExamAssignDto;
 import com.qmth.eds.common.entity.CloudMarkingScore;
 import com.qmth.eds.common.entity.ExamAssign;
 
@@ -20,7 +21,9 @@ public interface ExamAssignService extends IService<ExamAssign> {
 
     boolean calcData(Long semesterId, Long examTypeId, String courseCode, String courseName, String formula, Double fullScore, Double passScore, String coefficient);
 
-    IPage<CloudMarkingScore> result(Long semesterId, Long examTypeId, String courseCode, String courseName, String formula, Double fullScore, Integer pageNumber, Integer pageSize);
+    IPage<CloudMarkingScore> result(Long semesterId, Long examTypeId, String courseCode, String courseName, String formula, Integer pageNumber, Integer pageSize);
 
     Map contrast(Long semesterId, Long examTypeId, String courseCode);
+
+    ExamAssignDto toCalc(Long semesterId, Long examTypeId, String courseCode);
 }

src/main/java/com/qmth/eds/service/impl/ExamAssignServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.eds.bean.dto.AssignListDto;
+import com.qmth.eds.bean.dto.ExamAssignDto;
 import com.qmth.eds.common.entity.*;
 import com.qmth.eds.common.util.ServletUtil;
 import com.qmth.eds.mapper.ExamAssignMapper;
@@ -53,7 +54,7 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
     }
 
     @Override
-    public IPage<CloudMarkingScore> result(Long semesterId, Long examTypeId, String courseCode, String courseName, String formula, Double fullScore, Integer pageNumber, Integer pageSize) {
+    public IPage<CloudMarkingScore> result(Long semesterId, Long examTypeId, String courseCode, String courseName, String formula, Integer pageNumber, Integer pageSize) {
         return null;
     }
 
@@ -61,4 +62,9 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
     public Map contrast(Long semesterId, Long examTypeId, String courseCode) {
         return null;
     }
+
+    @Override
+    public ExamAssignDto toCalc(Long semesterId, Long examTypeId, String courseCode) {
+        return null;
+    }
 }

src/main/resources/db/log/log-1.0.4.sql

@@ -18,6 +18,7 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('49', '赋分计算', '/api/assign/calc', 'URL', '45', '3', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('50', '赋分计算结果查询', '/api/assign/result', 'URL', '45', '4', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('51', '赋分计算结果对比', '/api/assign/contrast', 'URL', '45', '5', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('52', '同步结果查询', '/api/sync_task/page', 'URL', '33', '1', 'SYS', '1', '1', '1');
 
 
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`) VALUES ('45', '3', '45', '1');
@@ -36,8 +37,6 @@ CREATE TABLE `exam_assign` (
      `course_code` VARCHAR(45) NULL,
      `course_name` VARCHAR(100) NULL,
      `formula` VARCHAR(45) NULL COMMENT '公式类型（类型1或者类型2）',
-     `full_score` DOUBLE NULL COMMENT '满分',
-     `pass_score` DOUBLE NULL COMMENT '及格分',
      `coefficient` MEDIUMTEXT NULL COMMENT '系统对象（json格式）',
      `create_id` BIGINT(20) NULL,
      `create_time` BIGINT(20) NULL,