Browse Source

流程数据修改

wangliang 3 years ago
parent
commit
0189a6601a

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

@@ -252,18 +252,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
 
         UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
-////        // 启用时,后续状态清空
-//        if (examTask.getEnable()) {
-//            updateWrapper.lambda().set(ExamTask::getEnable, examTask.getEnable()) // 修改启用状态
-//                    .set(ExamTask::getReviewStatus, null) // 清空审核状态
-//                    .set(ExamTask::getStatus, task.getStatus().equals(ExamStatusEnum.NEW) || task.getStatus().equals(ExamStatusEnum.READY) ? task.getStatus() : ExamStatusEnum.STAGE) // 更新为命题中
-//                    .eq(ExamTask::getId, examTask.getId());
-//        } else {
-//            updateWrapper.lambda().set(ExamTask::getEnable, examTask.getEnable()).eq(ExamTask::getId, examTask.getId());
-//        }
-
-        // 解除题卡绑定
-        if (task.getEnable()) {
+        updateWrapper.lambda().set(ExamTask::getEnable, examTask.getEnable()).eq(ExamTask::getId, task.getId());
+        // 启用时,后续状态清空
+        if (!examTask.getEnable()) {//解除题卡绑定
             examTaskDetailService.resetCardId(examTask.getId());
         }
         return this.update(updateWrapper);
@@ -347,7 +338,14 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setOrgId(sysUser.getOrgId());
             if (examTask.getUserId() == null) {
                 examTask.setStatus(ExamStatusEnum.DRAFT);
-            } else {
+            } else if (examTask.getReview()) {
+                examTask.setStatus(ExamStatusEnum.STAGE);
+                //TODO 这里以后要判断学校code来取流程key
+                Map<String, Object> map = new HashMap<>();
+                map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
+                ProcessInstance processInstance = activitiService.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
+                examTask.setFlowId(Long.parseLong(processInstance.getId()));
+            } else if (!examTask.getReview()) {
                 examTask.setStatus(ExamStatusEnum.STAGE);
             }
             this.save(examTask);
@@ -867,7 +865,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         if (examTaskDetail.getOperateType().equals(ExamStatusEnum.SUBMIT.name())) {
             if (Objects.isNull(examTask.getFlowId())) {
                 //TODO 这里以后要判断学校code来取流程key
-                examTask.setStatus(ExamStatusEnum.SUBMIT);
+                examTask.setStatus(ExamStatusEnum.STAGE);
                 if (examTask.getReview()) {
                     Map<String, Object> map = new HashMap<>();
                     map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
@@ -887,10 +885,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 .eq(ExamTask::getId, examTask.getId());
         this.update(updateWrapper);
 
-        if(Objects.nonNull(examTask.getFlowId())){
+        if (Objects.nonNull(examTask.getFlowId())) {
             // 审核一级
             Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
-            if(Objects.nonNull(task)) {
+            if (Objects.nonNull(task)) {
                 Map<String, Object> map1 = new HashMap<>();
                 map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
                 activitiService.taskApprove(map1);
@@ -1368,7 +1366,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             } else {
                 if (Objects.isNull(examTask.getFlowId())) {
                     //TODO 这里以后要判断学校code来取流程key
-                    examTask.setStatus(ExamStatusEnum.SUBMIT);
+                    examTask.setStatus(ExamStatusEnum.STAGE);
                     if (basicExamRule.getReview()) {
                         Map<String, Object> map = new HashMap<>();
                         map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
@@ -1383,10 +1381,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             // 提交时,校验
             if (ExamStatusEnum.SUBMIT.name().equals(examTaskDetail.getOperateType())) {
 
-                if(Objects.nonNull(examTask.getFlowId())){
+                if (Objects.nonNull(examTask.getFlowId())) {
                     // 审核一级
                     Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
-                    if(Objects.nonNull(task)) {
+                    if (Objects.nonNull(task)) {
                         Map<String, Object> map1 = new HashMap<>();
                         map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
                         activitiService.taskApprove(map1);

+ 64 - 14
distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -749,26 +749,76 @@
         art.ID_ as taskId,
         tffa.setup
         from
-        ACT_RU_TASK art
-        left join exam_task et on
-        et.flow_id = art.PROC_INST_ID_
+        (
+        select
+        et.id,
+        et.school_id ,
+        et.org_id,
+        et.course_code,
+        et.course_name,
+        et.specialty,
+        et.paper_number,
+        et.card_rule_id,
+        case
+        et.card_rule_id when -1 then '全部通卡'
+        else b.name
+        end,
+        et.user_id,
+        c.real_name,
+        et.start_time,
+        et.end_time,
+        et.enable,
+        et.create_time,
+        et.flow_id
+        from
+        exam_task et
+        left join basic_card_rule b ON
+        et.card_rule_id = b.id
+        left join sys_user c ON
+        et.user_id = c.id
+        WHERE
+        et.user_id = #{userId}
+        and et.school_id = #{schoolId}
+        and et.flow_id is null
+        union all
+        select
+        et.id,
+        et.school_id,
+        et.org_id,
+        et.course_code,
+        et.course_name,
+        et.specialty,
+        et.paper_number,
+        et.card_rule_id,
+        case
+        et.card_rule_id when -1 then '全部通卡'
+        else b.name
+        end,
+        et.user_id,
+        c.real_name,
+        et.start_time,
+        et.end_time,
+        et.enable,
+        et.create_time,
+        et.flow_id
+        from
+        exam_task et
         left join basic_card_rule b ON
         et.card_rule_id = b.id
+        left join sys_user c ON
+        et.user_id = c.id
+        WHERE
+        et.user_id = #{userId}
+        and et.school_id = #{schoolId}
+        and et.flow_id is not null) et
+        left join ACT_RU_TASK art on
+        et.flow_id = art.PROC_INST_ID_
         left join t_f_flow_approve tffa on
         tffa.flow_id = et.flow_id
         left join sys_user c ON
         art.ASSIGNEE_ = c.id
-        <where>
-            <if test="userId != null and userId != ''">
-                and art.ASSIGNEE_ = #{userId}
-            </if>
-            <if test="schoolId != null and schoolId != ''">
-                and et.school_id = #{schoolId}
-            </if>
-<!--            <if test="orgId != null and orgId != ''">-->
-<!--                and et.org_id = #{orgId}-->
-<!--            </if>-->
-        </where>
+        left join basic_card_rule b ON
+        et.card_rule_id = b.id
         UNION all
         select
         et.id,

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/BasicExamRuleController.java

@@ -51,7 +51,7 @@ public class BasicExamRuleController {
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public Result save(@RequestBody BasicExamRule examRule) {
-        return ResultUtil.ok(new EditResult(basicExamRuleService.saveExamRule(examRule)));
+        return ResultUtil.ok(basicExamRuleService.saveExamRule(examRule));
     }
 
 }

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

@@ -93,6 +93,7 @@ public class ExamTaskController {
 
     /**
      * 命题任务管理-查询
+     *
      * @param enable
      * @param status
      * @param cardRuleId
@@ -100,8 +101,8 @@ public class ExamTaskController {
      * @param paperNumber
      * @param startTime
      * @param endTime
-     * @param userName 命题教师姓名
-     * @param createName 创建人姓名
+     * @param userName    命题教师姓名
+     * @param createName  创建人姓名
      * @param pageNumber
      * @param pageSize
      * @return
@@ -119,7 +120,7 @@ public class ExamTaskController {
                        @RequestParam(required = false) String createName,
                        @RequestParam Integer pageNumber,
                        @RequestParam Integer pageSize) {
-        IPage<ExamTaskDto> examTasks = examTaskService.list(enable, status, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime,userName,createName, pageNumber, pageSize);
+        IPage<ExamTaskDto> examTasks = examTaskService.list(enable, status, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime, userName, createName, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }
 
@@ -134,7 +135,7 @@ public class ExamTaskController {
     public Result paperNumberQuery(@RequestParam(value = "param", required = false) String param,
                                    @RequestParam(value = "printPlanId", required = false) List<String> printPlanId) {
 
-        if (Objects.isNull(printPlanId)){
+        if (Objects.isNull(printPlanId)) {
             printPlanId = new ArrayList<>();
         }
         List<Long> printPlanIdList = printPlanId.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
@@ -177,8 +178,7 @@ public class ExamTaskController {
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     public Result enable(@RequestBody ExamTask examTask) {
-        boolean isSuccess = examTaskService.enable(examTask);
-        return ResultUtil.ok(isSuccess);
+        return ResultUtil.ok(examTaskService.enable(examTask));
     }
 
     /**
@@ -265,6 +265,7 @@ public class ExamTaskController {
 
     /**
      * 入库申请查询
+     *
      * @param auditStatus
      * @param reviewStatus
      * @param cardRuleId
@@ -272,7 +273,7 @@ public class ExamTaskController {
      * @param paperNumber
      * @param startTime
      * @param endTime
-     * @param userName 命题老师名称
+     * @param userName     命题老师名称
      * @param pageNumber
      * @param pageSize
      * @return
@@ -286,10 +287,10 @@ public class ExamTaskController {
                                 @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                 @RequestParam(value = "startTime", required = false) Long startTime,
                                 @RequestParam(value = "endTime", required = false) Long endTime,
-                                @RequestParam(value = "userName",required = false) String userName,
+                                @RequestParam(value = "userName", required = false) String userName,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDto> list = examTaskService.listTaskApply(auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime,userName, pageNumber, pageSize);
+        IPage<ExamTaskDto> list = examTaskService.listTaskApply(auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize);
         return ResultUtil.ok(list);
     }
 
@@ -306,9 +307,9 @@ public class ExamTaskController {
                               @RequestParam(value = "examTaskId", required = true) Long examTaskId,
                               @RequestParam(value = "source", required = false) String source) {
         ExamTaskDetailCardDto detail = examTaskService.applyGetOne(examTaskId, source);
-        if(Objects.nonNull(detail) && Objects.nonNull(detail.getFlowId())){
+        if (Objects.nonNull(detail) && Objects.nonNull(detail.getFlowId())) {
             Task task = taskService.createTaskQuery().processInstanceId(detail.getFlowId()).singleResult();
-            if(Objects.nonNull(task)){
+            if (Objects.nonNull(task)) {
                 detail.setFlowTaskId(task.getId());
             }
         }
@@ -361,8 +362,8 @@ public class ExamTaskController {
      * @param startTime
      * @param endTime
      * @param startCreateTime 申请时间-起始
-     * @param endCreateTime 申请时间-终止
-     * @param createName 创建人
+     * @param endCreateTime   申请时间-终止
+     * @param createName      创建人
      * @param pageNumber
      * @param pageSize
      * @return
@@ -375,12 +376,12 @@ public class ExamTaskController {
                                           @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
                                           @RequestParam(value = "startTime", required = false) Long startTime,
                                           @RequestParam(value = "endTime", required = false) Long endTime,
-                                          @RequestParam(value = "startCreateTime",required = false) Long startCreateTime,
-                                          @RequestParam(value = "endCreateTime",required = false) Long endCreateTime,
-                                          @RequestParam(value = "createName",required = false) String createName,
+                                          @RequestParam(value = "startCreateTime", required = false) Long startCreateTime,
+                                          @RequestParam(value = "endCreateTime", required = false) Long endCreateTime,
+                                          @RequestParam(value = "createName", required = false) String createName,
                                           @RequestParam("pageNumber") Integer pageNumber,
                                           @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, cardRuleId, startTime, endTime,startCreateTime,endCreateTime,createName, pageNumber, pageSize);
+        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize);
         return ResultUtil.ok(examTaskDtoIPage);
     }
 
@@ -394,8 +395,8 @@ public class ExamTaskController {
      * @param startTime
      * @param endTime
      * @param startCreateTime 申请时间-起始
-     * @param endCreateTime 申请时间-终止
-     * @param createName 创建人
+     * @param endCreateTime   申请时间-终止
+     * @param createName      创建人
      * @param pageNumber
      * @param pageSize
      * @return
@@ -409,12 +410,12 @@ public class ExamTaskController {
                                         @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
                                         @RequestParam(value = "startTime", required = false) Long startTime,
                                         @RequestParam(value = "endTime", required = false) Long endTime,
-                                        @RequestParam(value = "startCreateTime",required = false) Long startCreateTime,
-                                        @RequestParam(value = "endCreateTime",required = false) Long endCreateTime,
-                                        @RequestParam(value = "createName",required = false) String createName,
+                                        @RequestParam(value = "startCreateTime", required = false) Long startCreateTime,
+                                        @RequestParam(value = "endCreateTime", required = false) Long endCreateTime,
+                                        @RequestParam(value = "createName", required = false) String createName,
                                         @RequestParam("pageNumber") Integer pageNumber,
                                         @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime,startCreateTime,endCreateTime,createName,pageNumber, pageSize);
+        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize);
         return ResultUtil.ok(examTaskDtoIPage);
     }
 
@@ -501,7 +502,7 @@ public class ExamTaskController {
                                 @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDetailDto> examTaskDtoIPage = examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime,makeMethod,cardRuleId, pageNumber, pageSize);
+        IPage<ExamTaskDetailDto> examTaskDtoIPage = examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime, makeMethod, cardRuleId, pageNumber, pageSize);
         return ResultUtil.ok(examTaskDtoIPage);
     }
 
@@ -735,7 +736,7 @@ public class ExamTaskController {
     @RequestMapping(value = "/find_card_title", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
 //    @Aac(auth = BOOL.FALSE)
-    public Result findCardTitle(@ApiParam(value = "题卡规则id",required = true) @RequestParam String cardRuleId) {
+    public Result findCardTitle(@ApiParam(value = "题卡规则id", required = true) @RequestParam String cardRuleId) {
         return ResultUtil.ok((Object) examTaskService.findCardTitle(SystemConstant.convertIdToLong(cardRuleId)));
     }