3.0.1-命题计划统计

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

@@ -34,6 +34,8 @@ public interface TCStatisticsMapper extends BaseMapper<TCStatistics> {
      * @return
      */
     public IPage<TCStatisticsDto> list(IPage<Map> iPage,
+                                       @Param("semesterId") Long semesterId,
+                                       @Param("examId") Long examId,
                                        @Param("collegeId") Long collegeId,
                                        @Param("teachingRoomId") Long teachingRoomId,
                                        @Param("status") String status,

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

@@ -37,6 +37,8 @@ public interface TCStatisticsService extends IService<TCStatistics> {
      * @return
      */
     public IPage<TCStatisticsDto> list(IPage<Map> iPage,
+                                       Long semesterId,
+                                       Long examId,
                                        Long collegeId,
                                        Long teachingRoomId,
                                        StatisticsStatusEnum status,

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

@@ -64,8 +64,8 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
      * @return
      */
     @Override
-    public IPage<TCStatisticsDto> list(IPage<Map> iPage, Long collegeId, Long teachingRoomId, StatisticsStatusEnum status, String courseName, String teacherName, Long schoolId, Long userId) {
-        return tcStatisticsMapper.list(iPage, collegeId, teachingRoomId, Objects.nonNull(status) ? status.name() : null, courseName, teacherName, schoolId, userId);
+    public IPage<TCStatisticsDto> list(IPage<Map> iPage, Long semesterId, Long examId, Long collegeId, Long teachingRoomId, StatisticsStatusEnum status, String courseName, String teacherName, Long schoolId, Long userId) {
+        return tcStatisticsMapper.list(iPage, semesterId, examId, collegeId, teachingRoomId, Objects.nonNull(status) ? status.name() : null, courseName, teacherName, schoolId, userId);
     }
 
     /**

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

@@ -40,6 +40,8 @@
         tcs.create_id as createId,
         epp.id as printPlanId,
         epp.name as printPlanName,
+        epp.exam_id as examId,
+        be.semester_id as semesterId,
         (
         select
         etd.draw_count
@@ -66,6 +68,7 @@
         t_c_statistics tcs
         left join exam_print_plan epp on
         epp.id = tcs.print_plan_id
+        left join basic_exam be on epp.exam_id = be.id
         left join exam_detail ed on
         ed.id = tcs.exam_detail_id and ed.print_plan_id = epp.id
         where 1 = 1
@@ -80,6 +83,12 @@
             <if test="collegeId != null and collegeId != ''">
                 and t.collegeId = #{collegeId}
             </if>
+            <if test="semesterId != null and semesterId != ''">
+                and t.semesterId = #{semesterId}
+            </if>
+            <if test="examId != null and examId != ''">
+                and t.examId = #{examId}
+            </if>
             <if test="teachingRoomId != null and teachingRoomId != ''">
                 and t.teachingRoomId = #{teachingRoomId}
             </if>

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

@@ -19,7 +19,7 @@ import javax.validation.constraints.Min;
  */
 @Api(tags = "系统管理-任务管理Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/download")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.data}/download")
 public class DownloadController {
 
     @Resource
@@ -30,7 +30,7 @@ public class DownloadController {
      *
      * @param semesterId  学期ID
      * @param examId      考试ID
-     * @param collegeName 学院
+     * @param orgId 学院
      * @param courseName  课程名称
      * @param pageNumber  分页页码
      * @param pageSize    分页数

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

@@ -70,7 +70,9 @@ public class TCStatisticsController {
     @ApiOperation(value = "命题计划统计-列表")
     @ApiResponses({@ApiResponse(code = 200, message = "命题统计信息", response = TCStatisticsDto.class)})
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(@ApiParam(value = "学院id", required = false) @RequestParam(required = false) String collegeId,
+    public Result list(@ApiParam(value = "学期ID", required = false) @RequestParam(required = false) Long semesterId,
+                       @ApiParam(value = "考试ID", required = false) @RequestParam(required = false) Long examId,
+                       @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String collegeId,
                        @ApiParam(value = "部门id", required = false) @RequestParam(required = false) String teachingRoomId,
                        @ApiParam(value = "完成状态", required = false) @RequestParam(required = false) StatisticsStatusEnum status,
                        @ApiParam(value = "课程名称", required = false) @RequestParam(required = false) String courseName,
@@ -78,7 +80,7 @@ public class TCStatisticsController {
                        @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @ApiParam(value = "数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(tcStatisticsService.list(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(collegeId), SystemConstant.convertIdToLong(teachingRoomId), status, courseName, teacherName, sysUser.getSchoolId(), sysUser.getId()));
+        return ResultUtil.ok(tcStatisticsService.list(new Page<>(pageNumber, pageSize), semesterId, examId, SystemConstant.convertIdToLong(collegeId), SystemConstant.convertIdToLong(teachingRoomId), status, courseName, teacherName, sysUser.getSchoolId(), sysUser.getId()));
     }
 
     @ApiOperation(value = "命题计划统计-刷新数据")