excel导出优化

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -131,10 +131,10 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
     @ApiOperation(value="预装箱单VO查询", notes="预装箱单VO查询")
     @GetMapping(value = "/list2")
     public Result<IPage<SyPreAssembledPackingListVo>> queryPageList2(SyPreAssembledPackingListVo syPreAssembledPackingListVo,
-                                                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                                      String stratDate,
                                                                      String endDate,
+                                                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                                      HttpServletRequest req) {
         //System.out.println("当前登录用户:"+((LoginUser)SecurityUtils.getSubject().getPrincipal()).getRealname());
         QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
@@ -755,25 +755,60 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
     @AutoLog(value = "导出")
     @ApiOperation(value="导出", notes="导出")
     @RequestMapping(value = "/exportXls")
-    public Result<SyPreAssembledPackingList> exportXls3(HttpServletRequest request,HttpServletResponse response,String id,String status) {
+    public Result<SyPreAssembledPackingList> exportXls3(HttpServletRequest request,HttpServletResponse response,SyPreAssembledPackingListVo syPreAssembledPackingListVo,
+                                                        String stratDate,
+                                                        String endDate,
+                                                        String status) {
         SyPreAssembledPackingList syPreAssembledPackingList=new SyPreAssembledPackingList();
-        if(oConvertUtils.isNotEmpty(id)){
-            syPreAssembledPackingList.setId(id);
+        QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
+        queryWrapper.eq("a.del_flag","0");//默认查询未删除
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
+            queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
+            queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
+            queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
+            queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
+            queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
+            queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
+        }
+        // 小po 分销点
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
+            queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
+            queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+        }
+        //预发货日期
+        if(oConvertUtils.isNotEmpty(stratDate)){//起始
+            queryWrapper.ge("b.hod",stratDate);
+        }
+        if(oConvertUtils.isNotEmpty(endDate)){//结束
+            queryWrapper.le("b.hod",endDate);
         }
+        Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, 10000);
         Result result=new Result();
         try{
-            QueryWrapper<SyPreAssembledPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingList, request.getParameterMap());
-            queryWrapper.eq("del_flag","0");
-            queryWrapper.orderByDesc(	"create_time");//创建时间倒序
-            List<SyPreAssembledPackingList> syPreAssembledPackingListList = syPreAssembledPackingListService.list(queryWrapper);
-            if(syPreAssembledPackingListList.size()==0){
+         //   QueryWrapper<SyPreAssembledPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingList, request.getParameterMap());
+          //  queryWrapper.eq("del_flag","0");
+           // queryWrapper.orderByDesc(	"create_time");//创建时间倒序
+            List<SyPreAssembledPackingListVo> pageLists = syPreAssembledPackingListService.selectPage(page, queryWrapper).getRecords();
+            if(pageLists.size()==0){
                 result.setResult(null);
                 result.setMessage("导出失败！没有查询到数据");
                 result.setSuccess(false);
                 return result;
             }
             List<SyPreAssembledPackingList> temps=new ArrayList<>();
-            for (SyPreAssembledPackingList temp : syPreAssembledPackingListList) {
+            for (SyPreAssembledPackingListVo temp : pageLists) {
                 QueryWrapper<SyPreAssembledPackingList> queryWrapper1 = new QueryWrapper<SyPreAssembledPackingList>();
                 queryWrapper1.eq("id",temp.getId()).eq("del_flag",0);//预装箱单主表id
                 SyPreAssembledPackingList preAssembledPackingList=syPreAssembledPackingListService.queryById(queryWrapper1);//已筛选删除状态
@@ -784,7 +819,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 temps.add(preAssembledPackingList);
             }
             String load="D:\\单证模板\\test2.xlsx";
-            if(status.equals("1")){
+            if(status!=null&&status.equals("1")){
                 load="D:\\单证模板\\预装箱单成衣.xlsx";
             }
             int count = temps.size();//分几条sheet
@@ -857,7 +892,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                     strs+=size.getSize()+",";
                 }
                 String[] params;
-                if(name.equals("1")){
+                if(name!=null&&name.equals("1")){
                     params=("序号,账套号,成衣工厂,H/D,PO,款号,订单号,UNIT PRICE(单价),分销点,ITEMCODE,PREPACK SKU,启始箱号,结束箱号," +
                             "颜色(中英文),配码,"+strs+"件数/每箱,箱数,总件数,外箱长度,外箱宽度,外箱高度,总体积,外箱净重,总净重," +
                             "外箱毛重,总毛重,NN.W,总价,业务员,业务部门,采购委外订单号,主表id,子表id").split(",");
@@ -888,7 +923,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 }
                 List<SizeTable> sizes=list.get(i).getSizeTables();
                 SyPreAssembledPackingListItem itemN=list.get(0);
-                if(name.equals("1")){
+                if(name!=null&&name.equals("1")){
                     params=list.get(i).toString3().replace("null","").split(",");
                     for (int y=0;y<params.length;y++){
                         Cell cell = row.createCell(y);//横向

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -552,23 +552,36 @@ public class SyPackingListFabricController {
 		 return result;
 	 }
 
+
 	 @AutoLog(value = "导出测试")
 	 @ApiOperation(value="导出测试", notes="导出测试")
 	 @RequestMapping(value = "/exportXls")
-	 public Result<SyPackingListFabric> exportXls(HttpServletRequest request,HttpServletResponse response,String id) {
+	 public Result<SyPackingListFabric> exportXls(HttpServletRequest request,HttpServletResponse response,SyPackingListFabric syPackingListFabric) {
+		 System.out.println("访问接口");
 		 long startTime = System.currentTimeMillis();
 		 /*要计算的程序部分*/
-		 SyPackingListFabric syPackingListFabric=new SyPackingListFabric();
+		/* SyPackingListFabric syPackingListFabric=new SyPackingListFabric();
 		 if(oConvertUtils.isNotEmpty(id)){
 			 syPackingListFabric.setId(id);
-		 }
+		 }*/
 		 Result result=new Result();
 		 try{
-			 QueryWrapper<SyPackingListFabric> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListFabric, request.getParameterMap());
-			 queryWrapper.eq("del_flag","0");
-			 queryWrapper.last("limit 100");//最多100条数据，再多就太慢了
-			 queryWrapper.orderByDesc(	"create_time");//创建时间倒序
-			 List<SyPackingListFabric> packingListFabrics = syPackingListFabricService.list(queryWrapper);
+			 QueryWrapper<SyPackingListFabric> queryWrapper =  new QueryWrapper<>(); //QueryGenerator.initQueryWrapper(syPackingListFabric, request.getParameterMap());
+			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getOrderNumber())){
+				 queryWrapper.like("a.order_number",syPackingListFabric.getOrderNumber());//订单号
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getContainerNumber())){
+				 queryWrapper.like("a.container_Number",syPackingListFabric.getContainerNumber());//集装箱号
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getDocumentNo())){
+				 queryWrapper.like("a.document_No",syPackingListFabric.getDocumentNo());//单据号
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getExportInvoiceNo())){
+				 queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo());//外销发票号
+			 }
+			 queryWrapper.eq("a.del_flag","0");
+			 Page<SyPackingListFabric> page = new Page<SyPackingListFabric>(1, 10000);
+			 List<SyPackingListFabric> packingListFabrics = syPackingListFabricService.selectPage(page, queryWrapper).getRecords();
 			 if(packingListFabrics.size()==0){
 				 result.setResult(null);
 				 result.setMessage("导出失败！没有查询到数据");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -692,4 +692,4 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			e.printStackTrace();
 		}
 	}
-}
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -101,7 +101,7 @@ public class SyPackingListTailoringController {
 								   String stratDate,
 								   String endDate,
 								   HttpServletRequest req) {
-		QueryWrapper<SyPackingListTailoringVo> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListTailoringVo, req.getParameterMap());
+		QueryWrapper<SyPackingListTailoringVo> queryWrapper = new QueryWrapper<>();
 		Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(pageNo, pageSize);
 		queryWrapper.eq("a.del_flag","0");
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrderNumber())){
@@ -459,7 +459,7 @@ public class SyPackingListTailoringController {
 /*	*//**
 	 * 通过id查询
      *
-	 * @param id
+	 * //@param id
 	 * @return
 	 *//*
 	@AutoLog(value = "装箱单子表-通过主表ID查询")
@@ -473,26 +473,54 @@ public class SyPackingListTailoringController {
 	 @AutoLog(value = "导出测试")
 	 @ApiOperation(value="导出测试", notes="导出测试")
 	 @RequestMapping(value = "/exportXls")
-	 public Result<SyPackingListTailoring> exportXls3(HttpServletRequest request,HttpServletResponse response,String id) {
-		 SyPackingListTailoring syPackingListTailoring=new SyPackingListTailoring();
-		 if(oConvertUtils.isNotEmpty(id)){
-			 syPackingListTailoring.setId(id);
+	 public Result<SyPackingListTailoring> exportXls3(HttpServletRequest request,HttpServletResponse response,
+													  SyPackingListTailoringVo syPackingListTailoringVo,
+													  String stratDate,
+													  String endDate) {
+
+		 Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(1, 10000);
+		 QueryWrapper queryWrapper = new QueryWrapper<>();
+		 queryWrapper.eq("a.del_flag","0");
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrderNumber())){
+			 queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber());//查询订单号
+		 }
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getGarmentFactory())){
+			 queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory());//查询成衣工厂
+		 }
+		 //款号	分销点	小po	预托书号
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getItemNumber())){
+			 queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber());//款号
+		 }
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDistributionPoint())){
+			 queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint());//分销点
+		 }
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getSmallPo())){
+			 queryWrapper.like("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
+		 }
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
+			 queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
+		 }
+		 if(oConvertUtils.isNotEmpty(stratDate)){
+			 queryWrapper.ge("b.hod",stratDate);//起始日期
+		 }
+		 if(oConvertUtils.isNotEmpty(endDate)){
+			 queryWrapper.le("b.hod",endDate);//结束日期
 		 }
 		 Result result=new Result();
 		 try{
-			 QueryWrapper<SyPackingListTailoring> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListTailoring, request.getParameterMap());
-			 queryWrapper.eq("del_flag","0");
-			 queryWrapper.orderByDesc(	"create_time");//创建时间倒序
-			 List<SyPackingListTailoring> syPackingListTailorings = syPackingListTailoringService.list(queryWrapper);
-			 System.out.println("syPackingListTailorings的长度为:\t"+syPackingListTailorings.size());
-			 if(syPackingListTailorings.size()==0){
+			// QueryWrapper<SyPackingListTailoring> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListTailoring, request.getParameterMap());
+			 //queryWrapper.eq("del_flag","0");
+			// queryWrapper.orderByDesc(	"create_time");//创建时间倒序
+			 List<SyPackingListTailoringVo> syPackingListTailoringVos = syPackingListTailoringService.selectList(page,queryWrapper).getRecords();
+			 System.out.println("syPackingListTailoringVos的长度为:\t"+syPackingListTailoringVos.size());
+			 if(syPackingListTailoringVos.size()==0){
 				 result.setResult(null);
 				 result.setMessage("导出失败！没有查询到数据");
 				 result.setSuccess(false);
 				 return result;
 			 }
 			 List<SyPackingListTailoring> temps=new ArrayList<>();
-			 for (SyPackingListTailoring temp : syPackingListTailorings) {
+			 for (SyPackingListTailoringVo temp : syPackingListTailoringVos) {
 				 QueryWrapper<SyPreAssembledPackingList> queryWrapper1 = new QueryWrapper<SyPreAssembledPackingList>();
 				 queryWrapper1.eq("id",temp.getId()).eq("del_flag",0);//预装箱单主表id
 				 SyPackingListTailoring entity=syPackingListTailoringService.queryId(temp.getId());//已筛选删除状态
@@ -680,13 +708,10 @@ public class SyPackingListTailoringController {
 					 	//System.out.print(cell.getStringCellValue()+"\t");
 					 }
 				 }
-				 System.out.println("\nx为\t"+x);
 				 x=x<2?++x:x;//跨行
-				 System.out.println("3元运算符\t"+(x<2));
-				 System.out.println("x为\t"+x);
 				 if(x>3){
-					 SyPackingListTailoringItem item=
-							 new SyPackingListTailoringItem(str.substring(0,str.length()-1).split(","),
+					 SyPackingListTailoringItem item=new SyPackingListTailoringItem(
+							 		str.substring(0,str.length()-1).split(","),
 									 str1.substring(0,str1.length()-1).split(","),
 									 str2.substring(0,str2.length()-1).split(","));
 				 	items.add(item);
@@ -697,9 +722,7 @@ public class SyPackingListTailoringController {
 			 }
 			 main.setSyPackingListTailoringItemList(items);
 			 mains.add(main);
-			 System.out.println("mains\n"+mains);
 		 }
-		 System.out.println("mains\t"+mains);
 		 syPackingListTailoringService.excelAdd(mains);//新增
 	 }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoring.java

@@ -157,13 +157,12 @@ public class SyPackingListTailoring implements Serializable {
 	@TableField(exist = false)
 	@ApiModelProperty(value = "二维表格")
 	private List<SizeTable> sizeTables;
-	/*装箱单子表*/
+	/**装箱单子表*/
 	@TableField(exist = false)
 	@ExcelCollection(name="装箱单子表")
 	@ApiModelProperty(value = "装箱单子表")
 	private List<SyPackingListTailoringItem> syPackingListTailoringItemList;
 
-
 	/**申报要素ID*/
 	@ApiModelProperty(value = "申报要素ID")
 	private String elementsId;
@@ -220,4 +219,4 @@ public class SyPackingListTailoring implements Serializable {
 		elementsId=params[9];
 		syPreAssembledPackingListId=params[10];
 	}
-}
+}