From 059bbed2cea79771682c42706eba9dbad0e02b5d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 29 Aug 2023 11:43:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectRxswinEOController.java |  3 +-
 .../impl/ProjectRxswinEOServiceImpl.java      | 45 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java
index 432eb0e1d..b880c9052 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java
@@ -163,8 +163,7 @@ public class ProjectRxswinEOController extends JeroController<ProjectRxswinEO, I
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO) {
-		projectRxswinEOService.exportXls(request,projectRxswinEO);
-        return super.exportXls(request, projectRxswinEO, ProjectRxswinEO.class, "rxswin表");
+        return projectRxswinEOService.exportXls(request,projectRxswinEO);
     }
 
     /**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java
index 078e1f7c8..b4b58a459 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java
@@ -13,18 +13,23 @@ import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
 import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectRxswinEO;
+import com.jero.modules.project.entity.ProjectRxswinEOEn;
 import com.jero.modules.project.enums.StatusEnum;
 import com.jero.modules.project.mapper.ProjectRxswinEOMapper;
 import com.jero.modules.project.service.IProjectRxswinEOService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.Collator;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
@@ -396,29 +401,23 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
 
 		// Step.3 AutoPoi 导出Excel
 		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-//		if (CutEnum.CN.getValue().equals(projectRxswinEO.getCut())) {
-//			List<OtaExportCnVO> dataList = new ArrayList<>();
-//			for (ProjectRxswinEO projectRxswinEOTEmp : exportList) {
-//				OtaExportCnVO otaExportCnVO = new OtaExportCnVO();
-//				BeanUtils.copyProperties(projectRxswinEOTEmp, otaExportCnVO);
-//				dataList.add(otaExportCnVO);
-//			}
-//			mv.addObject(NormalExcelConstants.CLASS, OtaExportCnVO.class);
-//			mv.addObject(NormalExcelConstants.DATA_LIST, dataList);
-//			ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN");
-//			mv.addObject(NormalExcelConstants.PARAMS, exportParams);
-//		} else {
-//			List<OtaExportEnVO> dataList = new ArrayList<>();
-//			for (OtaManageApplyEO manageApplyEO : exportList) {
-//				OtaExportEnVO otaExportEnVO = new OtaExportEnVO();
-//				BeanUtils.copyProperties(manageApplyEO, otaExportEnVO);
-//				dataList.add(otaExportEnVO);
-//			}
-//			mv.addObject(NormalExcelConstants.CLASS, OtaExportEnVO.class);
-//			mv.addObject(NormalExcelConstants.DATA_LIST, dataList);
-//			ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN");
-//			mv.addObject(NormalExcelConstants.PARAMS, exportParams);
-//		}
+		if (CutEnum.CN.getValue().equals(projectRxswinEO.getCut())) {
+			mv.addObject(NormalExcelConstants.CLASS, ProjectRxswinEO.class);
+			mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+			ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN");
+			mv.addObject(NormalExcelConstants.PARAMS, exportParams);
+		} else {
+			List<ProjectRxswinEOEn> dataList = new ArrayList<>();
+			for (ProjectRxswinEO projectRxswinEOTemp : exportList) {
+				ProjectRxswinEOEn projectRxswinEOEn = new ProjectRxswinEOEn();
+				BeanUtils.copyProperties(projectRxswinEOTemp, projectRxswinEOEn);
+				dataList.add(projectRxswinEOEn);
+			}
+			mv.addObject(NormalExcelConstants.CLASS, ProjectRxswinEOEn.class);
+			mv.addObject(NormalExcelConstants.DATA_LIST, dataList);
+			ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN");
+			mv.addObject(NormalExcelConstants.PARAMS, exportParams);
+		}
 		return mv;
 	}