预托书

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

@@ -108,11 +108,11 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			Page<SyLetterDeposit> page = new Page<SyLetterDeposit>(pageNo, pageSize);
 			//客户简称
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getClientAbbreviation())){
-				queryWrapper.like("t.clientAbbreviation",syLetterDeposit.getClientAbbreviation().trim());
+				queryWrapper.like("b.client_abbreviation",syLetterDeposit.getClientAbbreviation().trim());
 			}
 			//制单人
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getCreateBy())){
-				queryWrapper.eq("t.createBy",syLetterDeposit.getCreateBy().trim());
+				queryWrapper.eq("b.create_by",syLetterDeposit.getCreateBy().trim());
 			}
 			//小PO
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getSmallPo())){
@@ -120,53 +120,24 @@ 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("t.id",list.get(0).getSyLetterDepositId());
+				queryWrapper.eq("a.id",list.get(0).getSyLetterDepositId());
 			}
 			//预托书号
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getDepositaryReceiptNo())){
-				queryWrapper.like("t.depositaryReceiptNo",syLetterDeposit.getDepositaryReceiptNo().trim());
+				queryWrapper.like("a.depositary_receipt_no",syLetterDeposit.getDepositaryReceiptNo().trim());
 			}
 			//托书日期
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getShippingOrderDate())){
-				queryWrapper.eq("t.shippingOrderDate",syLetterDeposit.getShippingOrderDate());
+				queryWrapper.eq("a.shipping_order_date",syLetterDeposit.getShippingOrderDate());
 			}
 			//账套
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getAcSetNo())){
-				queryWrapper.eq("t.acSetNo",syLetterDeposit.getAcSetNo());
+				queryWrapper.eq("b.ac_set_no",syLetterDeposit.getAcSetNo());
 			}
-
-			queryWrapper.groupBy("t.sy_letter_deposit_id").orderByDesc("t.createTime");
+			queryWrapper.eq("a.del_flag","0").eq("b.del_flag","0");
+			queryWrapper.groupBy("b.groupid");
 			IPage<SyLetterDeposit> pageList = syLetterDepositService.querySyLetterDeposit(page, queryWrapper);
-			for (SyLetterDeposit li:pageList.getRecords()){
-				//转换运抵国别
-				List<DictModel> sysDicts1 = sysDictService.queryDictItemsByCode("country_of_arrival");
-				for(DictModel di:sysDicts1){
-					if(di.getValue().equals(li.getArriveInCountry())){
-						li.setArriveInCountry(di.getText());
-					}
-				}
-				//转换目的港
-				List<DictModel> sysDicts = sysDictService.queryDictItemsByCode("port_of_destination");
-				for(DictModel di:sysDicts){
-					if(di.getValue().equals(li.getDestinationPort())){
-						li.setDestinationPort(di.getText());
-					}
-				}
-				//转换出口口岸
-				List<DictModel> sysDicts2 = sysDictService.queryDictItemsByCode("export_port");
-				for(DictModel di:sysDicts2){
-					if(di.getValue().equals(li.getDestinationPort())){
-						li.setDestinationPort(di.getText());
-					}
-				}
-				//转换贸易国别
-				List<DictModel> sysDicts3 = sysDictService.queryDictItemsByCode("trade_country");
-				for(DictModel di:sysDicts3){
-					if(di.getValue().equals(li.getDestinationPort())){
-						li.setDestinationPort(di.getText());
-					}
-				}
-			}
+
 			result.setSuccess(true);
 			result.setMessage("查询成功！");
 			result.setResult(pageList);

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

@@ -86,9 +86,10 @@ a.create_time as createTime,b.unit_price as unitPrice,sum(b.total_price) as tota
          from sy_letter_deposit_item b
 				 left join sy_letter_deposit a
 				 on a.id = b.sy_letter_deposit_id
-         where a.del_flag = 0 and  b.del_flag = 0 group by b.groupid) t
+				 ${ew.customSqlSegment}
+         ) t
+ group by  t.sy_letter_deposit_id order by t.createTime desc
 
-  ${ew.customSqlSegment}
 
     </select>