预托书

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

@@ -78,12 +78,21 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 								   HttpServletRequest req) {
 
 		Result<IPage<SyLetterDeposit>> result = new Result<IPage<SyLetterDeposit>>();
-		QueryWrapper<SyLetterDeposit> queryWrapper = QueryGenerator.initQueryWrapper(syLetterDeposit, req.getParameterMap());
-		Page<SyLetterDeposit> page = new Page<SyLetterDeposit>(pageNo, pageSize);
-		IPage<SyLetterDeposit> pageList = syLetterDepositService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setMessage("查询成功！");
-		result.setResult(pageList);
+		try {
+			QueryWrapper<SyLetterDeposit> queryWrapper = QueryGenerator.initQueryWrapper(syLetterDeposit, req.getParameterMap());
+			Page<SyLetterDeposit> page = new Page<SyLetterDeposit>(pageNo, pageSize);
+			queryWrapper.eq("a.del_flag",0).groupBy("a.depositary_receipt_no").orderByDesc("a.depositary_receipt_no");
+			IPage<SyLetterDeposit> pageList = syLetterDepositService.querySyLetterDeposit(page, queryWrapper);
+			result.setSuccess(true);
+			result.setMessage("查询成功！");
+			result.setResult(pageList);
+
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("查询失败：" + ex.getMessage());
+			result.error500("查询失败:" + ex.getMessage());
+		}
+
 		return result;
 	}
 	

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

@@ -19,6 +19,9 @@ import org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPacking
  */
 public interface SyLetterDepositMapper extends BaseMapper<SyLetterDeposit> {
 
+    //查询预托书分页列表
+    IPage<SyLetterDeposit> querySyLetterDeposit(IPage<SyLetterDeposit> page, @Param("ew") QueryWrapper<SyLetterDeposit> queryWrapper);
+
     //查询预装箱单
     IPage<SyPreAssembledPackingListVo> querySyPreAssembledPackingList(IPage<SyPreAssembledPackingListVo> page, @Param("ew") QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
 

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

@@ -71,6 +71,19 @@ sum(a.total_gross_weight) as totalGrossWeight,sum(a.total_volume) as totalVolume
 a.depositary_receipt_no as depositaryReceiptNo from sy_pre_assembled_packing_list a
 left join sy_pre_assembled_packing_list_item b
 on a.id = b.sy_pre_assembled_packing_list_id and b.del_flag = 0
+  ${ew.customSqlSegment}
+
+    </select>
+
+    <select id="querySyLetterDeposit" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit">
+select a.depositary_receipt_no as depositaryReceiptNo,a.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
+a.client_abbreviation as clientAbbreviation,
+a.the_distribution as theDistribution,a.unit_in_operation as unitInOperation,sum(b.box_number) as boxNumber,sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,
+a.money as money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.consignee as consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
+a.addressee as addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,a.notifier as notifier,a.nottfy as nottfy,a.destination_port as destinationPort,
+a.the_documents_state as theDocumentsState from sy_letter_deposit a
+left join sy_letter_deposit_item b
+on a.id = b.sy_letter_deposit_id
   ${ew.customSqlSegment}
 
     </select>

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

@@ -21,6 +21,9 @@ import java.util.List;
 public interface ISyLetterDepositService extends IService<SyLetterDeposit> {
 
 
+    //预托书分页列表
+    IPage<SyLetterDeposit> querySyLetterDeposit(IPage<SyLetterDeposit> page, QueryWrapper<SyLetterDeposit> queryWrapper);
+
     //查询预装箱单
     IPage<SyPreAssembledPackingListVo> querySyPreAssembledPackingList(IPage<SyPreAssembledPackingListVo> page, QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
 

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

@@ -45,6 +45,17 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
     private SyPreAssembledPackingListServiceImpl syPreAssembledPackingListService;
 
 
+    /**
+     * 分页列表查询
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    @Override
+    public IPage<SyLetterDeposit> querySyLetterDeposit(IPage<SyLetterDeposit> page, QueryWrapper<SyLetterDeposit> queryWrapper) {
+        return syLetterDepositMapper.querySyLetterDeposit(page, queryWrapper);
+    }
+
     /**
      * 查询预装箱单
      * @param page