Browse Source

v2.2.2bug修改-审批记录详情部分信息未显示

xiaof 3 years ago
parent
commit
1c3f6e68c4

+ 2 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskMapper.java

@@ -148,4 +148,6 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @return
      */
     String getProcessDefinitionIdByMaxVersion(@Param("key") String key);
+
+    ExamTaskDto getByExamTaskId(Long examTaskId);
 }

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

@@ -256,4 +256,6 @@ public interface ExamTaskService extends IService<ExamTask> {
      * @param map
      */
     void applyResave(ExamTaskReApplyParam map);
+
+    ExamTaskDto getByExamTaskId(Long examTaskId);
 }

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

@@ -2006,6 +2006,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         activitiService.taskApprove(map1);
     }
 
+    @Override
+    public ExamTaskDto getByExamTaskId(Long examTaskId) {
+        return this.baseMapper.getByExamTaskId(examTaskId);
+    }
+
     /**
      * 简单校验提交参数
      *

+ 40 - 0
distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -1171,4 +1171,44 @@
             and t.VERSION_ = (select max(t.VERSION_) from ACT_RE_PROCDEF t
             where t.KEY_ = #{key})
     </select>
+    <select id="getByExamTaskId" resultType="com.qmth.distributed.print.business.bean.dto.ExamTaskDto">
+        SELECT
+            a.id,
+            a.school_id schoolId,
+            a.course_code courseCode,
+            a.course_name courseName,
+            a.specialty,
+            a.paper_number paperNumber,
+            a.card_rule_id cardRuleId,
+            CASE a.card_rule_id
+            WHEN - 1 THEN '全部通卡'
+            ELSE b.name
+            END cardRuleName,
+            a.user_id userId,
+            c.real_name userName,
+            a.start_time startTime,
+            a.end_time endTime,
+            a.status,
+            a.teacher_name teacherName,
+            a.lecturer_name lecturerName,
+            d.name teachingRoomName,
+            e.status  auditStatus,
+            a.enable,
+            a.review,
+            a.create_id createId,
+            a.create_time createTime,
+            e.setup,
+            a.flow_id flowId
+        FROM
+            exam_task a
+        LEFT JOIN
+            basic_card_rule b ON a.card_rule_id = b.id
+        LEFT JOIN
+            sys_user c ON a.user_id = c.id
+        LEFT JOIN
+            sys_org d ON a.teaching_room_id = d.id
+        LEFT JOIN
+            t_f_flow_approve e ON a.flow_id = e.flow_id
+        where a.id = #{examTaskId}
+    </select>
 </mapper>

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailCardDto;
+import com.qmth.distributed.print.business.bean.dto.ExamTaskDto;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskImportDto;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskPrintDto;
 import com.qmth.distributed.print.business.bean.params.ApproveFormParams;
@@ -302,8 +303,8 @@ public class ExamTaskController {
     @ApiOperation(value = "根据命题任务ID查询单个数据")
     @RequestMapping(value = "/exam_task_get_one", method = RequestMethod.POST)
     public Result applyGetOne(@RequestParam(value = "examTaskId") Long examTaskId) {
-        ExamTask examTask = examTaskService.getById(examTaskId);
-        return ResultUtil.ok(examTask);
+        ExamTaskDto examTaskDto = examTaskService.getByExamTaskId(examTaskId);
+        return ResultUtil.ok(examTaskDto);
     }
 
     /**