fix 导入节

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseSectionController.java

@@ -3,6 +3,7 @@ package com.zhongzheng.controller.course;
 import java.util.Collections;
 import java.util.List;
 import java.util.Arrays;
+import java.util.Map;
 
 import cn.hutool.core.lang.Validator;
 import com.zhongzheng.common.core.domain.model.LoginUser;
@@ -64,7 +65,6 @@ public class CourseSectionController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:section:list')")
     @GetMapping("/list")
     public TableDataInfo<CourseSectionVo> list(CourseSectionQueryBo bo) {
-        System.out.println(bo);
         startPage();
         List<CourseSectionVo> list = iCourseSectionService.selectSectionList(bo);
         return getDataTable(list);
@@ -119,14 +119,14 @@ public class CourseSectionController extends BaseController {
     @Log(title = "导入节模板", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('system:section:import')")
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    public AjaxResult<Map<String,Object>> importData(MultipartFile file, boolean updateSupport) throws Exception
     {
         ExcelUtil<CourseSectionImport> util = new ExcelUtil<CourseSectionImport>(CourseSectionImport.class);
         List<CourseSectionImport> sectionList = util.importExcel(file.getInputStream());
         Collections.reverse(sectionList);
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String operName = loginUser.getUsername();
-        String message = iCourseSectionService.importSection(sectionList, updateSupport, operName);
+        Map<String,Object> message = iCourseSectionService.importSection(sectionList, updateSupport, operName);
 
         return AjaxResult.success(message);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSectionQueryBo.java

@@ -81,4 +81,6 @@ public class CourseSectionQueryBo extends BaseEntity {
 	/** 科目id */
 	@ApiModelProperty("科目id")
 	private Long subjectId;
+	@ApiModelProperty("导入编号")
+	private Long importNo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseSectionService.java

@@ -13,6 +13,7 @@ import com.zhongzheng.modules.course.vo.CourseSectionVo;
 import java.text.ParseException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课程小节Service接口
@@ -56,5 +57,5 @@ public interface ICourseSectionService extends IService<CourseSection> {
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-	String importSection(List<CourseSectionImport> sectionList, Boolean isUpdateSupport, String operName) throws ParseException;
+	Map<String,Object> importSection(List<CourseSectionImport> sectionList, Boolean isUpdateSupport, String operName) throws ParseException;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionServiceImpl.java

@@ -188,7 +188,7 @@ public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, C
     }
 
     @Override
-    public String importSection(List<CourseSectionImport> sectionList, Boolean isUpdateSupport, String operName) throws ParseException {
+    public Map<String,Object> importSection(List<CourseSectionImport> sectionList, Boolean isUpdateSupport, String operName) throws ParseException {
         if (Validator.isNull(sectionList) || sectionList.size() == 0) {
             throw new CustomException("导入数据不能为空！");
         }
@@ -288,7 +288,10 @@ public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, C
             i++;
 
         }
-        return errorLog;
+        Map<String,Object> rs = new HashMap();
+        rs.put("errorLog",errorLog);
+        rs.put("importNo",importNo);
+        return rs;
     }
 
     @Transactional(rollbackFor = Exception.class)

zhongzheng-system/src/main/resources/mapper/modules/course/CourseSectionMapper.xml

@@ -149,6 +149,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="importNo != null and importNo != ''">
+            AND c.importNo = #{importNo}
+        </if>
         GROUP BY
         c.section_id
         ORDER BY c.section_id DESC
@@ -193,6 +196,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
-
+        <if test="importNo != null and importNo != ''">
+            AND c.importNo = #{importNo}
+        </if>
     </select>
 </mapper>