字典管理修改

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

@@ -19,6 +19,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ServletUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;
@@ -101,10 +102,15 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
         for (int i = 0; i < finalList.size(); i++) {
             LinkedMultiValueMap<Integer, Object> excelMap = finalList.get(i);
             List<Object> basicStudentImportDtoList = excelMap.get(i);
-            List<BasicStudentImportDto> datasource = Collections.singletonList((BasicStudentImportDto) excelMap.get(i));
+
+            assert basicStudentImportDtoList != null;
+            List<BasicStudentImportDto> datasource = basicStudentImportDtoList.stream().map(e -> {
+                BasicStudentImportDto basicStudentImportDto = new BasicStudentImportDto();
+                BeanUtils.copyProperties(e, basicStudentImportDto);
+                return basicStudentImportDto;
+            }).collect(Collectors.toList());
             map.put("dataCount",datasource.size());
-            // TODO: 2021/7/16 校验datasource集合的正确性
-            System.out.println("datasource：\n" + datasource);
+
 
             // 新校区名称集合
             Set<String> newCampusNameSet = datasource.stream().map(BasicStudentImportDto::getCampusName).collect(Collectors.toSet());

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

@@ -682,7 +682,6 @@ public class PrintCommonServiceServiceImpl implements PrintCommonService {
             } else {
                 map = new HashMap<>();
                 TBTask tbTask = tbTaskService.saveTaskCommon(basicAttachment, taskTypeEnum, map, null);
-                map.put(SystemConstant.FILE,file);
                 tbTaskService.save(tbTask);
             }
         } catch (Exception e) {

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

@@ -1181,8 +1181,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     @Transactional
     @Override
     public Map<String, Object> executeImportBasicStudentLogic(Map<String, Object> map) throws Exception {
-        MultipartFile file = (MultipartFile) map.get(SystemConstant.FILE);
-        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(file.getInputStream(), Lists.newArrayList(BasicStudentImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
+        InputStream inputStream = (InputStream) map.get("inputStream");
+        System.out.println(inputStream);
+        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(BasicStudentImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
             List<ExcelError> excelErrorTemp = new ArrayList<>();
             Map<String,String> checkMap = new HashMap<>();
             for (int i = 0; i < finalExcelList.size(); i++) {
@@ -1223,8 +1224,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     @Transactional
     @Override
     public Map<String, Object> executeImportBasicCourseLogic(Map<String, Object> map) throws Exception {
-        MultipartFile file = (MultipartFile) map.get(SystemConstant.FILE);
-        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(file.getInputStream(), Lists.newArrayList(BasicCourseImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
+
+        InputStream inputStream = (InputStream) map.get("inputStream");
+        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(BasicCourseImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
             List<ExcelError> excelErrorTemp = new ArrayList<>();
             Map<String,String> checkMap = new HashMap<>();
             for (int i = 0; i < finalExcelList.size(); i++) {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicCourseServiceImpl.java

@@ -22,12 +22,14 @@ import com.qmth.teachcloud.common.service.BasicUserCourseService;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ServletUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -164,7 +166,12 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
         for (int i = 0; i < finalList.size(); i++) {
             LinkedMultiValueMap<Integer, Object> excelMap = finalList.get(i);
             List<Object> basicCourseImportDtoList = excelMap.get(i);
-            List<BasicCourseImportDto> datasource = Collections.singletonList((BasicCourseImportDto) excelMap.get(i));
+            assert basicCourseImportDtoList != null;
+            List<BasicCourseImportDto> datasource = basicCourseImportDtoList.stream().map(e -> {
+                BasicCourseImportDto basicStudentImportDto = new BasicCourseImportDto();
+                BeanUtils.copyProperties(e, basicStudentImportDto);
+                return basicStudentImportDto;
+            }).collect(Collectors.toList());
             // TODO: 2021/7/16 校验datasource集合的正确性
             map.put("dataCount", datasource.size());
             System.out.println("datasource：\n" + datasource);