[bug]考务数据导出

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

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -70,10 +71,11 @@ public interface ExamDetailService extends IService<ExamDetail> {
      * @param packageCode 卷袋编号
      * @param pageNumber 分页页码
      * @param pageSize 分页数量
+     * @param orgIds 权限控制参数
      * @return 查询结果
      */
-    IPage<ExaminationResult> findExaminationBriefPage(Long schoolId,Long printPlanId,String courseCode,String paperNumber,
-                                                      String examPlace,String examRoom,String packageCode,int pageNumber,int pageSize);
+    IPage<ExaminationResult> findExaminationBriefPage(Long schoolId, Long printPlanId, String courseCode, String paperNumber,
+                                                      String examPlace, String examRoom, String packageCode, int pageNumber, int pageSize, Set<Long> orgIds);
 
     /**
      * 查询考务数据-汇总数据查询
@@ -84,10 +86,11 @@ public interface ExamDetailService extends IService<ExamDetail> {
      * @param examPlace 考点
      * @param examRoom 考场
      * @param packageCode 卷袋编号
+     * @param orgIds 权限控制参数
      * @return 查询结果
      */
     SummarizedDataResult findSummarizedData(Long schoolId,Long printPlanId,String courseCode,String paperNumber,
-                                            String examPlace,String examRoom,String packageCode);
+                                            String examPlace,String examRoom,String packageCode,Set<Long> orgIds);
 
 
     /**

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

@@ -208,8 +208,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public IPage<ExaminationResult> findExaminationBriefPage(Long schoolId, Long printPlanId, String courseCode, String paperNumber, String examPlace, String examRoom, String packageCode, int pageNumber, int pageSize) {
-        Set<Long> orgIds = commonService.listSubOrgIds(null);
+    public IPage<ExaminationResult> findExaminationBriefPage(Long schoolId, Long printPlanId, String courseCode, String paperNumber, String examPlace, String examRoom, String packageCode, int pageNumber, int pageSize,Set<Long> orgIds) {
         IPage<ExaminationResult> page = examDetailMapper.findBriefPage(new Page<>(pageNumber, pageSize), schoolId, printPlanId, courseCode, paperNumber, examPlace, examRoom, packageCode,orgIds);
         List<ExaminationResult> list = page.getRecords();
         for (ExaminationResult examinationResult : list) {
@@ -250,8 +249,8 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public SummarizedDataResult findSummarizedData(Long schoolId, Long printPlanId, String courseCode, String paperNumber, String examPlace, String examRoom, String packageCode) {
-        IPage<ExaminationResult> page = this.findExaminationBriefPage(schoolId, printPlanId, courseCode, paperNumber, examPlace, examRoom, packageCode, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE);
+    public SummarizedDataResult findSummarizedData(Long schoolId, Long printPlanId, String courseCode, String paperNumber, String examPlace, String examRoom, String packageCode, Set<Long> orgIds) {
+        IPage<ExaminationResult> page = this.findExaminationBriefPage(schoolId, printPlanId, courseCode, paperNumber, examPlace, examRoom, packageCode, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE,orgIds);
         List<ExaminationResult> list = page.getRecords();
         int totalSubjects = 0;
         for (ExaminationResult examinationResult : list) {
@@ -593,6 +592,10 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         if (map.get("packageCode") != null) {
             packageCode = String.valueOf(map.get("packageCode"));
         }
+        Set<Long> orgIds = new HashSet<>();
+        if (Objects.nonNull(map.get("orgIds"))){
+            orgIds = (Set<Long>) map.get("orgIds");
+        }
 
         TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
         Long userId = tbTask.getCreateId();
@@ -600,7 +603,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
 
         List<ExaminationResult> examinationResultList = this.findExaminationBriefPage(schoolId,
                 printPlanId, courseCode, paperNumber, examPlace, examRoom, packageCode,
-                SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE).getRecords();
+                SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE,orgIds).getRecords();
         int index = 0;
         List<ExaminationExportDto> examinationExportDtoList = new ArrayList<>();
         for (ExaminationResult examinationResult : examinationResultList) {

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

@@ -7,6 +7,7 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.TBTask;
 import com.qmth.distributed.print.business.enums.TaskTypeEnum;
+import com.qmth.distributed.print.business.service.CommonService;
 import com.qmth.distributed.print.business.service.ExamDetailService;
 import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.execute.AsyncExaminationExportTemplateService;
@@ -26,6 +27,7 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * <p>
@@ -48,6 +50,8 @@ public class ExamDetailController {
     private AsyncExaminationExportTemplateService asyncExaminationExportTemplateService;
     @Resource
     private ExamDetailService examDetailService;
+    @Resource
+    private CommonService commonService;
 
     @ApiOperation(value = "异步考务数据批量导入接口")
     @RequestMapping(value = "/data_import", method = RequestMethod.POST)
@@ -73,8 +77,9 @@ public class ExamDetailController {
                                        @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
 
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         return ResultUtil.ok(examDetailService.findExaminationBriefPage(schoolId,
-                SystemConstant.convertIdToLong(printPlanId), courseCode, paperNumber, examPlace, examRoom, packageCode, pageNumber, pageSize));
+                SystemConstant.convertIdToLong(printPlanId), courseCode, paperNumber, examPlace, examRoom, packageCode, pageNumber, pageSize,orgIds));
     }
 
     @ApiOperation(value = "考务数据导入-汇总数据查询")
@@ -88,8 +93,9 @@ public class ExamDetailController {
                                      @ApiParam(value = "卷袋号") @RequestParam(required = false) String packageCode) {
 
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         return ResultUtil.ok(examDetailService.findSummarizedData(schoolId,
-                SystemConstant.convertIdToLong(printPlanId), courseCode, paperNumber, examPlace, examRoom, packageCode));
+                SystemConstant.convertIdToLong(printPlanId), courseCode, paperNumber, examPlace, examRoom, packageCode,orgIds));
     }
 
     @ApiOperation(value = "考务数据导入-查看明细")
@@ -150,6 +156,7 @@ public class ExamDetailController {
                            @ApiParam(value = "考点") @RequestParam(required = false) String examPlace,
                            @ApiParam(value = "考场") @RequestParam(required = false) String examRoom,
                            @ApiParam(value = "卷袋号") @RequestParam(required = false) String packageCode) {
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.EXAMINATION_EXPORT);
         map.put("printPlanId",printPlanId);
         map.put("courseCode",courseCode);
@@ -157,6 +164,7 @@ public class ExamDetailController {
         map.put("examPlace",examPlace);
         map.put("examRoom",examRoom);
         map.put("packageCode",packageCode);
+        map.put("orgIds",orgIds);
         asyncExaminationExportTemplateService
                 .exportTask(map);
         TBTask tbTask = Objects.nonNull(map.get(SystemConstant.TASK)) ? (TBTask) map.get(SystemConstant.TASK) : null;