新

 package org.jeecg.common.system.base.controller;
 package org.jeecg.common.system.base.controller;
 
 
-import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -29,6 +28,8 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -45,7 +46,6 @@ public class JeecgController<T, S extends IService<T>> {
     protected S service;
     protected S service;
 
 
 
 
-
     @Value("${jeecg.path.upload}")
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
     private String upLoadPath;
     /**
     /**
@@ -217,4 +217,120 @@ public class JeecgController<T, S extends IService<T>> {
         return Result.error("文件导入失败！");
         return Result.error("文件导入失败！");
     }
     }
 
 
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    protected Result<?> importExcel2(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            // 获取上传文件对象
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+
+//            params.setKeyIndex(1);
+            params.setNeedSave(true);
+            try {
+                List<T> list = ExcelImportUtil.importExcel(file.getInputStream(), clazz, params);
+                // 遍历列表，检查并填充空字段
+                for (T data : list) {
+                    // 检查数据库中是否存在相同的记录
+                    T existingData = checkIfExistsInDatabase(data);
+
+                    if (existingData != null) {
+                        // 如果存在相同的记录，则更新该记录的其他字段值
+                        updateExistingData(existingData, data);
+                    } else {
+                        // 如果不存在相同的记录，则新增一条数据到数据库中
+                        service.save(data);
+                    }
+                }
+                //update-begin-author:taoyan date:20190528 for:批量插入数据
+                long start = System.currentTimeMillis();
+
+//                service.saveBatch(list);
+                //400条 saveBatch消耗时间1592毫秒  循环插入消耗时间1947毫秒
+                //1200条  saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
+                log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
+                //update-end-author:taoyan date:20190528 for:批量插入数据
+                return Result.ok("文件导入成功！数据行数：" + list.size());
+            } catch (Exception e) {
+                //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
+                String msg = e.getMessage();
+                log.error(msg, e);
+                if(msg!=null && msg.indexOf("Duplicate entry")>=0){
+//                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); // 手动回滚事务
+                    return Result.error("文件导入失败:有重复数据！");
+                }else{
+                    return Result.error("文件导入失败:" + e.getMessage());
+                }
+                //update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.error("文件导入失败！");
+    }
+
+    private void updateExistingData(T existingData, T data) {
+        try {
+            QueryWrapper<T> queryWrapper= new QueryWrapper<>();
+            // 获取 data 对象的类
+            Class<?> clazz = data.getClass();
+            Field supplierNameField = clazz.getDeclaredField("supplierName");
+            supplierNameField.setAccessible(true); // 设置可访问性，因为字段可能是私有的
+            String supplierName = (String) supplierNameField.get(data);
+            queryWrapper.eq("supplier_name",supplierName);
+
+            // 获取 ht_price 字段的值
+            Field htPriceField = clazz.getDeclaredField("htPrice");
+            htPriceField.setAccessible(true); // 设置可访问性，因为字段可能是私有的
+            BigDecimal htPrice = (BigDecimal) htPriceField.get(data);
+            queryWrapper.eq("ht_price",htPrice);
+            service.update(data,queryWrapper);
+
+//            System.out.println(service.update(existingData,queryWrapper));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    private T checkIfExistsInDatabase(T data) {
+
+        try {
+            QueryWrapper<T> queryWrapper= new QueryWrapper<>();
+            // 获取 data 对象的类
+            Class<?> clazz = data.getClass();
+            Field supplierNameField = clazz.getDeclaredField("supplierName");
+            supplierNameField.setAccessible(true); // 设置可访问性，因为字段可能是私有的
+            String supplierName = (String) supplierNameField.get(data);
+            queryWrapper.eq("supplier_name",supplierName);
+
+            // 获取 ht_price 字段的值
+            Field htPriceField = clazz.getDeclaredField("htPrice");
+            htPriceField.setAccessible(true); // 设置可访问性，因为字段可能是私有的
+            BigDecimal htPrice = (BigDecimal) htPriceField.get(data);
+            queryWrapper.eq("ht_price",htPrice);
+
+            return service.getOne(queryWrapper);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+
+    }
+
+
 }
 }

-org\jeecg\config\mybatis\TenantContext.class
-org\jeecg\config\shiro\filters\ResourceCheckFilter.class
-org\jeecg\common\util\PmsUtil.class
-org\jeecg\common\util\RestDesformUtil.class
-org\jeecg\common\exception\JfException.class
-org\jeecg\common\es\QueryStringBuilder.class
-org\jeecg\common\aspect\annotation\AutoLowApp.class
-org\jeecg\config\shiro\ShiroConfig.class
-org\jeecg\common\exception\JeecgBootExceptionHandler.class
-org\jeecg\config\shiro\ShiroRealm.class
-org\jeecg\common\api\dto\OnlineAuthDTO.class
-org\jeecg\common\constant\ProvinceCityArea.class
-org\jeecg\common\util\FillRuleUtil.class
-org\jeecg\common\system\vo\ComboModel.class
-org\jeecg\common\api\vo\Result.class
-org\jeecg\common\util\MyClassLoader.class
-org\jeecg\common\api\dto\message\TemplateMessageDTO.class
-org\jeecg\common\system\vo\SysPermissionDataRuleModel.class
-org\jeecg\common\exception\JeecgBootException.class
-org\jeecg\config\Swagger2Config$1.class
-org\jeecg\common\util\encryption\EncryptedString.class
-org\jeecg\config\RestTemplateConfig.class
-org\jeecg\common\constant\ServiceNameConstants.class
-org\jeecg\config\shiro\JwtToken.class
-org\jeecg\common\util\PathMatcherUtil$SpringAntMatcher.class
-org\jeecg\config\JeecgCloudCondition.class
-org\jeecg\common\util\CommonUtils.class
-org\jeecg\common\util\SysAnnmentTypeEnum.class
-org\jeecg\common\util\security\entity\SecurityResp.class
-org\jeecg\common\util\DateUtils$4.class
-org\jeecg\common\system\vo\SysCategoryModel.class
-org\jeecg\config\sign\util\BodyReaderHttpServletRequestWrapper.class
-org\jeecg\common\api\dto\message\TemplateDTO.class
-org\jeecg\config\JeeccgBaseConfig.class
-org\jeecg\common\util\security\entity\SecurityReq.class
-org\jeecg\modules\base\service\impl\BaseCommonServiceImpl.class
-org\jeecg\common\api\dto\FileDownDTO.class
-org\jeecg\common\util\DateUtils$1.class
-org\jeecg\common\util\YouBianCodeUtil.class
-org\jeecg\config\sign\interceptor\SignAuthInterceptor.class
-org\jeecg\common\util\DySmsEnum.class
-org\jeecg\common\util\RestUtil.class
-org\jeecg\config\WebMvcConfiguration.class
-org\jeecg\config\thirdapp\ThirdAppTypeConfig.class
-org\jeecg\common\aspect\annotation\PermissionData.class
-org\jeecg\common\util\PathMatcherUtil.class
-org\jeecg\common\aspect\PermissionDataAspect.class
-org\jeecg\config\sign\util\SignUtil.class
-org\jeecg\config\mybatis\MybatisPlusSaasConfig.class
-org\jeecg\common\aspect\AutoLogAspect$1.class
-org\jeecg\common\util\BrowserUtils.class
-org\jeecg\config\thirdapp\ThirdAppTypeItemVo.class
-org\jeecg\common\api\dto\message\MessageDTO.class
-org\jeecg\common\util\UUIDGenerator.class
-org\jeecg\common\system\base\entity\JeecgEntity.class
-org\jeecg\common\util\security\entity\SecuritySignResp.class
-org\jeecg\common\constant\enums\CgformEnum.class
-org\jeecg\common\constant\enums\LowAppAopEnum.class
-org\jeecg\common\constant\enums\ModuleType.class
-org\jeecg\common\util\DateUtils.class
-org\jeecg\common\exception\JeecgBoot401Exception.class
-org\jeecg\config\shiro\filters\JwtFilter.class
-org\jeecg\common\constant\SymbolConstant.class
-org\jeecg\config\oss\OssConfiguration.class
-org\jeecg\common\util\security\AbstractQueryBlackListHandler$QueryTable.class
-org\jeecg\common\util\encryption\AesEncryptUtil.class
-org\jeecg\common\util\ReflectHelper.class
-org\jeecg\common\constant\ProvinceCityArea$Area.class
-org\jeecg\common\system\base\service\JeecgService.class
-org\jeecg\common\util\filter\FileTypeFilter.class
-org\jeecg\common\api\dto\message\BusTemplateMessageDTO.class
-org\jeecg\common\util\dynamic\db\DbTypeUtils.class
-org\jeecg\common\util\DateUtils$3.class
-org\jeecg\config\sign\interceptor\SignAuthConfiguration.class
-org\jeecg\config\vo\Shiro.class
-org\jeecg\common\util\filter\StrAttackFilter.class
-org\jeecg\common\system\vo\DynamicDataSourceModel.class
-org\jeecg\config\AutoPoiConfig.class
-org\jeecg\common\util\HTMLUtils.class
-org\jeecg\config\StaticConfig.class
-org\jeecg\common\constant\VxeSocketConst.class
-org\jeecg\config\AutoPoiDictConfig.class
-org\jeecg\common\aspect\UrlMatchEnum.class
-org\jeecg\common\util\MinioUtil.class
-org\jeecg\common\handler\IFillRuleHandler.class
-org\jeecg\common\system\query\QueryCondition.class
-org\jeecg\common\api\CommonAPI.class
-org\jeecg\modules\base\service\BaseCommonService.class
-org\jeecg\common\util\IpUtils.class
-org\jeecg\common\system\vo\SysDepartModel.class
-org\jeecg\common\util\DateUtils$5.class
-org\jeecg\config\shiro\filters\CustomShiroFilterFactoryBean$MySpringShiroFilter.class
-org\jeecg\common\constant\CommonSendStatus.class
-org\jeecg\common\api\dto\LogDTO.class
-org\jeecg\common\system\util\JeecgDataAutorUtils.class
-org\jeecg\common\system\query\QueryGenerator$1.class
-org\jeecg\common\system\query\QueryGenerator.class
-org\jeecg\common\system\query\QueryRuleEnum.class
-org\jeecg\common\util\PathMatcherUtil$1.class
-org\jeecg\common\constant\WebsocketConst.class
-org\jeecg\common\system\util\JwtUtil.class
-org\jeecg\common\system\vo\DictModel.class
-org\jeecg\common\util\security\SecurityTools.class
-org\jeecg\common\util\DateUtils$2.class
-org\jeecg\common\system\base\service\impl\JeecgServiceImpl.class
-org\jeecg\common\util\Md5Util.class
-org\jeecg\common\util\dynamic\db\DataSourceCachePool.class
-org\jeecg\common\system\base\controller\JeecgController.class
-org\jeecg\common\util\security\entity\MyKeyPair.class
-org\jeecg\common\es\JeecgElasticsearchTemplate.class
-org\jeecg\common\constant\DataBaseConstant.class
-org\jeecg\common\aspect\DictAspect.class
-org\jeecg\common\constant\FillRuleConstant.class
-org\jeecg\common\util\security\AbstractQueryBlackListHandler.class
-org\jeecg\common\system\vo\SysUserCacheInfo.class
-org\jeecg\common\util\ImportExcelUtil.class
-org\jeecg\common\util\BrowserType.class
-org\jeecg\common\util\PathMatcherUtil$Matcher.class
-org\jeecg\common\aspect\annotation\Dict.class
-org\jeecg\common\aspect\AutoLogAspect.class
-org\jeecg\config\Swagger2Config.class
-org\jeecg\config\sign\util\HttpUtils.class
-org\jeecg\config\mybatis\MybatisPlusSaasConfig$1.class
-org\jeecg\common\api\dto\FileUploadDTO.class
-org\jeecg\config\thirdapp\ThirdAppConfig.class
-org\jeecg\common\util\TokenUtils.class
-org\jeecg\common\system\vo\DictQuery.class
-org\jeecg\common\util\DateUtils$7.class
-org\jeecg\common\constant\enums\OperateTypeEnum.class
-org\jeecg\config\shiro\filters\CustomShiroFilterFactoryBean.class
-org\jeecg\common\aspect\annotation\AutoDict.class
-org\jeecg\common\system\query\MatchTypeEnum.class
-org\jeecg\common\util\oss\OssBootUtil.class
-org\jeecg\config\DruidConfig.class
-org\jeecg\common\aspect\annotation\OnlineAuth.class
-org\jeecg\config\DruidConfig$RemoveAdFilter.class
-org\jeecg\common\util\dynamic\db\FreemarkerParseFactory.class
-org\jeecg\common\constant\CommonConstant.class
-org\jeecg\common\util\dynamic\db\DynamicDBUtil.class
-org\jeecg\common\util\oConvertUtils.class
-org\jeecg\common\util\SqlInjectionUtil.class
-org\jeecg\common\util\PasswordUtil.class
-org\jeecg\common\system\vo\DictModelMany.class
-org\jeecg\modules\base\mapper\BaseCommonMapper.class
-org\jeecg\common\util\SpringContextUtils.class
-org\jeecg\common\system\vo\SelectTreeModel.class
-org\jeecg\common\system\vo\LoginUser.class
-org\jeecg\config\mybatis\MybatisInterceptor.class
-org\jeecg\common\constant\enums\RoleIndexConfigEnum.class
-org\jeecg\common\util\security\entity\SecuritySignReq.class
-org\jeecg\common\api\dto\message\BusMessageDTO.class
-org\jeecg\common\aspect\annotation\AutoLog.class
-org\jeecg\common\util\DySmsHelper.class
-org\jeecg\config\WebSocketConfig.class
-org\jeecg\config\CorsFilterCondition.class
-org\jeecg\config\sign\util\BodyReaderHttpServletRequestWrapper$1.class
-org\jeecg\config\oss\MinioConfig.class
-org\jeecg\common\util\DateUtils$6.class

-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\SpringContextUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\ProvinceCityArea.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\MinioUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\SqlInjectionUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\SecurityTools.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\LoginUser.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\filter\FileTypeFilter.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\OnlineAuthDTO.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\sign\util\BodyReaderHttpServletRequestWrapper.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\enums\CgformEnum.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\encryption\AesEncryptUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\JwtToken.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\PathMatcherUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\TenantContext.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecurityResp.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\modules\base\service\BaseCommonService.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysCategoryModel.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\filters\JwtFilter.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\AutoPoiConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\superSearch\QueryRuleEnum.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\RestDesformUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\exception\JeecgBootException.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\StaticConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\ImportExcelUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\DataBaseConstant.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\VxeSocketConst.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\HTMLUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\oss\OssBootUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\TokenUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\AutoLogAspect.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\DictModelMany.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\Dict.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\RestUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\QueryRuleEnum.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\MessageDTO.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\BrowserType.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\enums\OperateTypeEnum.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\service\impl\JeecgServiceImpl.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\OnlineAuth.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\PermissionData.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\JeecgCloudCondition.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\DateUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\oss\MinioConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\sign\interceptor\SignAuthConfiguration.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\PmsUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\WebSocketConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\encryption\EncryptedString.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\DictModel.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\ReflectHelper.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\DruidConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecuritySignReq.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\enums\LowAppAopEnum.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\entity\JeecgEntity.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\es\QueryStringBuilder.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\BusMessageDTO.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SelectTreeModel.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\UrlMatchEnum.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\CommonSendStatus.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\FreemarkerParseFactory.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\AutoLog.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\filters\CustomShiroFilterFactoryBean.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\WebsocketConst.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\DbTypeUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\service\JeecgService.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\superSearch\ObjectParseUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecuritySignResp.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\superSearch\QueryRuleVo.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\SysAnnmentTypeEnum.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\exception\JeecgBoot401Exception.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\LogDTO.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\QueryGenerator.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\modules\base\service\impl\BaseCommonServiceImpl.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\util\JwtUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\PasswordUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\vo\Result.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\CommonConstant.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\QueryCondition.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\controller\JeecgController.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\filters\ResourceCheckFilter.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\ComboModel.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\oss\OssConfiguration.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\DictQuery.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\DynamicDataSourceModel.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\SymbolConstant.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\handler\IFillRuleHandler.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysPermissionDataRuleModel.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\CommonAPI.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\FileUploadDTO.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\vo\Shiro.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\AutoLowApp.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\thirdapp\ThirdAppTypeConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\UUIDGenerator.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\BusTemplateMessageDTO.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\PermissionDataAspect.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\thirdapp\ThirdAppConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\oConvertUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\AutoDict.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\sign\interceptor\SignAuthInterceptor.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\WebMvcConfiguration.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\BrowserUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\YouBianCodeUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\RestTemplateConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\sign\util\HttpUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\DictAspect.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\DynamicDBUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\ShiroRealm.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\es\JeecgElasticsearchTemplate.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\exception\JeecgBootExceptionHandler.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\Md5Util.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\JeecgTenantParser.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\MybatisInterceptor.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\enums\RoleIndexConfigEnum.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecurityReq.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\enums\ModuleType.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\FillRuleUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\MatchTypeEnum.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\CorsFilterCondition.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\MyKeyPair.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\JeeccgBaseConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysDepartModel.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\MyClassLoader.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\DySmsEnum.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\sign\util\SignUtil.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\filter\StrAttackFilter.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\TemplateDTO.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\FileDownDTO.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\Swagger2Config.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\DataSourceCachePool.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\modules\base\mapper\BaseCommonMapper.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\AutoPoiDictConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\AbstractQueryBlackListHandler.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\ShiroConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\IpUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\exception\JfException.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\util\JeecgDataAutorUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\thirdapp\ThirdAppTypeItemVo.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\CommonUtils.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\MybatisPlusSaasConfig.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\TemplateMessageDTO.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysUserCacheInfo.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\DySmsHelper.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\FillRuleConstant.java
-D:\factory-java-master-b7d42f693eb35611b224796871050d3a20065fea\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\ServiceNameConstants.java

@@ -206,7 +206,7 @@ public class TblTradContractController extends JeecgController<TblTradContract,
     */
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, TblTradContract.class);
+        return super.importExcel2(request, response, TblTradContract.class);
     }
     }
 
 
 }
 }

+package org.jeecg.modules.erp.trad.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.erp.trad.entity.TblTradBase;
+import org.jeecg.modules.erp.trad.entity.TblTradContract;
+import org.jeecg.modules.erp.trad.entity.TblTradReturn;
+import org.jeecg.modules.erp.trad.service.ITblTradReturnService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.erp.trad.service.TblTradBaseService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: tbl_trad_return
+ * @Author: jeecg-boot
+ * @Date:   2024-04-26
+ * @Version: V1.0
+ */
+@Api(tags="tbl_trad_return")
+@RestController
+@RequestMapping("/trad/tblTradReturn")
+@Slf4j
+public class TblTradReturnController extends JeecgController<TblTradReturn, ITblTradReturnService> {
+	@Autowired
+	private ITblTradReturnService tblTradReturnService;
+	@Autowired
+	private TblTradBaseService tblTradBaseService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param tblTradReturn
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "tbl_trad_return-分页列表查询")
+	@ApiOperation(value="tbl_trad_return-分页列表查询", notes="tbl_trad_return-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TblTradReturn>> queryPageList(TblTradReturn tblTradReturn,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TblTradReturn> queryWrapper = QueryGenerator.initQueryWrapper(tblTradReturn, req.getParameterMap());
+		Page<TblTradReturn> page = new Page<TblTradReturn>(pageNo, pageSize);
+		IPage<TblTradReturn> pageList = tblTradReturnService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param tblTradReturn
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_return-添加")
+	@ApiOperation(value="tbl_trad_return-添加", notes="tbl_trad_return-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TblTradReturn tblTradReturn) {
+		tblTradReturnService.save(tblTradReturn);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param tblTradReturn
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_return-编辑")
+	@ApiOperation(value="tbl_trad_return-编辑", notes="tbl_trad_return-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TblTradReturn tblTradReturn) {
+		tblTradReturnService.updateById(tblTradReturn);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_return-通过id删除")
+	@ApiOperation(value="tbl_trad_return-通过id删除", notes="tbl_trad_return-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		tblTradReturnService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_return-批量删除")
+	@ApiOperation(value="tbl_trad_return-批量删除", notes="tbl_trad_return-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.tblTradReturnService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "tbl_trad_return-通过id查询")
+	@ApiOperation(value="tbl_trad_return-通过id查询", notes="tbl_trad_return-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TblTradReturn> queryById(@RequestParam(name="id",required=true) String id) {
+		TblTradReturn tblTradReturn = tblTradReturnService.getById(id);
+		if(tblTradReturn==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(tblTradReturn);
+	}
+
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param tblTradReturn
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TblTradReturn tblTradReturn) {
+        return super.exportXls(request, tblTradReturn, TblTradReturn.class, "tbl_trad_return");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel2(request, response, TblTradReturn.class);
+    }
+
+}

+package org.jeecg.modules.erp.trad.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.erp.trad.entity.TblTradSupplier;
+import org.jeecg.modules.erp.trad.service.ITblTradSupplierService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: tbl_trad_supplier
+ * @Author: jeecg-boot
+ * @Date:   2024-04-26
+ * @Version: V1.0
+ */
+@Api(tags="tbl_trad_supplier")
+@RestController
+@RequestMapping("/trad/tblTradSupplier")
+@Slf4j
+public class TblTradSupplierController extends JeecgController<TblTradSupplier, ITblTradSupplierService> {
+	@Autowired
+	private ITblTradSupplierService tblTradSupplierService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param tblTradSupplier
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "tbl_trad_supplier-分页列表查询")
+	@ApiOperation(value="tbl_trad_supplier-分页列表查询", notes="tbl_trad_supplier-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TblTradSupplier>> queryPageList(TblTradSupplier tblTradSupplier,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TblTradSupplier> queryWrapper = QueryGenerator.initQueryWrapper(tblTradSupplier, req.getParameterMap());
+		Page<TblTradSupplier> page = new Page<TblTradSupplier>(pageNo, pageSize);
+		IPage<TblTradSupplier> pageList = tblTradSupplierService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param tblTradSupplier
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_supplier-添加")
+	@ApiOperation(value="tbl_trad_supplier-添加", notes="tbl_trad_supplier-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TblTradSupplier tblTradSupplier) {
+		tblTradSupplierService.save(tblTradSupplier);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param tblTradSupplier
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_supplier-编辑")
+	@ApiOperation(value="tbl_trad_supplier-编辑", notes="tbl_trad_supplier-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TblTradSupplier tblTradSupplier) {
+		tblTradSupplierService.updateById(tblTradSupplier);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_supplier-通过id删除")
+	@ApiOperation(value="tbl_trad_supplier-通过id删除", notes="tbl_trad_supplier-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		tblTradSupplierService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "tbl_trad_supplier-批量删除")
+	@ApiOperation(value="tbl_trad_supplier-批量删除", notes="tbl_trad_supplier-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.tblTradSupplierService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "tbl_trad_supplier-通过id查询")
+	@ApiOperation(value="tbl_trad_supplier-通过id查询", notes="tbl_trad_supplier-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TblTradSupplier> queryById(@RequestParam(name="id",required=true) String id) {
+		TblTradSupplier tblTradSupplier = tblTradSupplierService.getById(id);
+		if(tblTradSupplier==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(tblTradSupplier);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param tblTradSupplier
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TblTradSupplier tblTradSupplier) {
+        return super.exportXls(request, tblTradSupplier, TblTradSupplier.class, "tbl_trad_supplier");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TblTradSupplier.class);
+    }
+
+}

+package org.jeecg.modules.erp.trad.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: tbl_trad_return
+ * @Author: jeecg-boot
+ * @Date:   2024-04-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("tbl_trad_return")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tbl_trad_return对象", description="tbl_trad_return")
+public class TblTradReturn implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+	/**供应商名称*/
+	@Excel(name = "供应商名称", width = 15)
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
+	/**购买日期*/
+	@Excel(name = "购买日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "购买日期")
+    private Date buyTime;
+	/**合同总金额*/
+	@Excel(name = "合同总金额", width = 15)
+    @ApiModelProperty(value = "合同总金额")
+    private BigDecimal htPrice;
+	/**本次付款金额*/
+	@Excel(name = "本次付款金额", width = 15)
+    @ApiModelProperty(value = "本次付款金额")
+    private BigDecimal price;
+	/**本次比例*/
+	@Excel(name = "本次比例", width = 15)
+    @ApiModelProperty(value = "本次比例")
+    private String benBili;
+	/**已付比例*/
+	@Excel(name = "已付比例", width = 15)
+    @ApiModelProperty(value = "已付比例")
+    private String fuBili;
+	/**招标号*/
+	@Excel(name = "招标号", width = 15)
+    @ApiModelProperty(value = "招标号")
+    private String tenderNumber;
+	/**物品名称*/
+	@Excel(name = "物品名称", width = 15)
+    @ApiModelProperty(value = "物品名称")
+    private String name;
+	/**发票号*/
+	@Excel(name = "发票号", width = 15)
+    @ApiModelProperty(value = "发票号")
+    private String fpNumber;
+	/**开票日期*/
+	@Excel(name = "开票日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "开票日期")
+    private Date kaiTime;
+	/**票面金额*/
+	@Excel(name = "票面金额", width = 15)
+    @ApiModelProperty(value = "票面金额")
+    private BigDecimal piaoPrice;
+	/**票面税额*/
+	@Excel(name = "票面税额", width = 15)
+    @ApiModelProperty(value = "票面税额")
+    private String piaoTax;
+	/**价税合计*/
+	@Excel(name = "价税合计", width = 15)
+    @ApiModelProperty(value = "价税合计")
+    private BigDecimal totalPrice;
+	/**发票票种*/
+	@Excel(name = "发票票种", width = 15)
+    @ApiModelProperty(value = "发票票种")
+    private String piaoType;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String notes;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+}

+package org.jeecg.modules.erp.trad.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: tbl_trad_supplier
+ * @Author: jeecg-boot
+ * @Date:   2024-04-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("tbl_trad_supplier")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tbl_trad_supplier对象", description="tbl_trad_supplier")
+public class TblTradSupplier implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private Integer id;
+	/**公司名称*/
+	@Excel(name = "公司名称", width = 15)
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+	/**纳税人识别号*/
+	@Excel(name = "纳税人识别号", width = 15)
+    @ApiModelProperty(value = "纳税人识别号")
+    private String taxpayerNumber;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private String address;
+	/**开户行名称*/
+	@Excel(name = "开户行名称", width = 15)
+    @ApiModelProperty(value = "开户行名称")
+    private String bankName;
+	/**银行联号*/
+	@Excel(name = "银行联号", width = 15)
+    @ApiModelProperty(value = "银行联号")
+    private String bankNumber;
+	/**账号*/
+	@Excel(name = "账号", width = 15)
+    @ApiModelProperty(value = "账号")
+    private String account;
+	/**联系人*/
+	@Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+}

+package org.jeecg.modules.erp.trad.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.erp.trad.entity.TblTradReturn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: tbl_trad_return
+ * @Author: jeecg-boot
+ * @Date:   2024-04-26
+ * @Version: V1.0
+ */
+public interface TblTradReturnMapper extends BaseMapper<TblTradReturn> {
+
+}

+package org.jeecg.modules.erp.trad.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.erp.trad.entity.TblTradSupplier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: tbl_trad_supplier
+ * @Author: jeecg-boot
+ * @Date:   2024-04-26
+ * @Version: V1.0
+ */
+public interface TblTradSupplierMapper extends BaseMapper<TblTradSupplier> {
+
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.erp.trad.mapper.TblTradReturnMapper">
+
+</mapper>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.erp.trad.mapper.TblTradSupplierMapper">
+
+</mapper>

+package org.jeecg.modules.erp.trad.service;
+
+import org.jeecg.modules.erp.trad.entity.TblTradReturn;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: tbl_trad_return
+ * @Author: jeecg-boot
+ * @Date:   2024-04-26
+ * @Version: V1.0
+ */
+public interface ITblTradReturnService extends IService<TblTradReturn> {
+
+}