出运明细查询条件

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -106,7 +106,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 		try {
 			QueryWrapper<SyLetterDeposit> queryWrapper = new QueryWrapper<SyLetterDeposit>();
 			Page<SyLetterDeposit> page = new Page<SyLetterDeposit>(pageNo, pageSize);
-			page.setSearchCount(false);//不查询总数
+			page.setSearchCount(true);//不查询总数
 			//客户简称
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getClientAbbreviation())){
 				queryWrapper.like("b.client_abbreviation",syLetterDeposit.getClientAbbreviation().trim());
@@ -121,7 +121,11 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 				QueryWrapper<SyLetterDepositItem> queryWrapper1 = new QueryWrapper<SyLetterDepositItem>();
 				queryWrapper1.eq("small_po",syLetterDeposit.getSmallPo().trim()).eq("del_flag",0);;
 				List<SyLetterDepositItem> list = syLetterDepositItemService.list(queryWrapper1);
-				queryWrapper.eq("a.id",list.get(0).getSyLetterDepositId());
+				if(list.size() == 0){
+					queryWrapper.eq("a.id","wushuju");
+				}else{
+					queryWrapper.in("a.id",list.get(0).getSyLetterDepositId());
+				}
 			}
 			//款号
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getItemNumber())){
@@ -129,7 +133,12 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 				QueryWrapper<SyLetterDepositItem> queryWrapper1 = new QueryWrapper<SyLetterDepositItem>();
 				queryWrapper1.eq("Item_Number",syLetterDeposit.getItemNumber().trim()).eq("del_flag",0);;
 				List<SyLetterDepositItem> list = syLetterDepositItemService.list(queryWrapper1);
-				queryWrapper.eq("a.id",list.get(0).getSyLetterDepositId());
+				if(list.size() == 0){
+					queryWrapper.eq("a.id","wushuju");
+				}else{
+					queryWrapper.in("a.id",list.get(0).getSyLetterDepositId());
+				}
+
 			}
 			//预托书号
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getDepositaryReceiptNo())){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/SyLetterDepositMapper.java

@@ -23,6 +23,7 @@ public interface SyLetterDepositMapper extends BaseMapper<SyLetterDeposit> {
     //查询预托书分页列表
     long getCount();
     //查询预托书分页列表
+    List<String> querySyLetterDeposit2(@Param("ew") QueryWrapper<SyLetterDeposit> queryWrapper);
     List<String> querySyLetterDeposit2(IPage<SyLetterDeposit> page, @Param("ew") QueryWrapper<SyLetterDeposit> queryWrapper);
     //查询预托书分页列表
     IPage<SyLetterDeposit> querySyLetterDeposit(IPage<SyLetterDeposit> page, @Param("ew") QueryWrapper<SyLetterDeposit> queryWrapper);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/impl/SyLetterDepositServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.documents.letterDeposit.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.hibernate.annotations.Source;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit;
@@ -63,18 +64,24 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
      */
     @Override
     public IPage<SyLetterDeposit> querySyLetterDeposit(IPage<SyLetterDeposit> page, QueryWrapper<SyLetterDeposit> queryWrapper) {
-        page.setTotal(syLetterDepositMapper.getCount());
-        List<String> ids=syLetterDepositMapper.querySyLetterDeposit2(page, queryWrapper);
+//        page.setTotal(syLetterDepositMapper.getCount());
+//        List<String> ids=syLetterDepositMapper.querySyLetterDeposit2(page, queryWrapper);
+        List<String> ids=syLetterDepositMapper.querySyLetterDeposit2(queryWrapper);
         queryWrapper.groupBy("b.groupid");
         if (ids.size()>0){
             queryWrapper.in("a.id",ids);
         }
-        long current=page.getCurrent();
-        page.setCurrent(1);
-        page.setSize(page.getSize());
-        IPage<SyLetterDeposit> page1=syLetterDepositMapper.querySyLetterDeposit(page, queryWrapper);
-        page1.setCurrent(current);
-        return page1;
+//        long current=page.getCurrent();
+//        page.setCurrent(1);
+//        page.setSize(page.getSize());
+
+//        Page<SyLetterDeposit> page1 = new Page<SyLetterDeposit>(page.getCurrent(), page.getSize());
+
+        IPage<SyLetterDeposit> pageList=syLetterDepositMapper.querySyLetterDeposit(page, queryWrapper);
+//        IPage<SyLetterDeposit> page2=syLetterDepositMapper.querySyLetterDeposit(page, queryWrapper);
+//        page1.setCurrent(current);
+//        page1.setTotal(100);
+        return pageList;
     }
 
     /**

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/QueryShippingVo.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.documents.shippingDetails.entity.VO;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -143,4 +144,7 @@ public class QueryShippingVo {
     //创建时间
     private String createTime;
 
+    @TableField(exist = false)
+    private String colour;
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -108,7 +108,7 @@ GROUP BY b.group_id
     b.pur_or_sub_order as purOrSubOrder,
     b.material_composition as materialComposition,
     b.account as account,
-    b.garment_factory as garmentFactory,b.elements_id as elementsId,b.group_id as groupId
+    b.garment_factory as garmentFactory,b.elements_id as elementsId,b.group_id as groupId,b.colour
      from sy_shipping_details_item b
 left join sy_shipping_details a
 on a.id = b.shipping_details_id and a.del_flag = 0
@@ -161,7 +161,7 @@ GROUP BY b.group_id
     b.pur_or_sub_order as purOrSubOrder,
     b.material_composition as materialComposition,
     b.account as account,
-    b.garment_factory as garmentFactory,b.elements_id as elementsId,b.group_id as groupId
+    b.garment_factory as garmentFactory,b.elements_id as elementsId,b.group_id as groupId,b.colour
      from sy_shipping_details_item b
 left join sy_shipping_details a
 on a.id = b.shipping_details_id and a.del_flag = 0