caozixuan 3 年之前
父节点
当前提交
a0dfb34211

+ 10 - 0
distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -752,5 +752,15 @@ public class ExamTaskController {
         return ResultUtil.ok((Object) examTaskService.findCardTitle(SystemConstant.convertIdToLong(cardRuleId)));
     }
 
+
+    @ApiOperation(value = "命题任务-审批-获取试卷审批表数据")
+    @RequestMapping(value = "/find_approve_form_json", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result findApproveFormJson(@ApiParam(value = "题卡规则id", required = true) @RequestParam String examTaskId) {
+        return ResultUtil.ok((Object) examTaskService.findExamTaskApprovalForm(SystemConstant.convertIdToLong(examTaskId)));
+    }
+
+
+
 }
 

+ 8 - 6
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicClazzServiceImpl.java

@@ -218,19 +218,21 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
 
     @Override
     public String findClazzNamesByClazzIds(String clazzIds, String separator) {
-        String[] strArr;
-        if (SystemConstant.strNotNull(separator)){
-            strArr = clazzIds.split(separator);
-        }else {
-            strArr = clazzIds.split(",");
+        if (!SystemConstant.strNotNull(separator)) {
+            separator = ",";
         }
+        String[] strArr;
+        strArr = clazzIds.split(separator);
         Set<Long> clazzIdSet = Arrays.stream(strArr).map(SystemConstant::convertIdToLong).collect(Collectors.toSet());
         List<String> clazzNameList = this.findClazzNamesByClazzIdSet(clazzIdSet);
-        return String.join(separator,clazzNameList);
+        return String.join(separator, clazzNameList);
     }
 
     @Override
     public String findClazzNamesByClazzIds(List<Long> clazzIdList, String separator) {
+        if (!SystemConstant.strNotNull(separator)) {
+            separator = ",";
+        }
         Set<Long> clazzIdSet = new HashSet<>(clazzIdList);
         List<String> clazzNameList = this.findClazzNamesByClazzIdSet(clazzIdSet);
         return String.join(separator,clazzNameList);