考务数据导出bug修改

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

@@ -138,7 +138,7 @@
             <if test="packageCode != null and packageCode.length > 0">
                 AND det.package_code = #{packageCode}
             </if>
-            <if test="orgIds != null">
+            <if test="orgIds != null and orgIds.size() > 0">
                 AND b.org_id IN
                 <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
                     #{item}

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

@@ -1,8 +1,6 @@
 package com.qmth.distributed.print.api;
 
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.TBTask;
@@ -27,7 +25,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -54,8 +51,7 @@ public class ExamDetailController {
     private ExamDetailService examDetailService;
     @Resource
     private CommonService commonService;
-
-    @Autowired
+    @Resource
     private ExamStudentService examStudentService;
 
     @ApiOperation(value = "异步考务数据批量导入接口")
@@ -173,7 +169,7 @@ public class ExamDetailController {
                            @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<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.EXAMINATION_EXPORT,SystemConstant.convertIdToLong(printPlanId));
         map.put("printPlanId",printPlanId);
         map.put("courseCode",courseCode);
         map.put("paperNumber",paperNumber);

distributed-print/src/test/java/com/qmth/distributed/print/ServiceTest.java

@@ -80,7 +80,7 @@ public class ServiceTest {
         String mobileNumber = "18903719928";
         Long businessId = 1L;
         Map<String, String> jsonMap = new HashMap<>();
-        jsonMap.put("name", "张三");
+        jsonMap.put("userName", "张三");
         jsonMap.put("courseName", "数学");
         jsonMap.put("paperNumber", "SX001");
         String variableParams = JSON.toJSONString(jsonMap);