From 8f551c2f2c8acfb098ac2e180b2120f4fd1e593f Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 16 Aug 2023 19:54:15 +0800
Subject: [PATCH] =?UTF-8?q?updates=20=E5=A2=9E=E5=8A=A0=E9=80=89=E4=B8=ADI?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/yangliu/codegenerate/Main.java  |  6 +++---
 src/main/resources/yangliu/XXXEntityQueryVO.javai |  2 ++
 src/main/resources/yangliu/XXXServiceImpl.javai   | 10 ++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/yangliu/codegenerate/Main.java b/src/main/java/org/yangliu/codegenerate/Main.java
index 8cf7fa9..621125c 100644
--- a/src/main/java/org/yangliu/codegenerate/Main.java
+++ b/src/main/java/org/yangliu/codegenerate/Main.java
@@ -68,9 +68,9 @@ public class Main {
         String user = "enjoy";
         String password = "Nomi1234";
         //2.选择表配置
-        String table= "oqc_sampling_plan";
-        String entityName="OqcSamplingPlan";//实体类
-        String description = "抽样方案";//备注
+        String table= "oqc_nspection_level_cl";
+        String entityName="OqcNspectionLevelCl";//实体类
+        String description = "检验水平-样本代字";//备注
         String primaryKeyField = "id";//主键
         List<TableEntityVo> tableEntityVoList = printTableStructure(driver, url, user, password, table);
         //3.生成
diff --git a/src/main/resources/yangliu/XXXEntityQueryVO.javai b/src/main/resources/yangliu/XXXEntityQueryVO.javai
index 48c44dd..8e4cae1 100644
--- a/src/main/resources/yangliu/XXXEntityQueryVO.javai
+++ b/src/main/resources/yangliu/XXXEntityQueryVO.javai
@@ -45,4 +45,6 @@ public class Query${entityName}VO implements Serializable{
     </#if>
 	private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
 	</#list>
+	@ApiModelProperty(value = "批量选择参数")
+	private String ids;
 }
diff --git a/src/main/resources/yangliu/XXXServiceImpl.javai b/src/main/resources/yangliu/XXXServiceImpl.javai
index bf4b0db..c8af2dc 100644
--- a/src/main/resources/yangliu/XXXServiceImpl.javai
+++ b/src/main/resources/yangliu/XXXServiceImpl.javai
@@ -14,14 +14,16 @@ import com.enjoy.common.core.web.page.TableDataInfo;
 import com.github.pagehelper.PageInfo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import ${bussiPackage}.${entityPackage}.${entityName};
 import ${bussiPackage}.dto.${entityName}DTO;
 import ${bussiPackage}.vo.Query${entityName}VO;
@@ -161,6 +163,10 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
     public void export(HttpServletResponse response, Query${entityName}VO query${entityName}VO){
         List<${entityName}Excel> list=new ArrayList();
         QueryWrapper<${entityName}> queryWrapper=new QueryWrapper();
+        //根据选中项导出
+        if(StringUtils.isNotBlank(query${entityName}VO.getIds())){
+            queryWrapper.in("id", Arrays.asList(query${entityName}VO.getIds().split(",")));
+        }
         List<${entityName}> dbEntityList = this.list(queryWrapper);
         if (CollectionUtil.isNotEmpty(dbEntityList)) {
             dbEntityList.stream().forEach(entity->{