rxswin导入

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -5890,7 +5890,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             if (sheet != null) {
                 StringBuilder headerSb = new StringBuilder();
                 int rowNos = sheet.getLastRowNum();// 得到excel的总记录条数
-                for (int i = 0; i <= rowNos; i++) {// 遍历行
+                for (int i = 0; i <= rowNos; i++) {
                     if (i == 1) {
                         continue;
                     }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -168,16 +169,19 @@ public class ProjectRxswinEOController extends JeroController<ProjectRxswinEO, I
         return projectRxswinEOService.exportXls(request,projectRxswinEO);
     }
 
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+	/**
+	 * 通过excel导入数据
+	 * @param file
+	 * @param cut
+	 * @param version
+	 * @param projectId
+	 * @return
+	 */
+	@ApiOperation(value="导入", notes="导入")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ProjectRxswinEO.class);
+    public Result<?> importExcel(MultipartFile file,String cut,String version,String projectId) {
+		projectRxswinEOService.importExcel(file,cut,version,projectId);
+        return Result.OK("");
     }
 
 	 /**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/RxswinEnum.java

@@ -0,0 +1,38 @@
+package com.jero.modules.project.enums;
+
+/**
+ * 当前状态枚举类
+ */
+public enum RxswinEnum {
+
+    ONE("编号","No."),
+    TWO("主题","Theme"),
+    THREE("RXSWIN","RXSWIN"),
+    FOUR("对应版本","Corresponding version")
+    ;
+
+
+    String nameCn;
+    String nameEn;
+
+    private RxswinEnum(String nameCn,String nameEn) {
+        this.nameCn = nameCn;
+        this.nameEn = nameEn;
+    }
+
+    public String getNameCn() {
+        return nameCn;
+    }
+
+    public void setNameCn(String nameCn) {
+        this.nameCn = nameCn;
+    }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectRxswinEO;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -108,4 +109,6 @@ public interface IProjectRxswinEOService extends IService<ProjectRxswinEO> {
 	ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO);
 
 	void exportTemplate(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request);
+
+	void importExcel(MultipartFile file, String cut, String version, String projectId);
 }