From 563966210b041d0223ab004a3063029bf0c5378a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 二月 2025 09:20:45 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
index 2ec6aff..3943389 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
@@ -5,6 +5,7 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.dao.business.vo.PlatformJobExportVo;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -15,12 +16,15 @@
import com.doumee.service.business.PlatformJobService;
import com.doumee.service.business.third.WmsService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.mchange.v2.beans.BeansUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -100,7 +104,19 @@
platformJob.setJobForm(Constants.ZERO);
}
}
- ExcelExporter.build(PlatformJob.class).export(platformJobList, "瀹夋嘲鐗╂祦浣滀笟浠诲姟", response);
+ if(Constants.equalsInteger(pageWrap.getModel().getJobType(),1)){
+ List<PlatformJobExportVo> exportVoList =new ArrayList<>();
+ if(platformJobList!=null){
+ for(PlatformJob job : platformJobList){
+ PlatformJobExportVo t = new PlatformJobExportVo();
+ BeanUtils.copyProperties(job,t);
+ exportVoList.add(t);
+ }
+ ExcelExporter.build(PlatformJobExportVo.class).export(exportVoList, "棰勭害鍏ュ洯浣滀笟璁板綍", response);
+ }
+ }else{
+ ExcelExporter.build(PlatformJob.class).export(platformJobList, "瀹夋嘲鐗╂祦浣滀笟浠诲姟", response);
+ }
}
@ApiOperation("鏍规嵁ID鏌ヨ")
--
Gitblit v1.9.3