fix bug

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

@@ -385,7 +385,17 @@ public class SysController {
                         QueryWrapper<SysOrg> sysOrgQueryWrapper = new QueryWrapper<>();
                         sysOrgQueryWrapper.lambda().in(SysOrg::getId, orgIdSet);
                         List<SysOrg> sysOrgList = sysOrgService.list(sysOrgQueryWrapper);
-                        dictionaryResultList = sysOrgList.stream().map(e -> {
+                        List<SysOrg> newSysOrgList = new ArrayList<>();
+                        newSysOrgList.addAll(sysOrgList);
+                        for (SysOrg s : sysOrgList) {
+                            if (s.getType() == OrgTypeEnum.SCHOOL) {
+                                newSysOrgList.addAll(sysOrgService.findByConnectByRootOrgId(s.getId()));
+                            } else if (s.getType() == OrgTypeEnum.TEACHING_ROOM || s.getType() == OrgTypeEnum.FACULTY || s.getType() == OrgTypeEnum.PRINTING_HOUSE) {
+                                newSysOrgList.addAll(sysOrgService.findByConnectByParentId(s.getId(), true, false));
+                            }
+                        }
+                        newSysOrgList = newSysOrgList.stream().filter(s -> s.getType() == OrgTypeEnum.COLLEGE).collect(Collectors.toList());
+                        dictionaryResultList = newSysOrgList.stream().map(e -> {
                             DictionaryResult dictionaryResult = new DictionaryResult();
                             dictionaryResult.setId(e.getId());
                             dictionaryResult.setCode(e.getCode());

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

@@ -80,7 +80,7 @@ public class TSyncExamStudentScoreController {
     @ApiResponses({@ApiResponse(code = 200, message = "成绩查询信息", response = TSyncExamStudentScoreResult.class)})
     @RequestMapping(value = "/score/list", method = RequestMethod.POST)
     public Result list(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
-                       @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
+                       @ApiParam(value = "学院id", required = true) @RequestParam String orgId,
                        @ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
                        @ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
                        @ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode,
@@ -93,7 +93,7 @@ public class TSyncExamStudentScoreController {
     @ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
     @RequestMapping(value = "/score/export", method = RequestMethod.POST)
     public Result export(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
-                         @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
+                         @ApiParam(value = "学院id", required = true) @RequestParam String orgId,
                          @ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
                          @ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
                          @ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode) {
@@ -103,7 +103,8 @@ public class TSyncExamStudentScoreController {
     @ApiOperation(value = "成绩查询同步")
     @ApiResponses({@ApiResponse(code = 200, message = "同步异步任务信息", response = TBSyncTask.class)})
     @RequestMapping(value = "/score/sync", method = RequestMethod.POST)
-    public Result sync(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId) {
+    public Result sync(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
+                       @ApiParam(value = "学院id", required = true) @RequestParam String orgId) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<ExamPrintPlan>();
         examPrintPlanQueryWrapper.select(" DISTINCT third_relate_id ").eq("school_id", sysUser.getSchoolId())
@@ -145,7 +146,7 @@ public class TSyncExamStudentScoreController {
     @ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
     @RequestMapping(value = "/score/batch_download", method = RequestMethod.POST)
     public Result batchDownload(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
-                                @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
+                                @ApiParam(value = "学院id", required = true) @RequestParam String orgId,
                                 @ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
                                 @ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
                                 @ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode) {