update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TBTask.java

@@ -32,7 +32,7 @@ public class TBTask implements Serializable {
     @TableId(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "任务类型，USER_IMPORT：用户导入，QUESTION_MISSION_BATCH_CREATE：批量新建命题任务，SAMPLE_EXPORT：导出审核样本，PAPER_DOWNLOAD：卷库下载，EXAMINATION_IMPORT：考务数据导入，EXAMINATION_EXPORT：考务数据导出，PRINT_PDF_DOWNLOAD：批量下载pdf")
+    @ApiModelProperty(value = "任务类型，USER_IMPORT：用户导入，QUESTION_MISSION_BATCH_CREATE：批量新建命题任务，SAMPLE_EXPORT：导出审核样本，PAPER_DOWNLOAD：卷库下载，EXAMINATION_IMPORT：考务数据导入，EXAMINATION_EXPORT：考务数据导出，PRINT_PDF_DOWNLOAD：批量下载pdf，CREATE_PDF：生成pdf")
     @TableField(value = "type")
     private TaskTypeEnum type;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/TaskTypeEnum.java

@@ -23,7 +23,9 @@ public enum TaskTypeEnum {
 
     EXAMINATION_EXPORT("考务数据导出"),
 
-    PRINT_PDF_DOWNLOAD("批量下载pdf");
+    PRINT_PDF_DOWNLOAD("批量下载pdf"),
+
+    CREATE_PDF("生成pdf");
 
     private String title;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamCardMapper.java

@@ -18,31 +18,4 @@ import java.util.Map;
  */
 public interface ExamCardMapper extends BaseMapper<ExamCard> {
 
-    /**
-     * 查询我的工作台
-     *
-     * @param iPage
-     * @param userId
-     * @param schoolId
-     * @param status
-     * @return
-     */
-    IPage<WorkResult> queryByMyWork(IPage<Map> iPage,
-                                    @Param("userId") Long userId,
-                                    @Param("schoolId") Long schoolId,
-                                    @Param("status") String status);
-
-    /**
-     * 查询我的工作台
-     *
-     * @param iPage
-     * @param userId
-     * @param schoolId
-     * @param status
-     * @return
-     */
-    IPage<WorkResult> queryByMyWorkSubmit(IPage<Map> iPage,
-                                    @Param("userId") Long userId,
-                                    @Param("schoolId") Long schoolId,
-                                    @Param("status") String status);
 }

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

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.dto.*;
+import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -34,4 +36,32 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
     List<RelatePaperDto> listPaperNumbers(@Param("schoolId") Long schoolId, @Param("courseCode") String courseCode);
 
     ExamTaskDetailCardDto applyGetOne(Long examTaskId);
+
+    /**
+     * 查询我的工作台
+     *
+     * @param iPage
+     * @param userId
+     * @param schoolId
+     * @param status
+     * @return
+     */
+    IPage<WorkResult> queryByMyWork(IPage<Map> iPage,
+                                    @Param("userId") Long userId,
+                                    @Param("schoolId") Long schoolId,
+                                    @Param("status") String status);
+
+    /**
+     * 查询我的工作台
+     *
+     * @param iPage
+     * @param userId
+     * @param schoolId
+     * @param status
+     * @return
+     */
+    IPage<WorkResult> queryByMyWorkSubmit(IPage<Map> iPage,
+                                          @Param("userId") Long userId,
+                                          @Param("schoolId") Long schoolId,
+                                          @Param("status") String status);
 }

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

@@ -19,27 +19,5 @@ import java.util.Map;
  */
 public interface ExamCardService extends IService<ExamCard> {
 
-    /**
-     * 查询我的工作台
-     *
-     * @param iPage
-     * @param userId
-     * @param schoolId
-     * @param status
-     * @return
-     */
-    IPage<WorkResult> queryByMyWork(IPage<Map> iPage, Long userId, Long schoolId, ExamStatusEnum status);
-
-    /**
-     * 查询我的工作台-审核待办
-     *
-     * @param iPage
-     * @param userId
-     * @param schoolId
-     * @param status
-     * @return
-     */
-    IPage<WorkResult> queryByMyWorkSubmit(IPage<Map> iPage, Long userId, Long schoolId, ExamStatusEnum status);
-
     String saveExamCard(ExamCardParams examCardParams);
 }

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

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.*;
+import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.ExamTaskDetail;
 import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -58,4 +61,27 @@ public interface ExamTaskService extends IService<ExamTask> {
     boolean status(ExamTask examTask);
 
     ExamTaskDetailCardDto applyGetOne(Long examTaskId);
+
+    /**
+     * 查询我的工作台
+     *
+     * @param iPage
+     * @param userId
+     * @param schoolId
+     * @param status
+     * @return
+     */
+    IPage<WorkResult> queryByMyWork(IPage<Map> iPage, Long userId, Long schoolId, ExamStatusEnum status);
+
+    /**
+     * 查询我的工作台-审核待办
+     *
+     * @param iPage
+     * @param userId
+     * @param schoolId
+     * @param status
+     * @return
+     */
+    IPage<WorkResult> queryByMyWorkSubmit(IPage<Map> iPage, Long userId, Long schoolId, ExamStatusEnum status);
+
 }

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

@@ -36,9 +36,6 @@ import java.util.Objects;
 @Service
 public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> implements ExamCardService {
 
-    @Resource
-    ExamCardMapper examCardMapper;
-
     @Autowired
     private BasicExamRuleService basicExamRuleService;
 
@@ -48,34 +45,6 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
     @Autowired
     private ExamTaskDetailService examTaskDetailService;
 
-    /**
-     * 查询我的工作台
-     *
-     * @param iPage
-     * @param userId
-     * @param schoolId
-     * @param status
-     * @return
-     */
-    @Override
-    public IPage<WorkResult> queryByMyWork(IPage<Map> iPage, Long userId, Long schoolId, ExamStatusEnum status) {
-        return examCardMapper.queryByMyWork(iPage, userId, schoolId, Objects.nonNull(status) ? status.name() : null);
-    }
-
-    /**
-     * 查询我的工作台-审核待办
-     *
-     * @param iPage
-     * @param userId
-     * @param schoolId
-     * @param status
-     * @return
-     */
-    @Override
-    public IPage<WorkResult> queryByMyWorkSubmit(IPage<Map> iPage, Long userId, Long schoolId, ExamStatusEnum status) {
-        return examCardMapper.queryByMyWorkSubmit(iPage, userId, schoolId, Objects.nonNull(status) ? status.name() : null);
-    }
-
     @Transactional
     @Override
     public String saveExamCard(ExamCardParams examCardParams) {

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.*;
+import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.enums.ReviewStatusEnum;
@@ -19,9 +20,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import javax.annotation.Resource;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -47,6 +47,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Autowired
     private ExamTaskDetailService examTaskDetailService;
 
+    @Resource
+    ExamTaskMapper examTaskMapper;
+
     @Override
     public List<ExamTask> listByCourseCode(Long schoolId, String code) {
         QueryWrapper<ExamTask> queryWrapper = new QueryWrapper<>();
@@ -123,7 +126,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         updateWrapper.lambda().set(ExamTask::getEnable, examTask.getEnable()).eq(ExamTask::getId, examTask.getId());
 
         // 解除题卡绑定
-        if(task.getEnable()){
+        if (task.getEnable()) {
             examTaskDetailService.resetCardId(examTask.getId());
         }
         return this.update(updateWrapper);
@@ -341,4 +344,32 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         ExamTaskDetailCardDto examTaskDetailDto = this.baseMapper.applyGetOne(examTaskId);
         return examTaskDetailDto;
     }
+
+    /**
+     * 查询我的工作台
+     *
+     * @param iPage
+     * @param userId
+     * @param schoolId
+     * @param status
+     * @return
+     */
+    @Override
+    public IPage<WorkResult> queryByMyWork(IPage<Map> iPage, Long userId, Long schoolId, ExamStatusEnum status) {
+        return examTaskMapper.queryByMyWork(iPage, userId, schoolId, Objects.nonNull(status) ? status.name() : null);
+    }
+
+    /**
+     * 查询我的工作台-审核待办
+     *
+     * @param iPage
+     * @param userId
+     * @param schoolId
+     * @param status
+     * @return
+     */
+    @Override
+    public IPage<WorkResult> queryByMyWorkSubmit(IPage<Map> iPage, Long userId, Long schoolId, ExamStatusEnum status) {
+        return examTaskMapper.queryByMyWorkSubmit(iPage, userId, schoolId, Objects.nonNull(status) ? status.name() : null);
+    }
 }

distributed-print-business/src/main/resources/mapper/ExamCardMapper.xml

@@ -21,60 +21,4 @@
         id,
         school_id, course_code, course_name, title, make_method, create_id, create_time, update_id, update_time
     </sql>
-
-    <select id="queryByMyWork" resultType="com.qmth.distributed.print.business.bean.result.WorkResult">
-        <include refid="myworkCommonHead" />
-        <include refid="myworkCommonMiddle" />
-        <where>
-            <include refid="myworkCommonFoot" />
-        </where>
-    </select>
-
-    <select id="queryByMyWorkSubmit" resultType="com.qmth.distributed.print.business.bean.result.WorkResult">
-        <include refid="myworkCommonHead" />
-            ,et.create_time as createTime,
-            (
-            select
-            t.real_name
-            from
-            sys_user t
-            where
-            t.id = et.user_id) as questionName
-        <include refid="myworkCommonMiddle" />
-        <where>
-            <include refid="myworkCommonFoot" />
-        </where>
-    </select>
-
-    <sql id="myworkCommonHead">
-        select
-            et.id,
-            et.paper_number as paperNumber,
-            et.course_name as courseName,
-            et.course_code as courseCode,
-            et.end_time as endTime
-    </sql>
-
-    <sql id="myworkCommonMiddle">
-        from
-            exam_task et
-    </sql>
-
-    <sql id="myworkCommonFoot">
-        <choose>
-            <when test="userId != null and userId != ''">
-                and et.user_id = #{userId}
-            </when>
-            <otherwise>
-                and et.user_id is null
-            </otherwise>
-        </choose>
-        <if test="schoolId != null and schoolId != ''">
-            and et.school_id = #{schoolId}
-        </if>
-        <if test="status != null and status != ''">
-            and et.status = #{status}
-        </if>
-        and et.enable = 1
-    </sql>
 </mapper>

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

@@ -354,4 +354,59 @@
         where a.exam_task_id = #{examTaskId}
     </select>
 
+    <select id="queryByMyWork" resultType="com.qmth.distributed.print.business.bean.result.WorkResult">
+        <include refid="myworkCommonHead" />
+        <include refid="myworkCommonMiddle" />
+        <where>
+            <include refid="myworkCommonFoot" />
+        </where>
+    </select>
+
+    <select id="queryByMyWorkSubmit" resultType="com.qmth.distributed.print.business.bean.result.WorkResult">
+        <include refid="myworkCommonHead" />
+        ,et.create_time as createTime,
+        (
+        select
+        t.real_name
+        from
+        sys_user t
+        where
+        t.id = et.user_id) as questionName
+        <include refid="myworkCommonMiddle" />
+        <where>
+            <include refid="myworkCommonFoot" />
+        </where>
+    </select>
+
+    <sql id="myworkCommonHead">
+        select
+            et.id,
+            et.paper_number as paperNumber,
+            et.course_name as courseName,
+            et.course_code as courseCode,
+            et.end_time as endTime
+    </sql>
+
+    <sql id="myworkCommonMiddle">
+        from
+            exam_task et
+    </sql>
+
+    <sql id="myworkCommonFoot">
+        <choose>
+            <when test="userId != null and userId != ''">
+                and et.user_id = #{userId}
+            </when>
+            <otherwise>
+                and et.user_id is null
+            </otherwise>
+        </choose>
+        <if test="schoolId != null and schoolId != ''">
+            and et.school_id = #{schoolId}
+        </if>
+        <if test="status != null and status != ''">
+            and et.status = #{status}
+        </if>
+        and et.enable = 1
+    </sql>
 </mapper>

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

@@ -8,7 +8,7 @@ import com.qmth.boot.core.enums.Platform;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
-import com.qmth.distributed.print.business.service.ExamCardService;
+import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.util.Result;
@@ -38,7 +38,7 @@ import javax.annotation.Resource;
 public class WorkController {
 
     @Resource
-    ExamCardService examCardService;
+    ExamTaskService examTaskService;
 
     @ApiOperation(value = "命题待办接口")
     @RequestMapping(value = "/exam/task/ready", method = RequestMethod.POST)
@@ -46,7 +46,7 @@ public class WorkController {
     public Result examTaskReady(@RequestParam(value = "pageNumber", required = true) Integer pageNumber,
                                 @RequestParam(value = "pageSize", required = true) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examCardService.queryByMyWork(new Page<>(pageNumber, pageSize), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY));
+        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(pageNumber, pageSize), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY));
     }
 
     @ApiOperation(value = "命题待办计数接口")
@@ -54,7 +54,7 @@ public class WorkController {
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
     public Result examTaskReadyCount() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examCardService.queryByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY).getRecords().size());
+        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY).getRecords().size());
     }
 
     @ApiOperation(value = "命题分配待办接口")
@@ -63,7 +63,7 @@ public class WorkController {
     public Result examTaskNew(@RequestParam(value = "pageNumber", required = true) Integer pageNumber,
                               @RequestParam(value = "pageSize", required = true) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examCardService.queryByMyWork(new Page<>(pageNumber, pageSize), null, sysUser.getSchoolId(), ExamStatusEnum.NEW));
+        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(pageNumber, pageSize), null, sysUser.getSchoolId(), ExamStatusEnum.NEW));
     }
 
     @ApiOperation(value = "命题分配待办计数接口")
@@ -71,7 +71,7 @@ public class WorkController {
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
     public Result examTaskNewCount() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examCardService.queryByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), null, sysUser.getSchoolId(), ExamStatusEnum.NEW).getRecords().size());
+        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), null, sysUser.getSchoolId(), ExamStatusEnum.NEW).getRecords().size());
     }
 
     @ApiOperation(value = "审核待办接口")
@@ -80,7 +80,7 @@ public class WorkController {
     public Result examTaskSubmit(@RequestParam(value = "pageNumber", required = true) Integer pageNumber,
                                  @RequestParam(value = "pageSize", required = true) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examCardService.queryByMyWorkSubmit(new Page<>(pageNumber, pageSize), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.SUBMIT));
+        return ResultUtil.ok(examTaskService.queryByMyWorkSubmit(new Page<>(pageNumber, pageSize), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.SUBMIT));
     }
 
     @ApiOperation(value = "审核待办计数接口")
@@ -88,7 +88,7 @@ public class WorkController {
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
     public Result examTaskSubmitCount() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examCardService.queryByMyWorkSubmit(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.SUBMIT).getRecords().size());
+        return ResultUtil.ok(examTaskService.queryByMyWorkSubmit(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.SUBMIT).getRecords().size());
     }
 }