Merge remote-tracking branch 'origin/dev_v2.2.0' into dev_v2.2.0

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

@@ -175,4 +175,6 @@ public interface ExamTaskService extends IService<ExamTask> {
      * @return
      */
     List<ExamTask> findByFlowStatus(Long schoolId, String courseCode, String courseName, String paperNumber, FlowStatusEnum flowStatus);
+
+    void removeByExamTaskId(Long examTaskId);
 }

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

@@ -110,6 +110,7 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
                 throw ExceptionResultEnum.ERROR.exception("题卡规则名称已存在");
             }
 
+            cardRule.setOrgId(sysUser.getOrgId());
             cardRule.setUpdateId(sysUser.getId());
             cardRule.setUpdateTime(System.currentTimeMillis());
 

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

@@ -1303,4 +1303,21 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     public List<ExamTask> findByFlowStatus(Long schoolId, String courseCode, String courseName, String paperNumber, FlowStatusEnum flowStatus) {
         return examTaskMapper.findByFlowStatus(schoolId, courseCode, courseName, paperNumber, Objects.nonNull(flowStatus) ? flowStatus.name() : null);
     }
+
+    @Transactional
+    @Override
+    public void removeByExamTaskId(Long examTaskId) {
+        // 删除任务
+        this.removeById(examTaskId);
+        ExamTaskDetail examTaskDetail = examTaskDetailService.getByExamTaskId(examTaskId);
+        if (examTaskDetail != null) {
+            if (examTaskDetail.getCardId() != null) {
+                examCardService.removeById(examTaskDetail.getCardId());
+                UpdateWrapper<ExamCardDetail> examCardDetailUpdateWrapper = new UpdateWrapper<>();
+                examCardDetailUpdateWrapper.lambda().eq(ExamCardDetail::getCardId, examTaskDetail.getCardId());
+                examCardDetailService.remove(examCardDetailUpdateWrapper);
+            }
+        }
+        examTaskDetailService.removeById(examTaskDetail.getId());
+    }
 }

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

@@ -575,7 +575,7 @@ public class ExamTaskController {
      * @param examTaskApplyParam
      * @return
      */
-    @ApiOperation(value = "暂存/提交")
+    @ApiOperation(value = "入库申请-新建命题任务-暂存/提交")
     @RequestMapping(value = "/save_task_apply", method = RequestMethod.POST)
     public Result saveTaskApply(@RequestBody ExamTaskApplyParam examTaskApplyParam) throws IOException {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
@@ -590,7 +590,20 @@ public class ExamTaskController {
             printCommonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), (SysUser) ServletUtil.getRequestUser());
         }
 
-        return ResultUtil.ok(isSuccess);
+        return ResultUtil.ok(task.getId());
+    }
+
+    /**
+     * 入库申请-新建命题任务
+     *
+     * @param examTaskId
+     * @return
+     */
+    @ApiOperation(value = "入库申请-新建命题任务-取消/删除")
+    @RequestMapping(value = "/remove_task_apply", method = RequestMethod.POST)
+    public Result removeTaskApply(@RequestParam(value = "examTaskId") Long examTaskId) throws IOException {
+        examTaskService.removeByExamTaskId(examTaskId);
+        return ResultUtil.ok(true, "");
     }
 
     /**

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/UserDto.java

@@ -20,6 +20,7 @@ public class UserDto {
     private String remark;
     private String orgId;
     private String orgName;
+    private String code;
 
     private List<SysRole> roles;
 
@@ -112,4 +113,8 @@ public class UserDto {
     public void setOrgName(String orgName) {
         this.orgName = orgName;
     }
+
+    public String getCode() {
+        return code;
+    }
 }

teachcloud-common/src/main/resources/mapper/SysUserMapper.xml

@@ -32,6 +32,7 @@
             a.enable,
             a.remark,
             a.org_id orgId,
+            a.code code,
             b.name orgName
         FROM
             sys_user a