资金协调手续：查询冻结的订货单列表-增加筛选条件

@@ -171,6 +171,12 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
     @ApiModelProperty("审核状态")
     @ApiModelProperty("审核状态")
     private String status;
     private String status;
 
 
+    /**
+     * 订货单位主键集合
+     */
+    @ApiModelProperty("订货单位主键集合")
+    private List<String> orderingUnitIds;
+
     public GetFundCoordinationBo() {
     public GetFundCoordinationBo() {
 
 
     }
     }

@@ -212,6 +212,7 @@ public class FundCoordinationController extends DefaultBaseController {
         Map<String, List<ReceiptLedgerInfo>> map = query.stream()
         Map<String, List<ReceiptLedgerInfo>> map = query.stream()
                 .collect(Collectors.groupingBy(ReceiptLedgerInfo::getCustomerId));
                 .collect(Collectors.groupingBy(ReceiptLedgerInfo::getCustomerId));
         StringBuilder customerNameStr = new StringBuilder();
         StringBuilder customerNameStr = new StringBuilder();
+        List<String> orderingUnitIds = new ArrayList<>();
         //无限担保书
         //无限担保书
         StringBuilder unlimitedGuaranteeLetterStr = new StringBuilder();
         StringBuilder unlimitedGuaranteeLetterStr = new StringBuilder();
         //订货单位集合
         //订货单位集合
@@ -232,6 +233,7 @@ public class FundCoordinationController extends DefaultBaseController {
             String customerId = entry.getKey();
             String customerId = entry.getKey();
             List<ReceiptLedgerInfo> receiptList = entry.getValue();
             List<ReceiptLedgerInfo> receiptList = entry.getValue();
             customerNameStr.append(receiptList.get(0).getCustomerName()).append("、");
             customerNameStr.append(receiptList.get(0).getCustomerName()).append("、");
+            orderingUnitIds.add(customerId);
             //无限担保书
             //无限担保书
             QueryUnlimitedGuaranteeLetterVo vo1 = new QueryUnlimitedGuaranteeLetterVo();
             QueryUnlimitedGuaranteeLetterVo vo1 = new QueryUnlimitedGuaranteeLetterVo();
             vo1.setOrderingUnit(customerId);
             vo1.setOrderingUnit(customerId);
@@ -329,6 +331,8 @@ public class FundCoordinationController extends DefaultBaseController {
             customerNameStr.deleteCharAt(customerNameStr.length() - 1);
             customerNameStr.deleteCharAt(customerNameStr.length() - 1);
         }
         }
         getFundCoordinationBo.setOrderingUnitName(customerNameStr.toString());
         getFundCoordinationBo.setOrderingUnitName(customerNameStr.toString());
+        //订货单位IDs
+        getFundCoordinationBo.setOrderingUnitIds(orderingUnitIds);
         //无限担保书
         //无限担保书
         if (unlimitedGuaranteeLetterStr.length() > 0) {
         if (unlimitedGuaranteeLetterStr.length() > 0) {
             unlimitedGuaranteeLetterStr.deleteCharAt(unlimitedGuaranteeLetterStr.length() - 1);
             unlimitedGuaranteeLetterStr.deleteCharAt(unlimitedGuaranteeLetterStr.length() - 1);
@@ -385,7 +389,7 @@ public class FundCoordinationController extends DefaultBaseController {
      */
      */
     @ApiOperation("查询冻结的订货单列表")
     @ApiOperation("查询冻结的订货单列表")
     @GetMapping("/queryFreeze")
     @GetMapping("/queryFreeze")
-    public InvokeResult<PageResult<GetPurchaseOrderInfoBo>> queryFreeze(@Valid QueryPurchaseOrderInfoVo vo) {
+    public InvokeResult<PageResult<GetPurchaseOrderInfoBo>> queryFreeze(@Valid @RequestBody QueryPurchaseOrderInfoVo vo) {
 
 
         PageResult<PurchaseOrderInfo> pageResult = purchaseOrderInfoService.queryFreeze(getPageIndex(vo), getPageSize(vo), vo);
         PageResult<PurchaseOrderInfo> pageResult = purchaseOrderInfoService.queryFreeze(getPageIndex(vo), getPageSize(vo), vo);
 
 

@@ -5,6 +5,7 @@ import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.util.List;
 
 
 @Data
 @Data
 public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializable {
 public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializable {
@@ -116,4 +117,16 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
      */
      */
     @ApiModelProperty("是否冻结")
     @ApiModelProperty("是否冻结")
     private boolean freeze;
     private boolean freeze;
+
+    /**
+     * 订货单位主键集合
+     */
+    @ApiModelProperty("订货单位主键集合")
+    private List<String> orderingUnitIds;
+
+    /**
+     * 排除主键集合
+     */
+    @ApiModelProperty("排除主键集合")
+    private List<String> excludeIds;
 }
 }

@@ -164,6 +164,18 @@
             <if test="vo.contractId != null and vo.contractId != ''">
             <if test="vo.contractId != null and vo.contractId != ''">
                 AND tb.contract_id = #{vo.contractId}
                 AND tb.contract_id = #{vo.contractId}
             </if>
             </if>
+            <if test="vo.orderingUnitIds != null and !vo.orderingUnitIds.isEmpty()">
+                AND tb.ordering_unit IN
+                <foreach collection="vo.orderingUnitIds" item="orderingUnit" open="(" separator="," close=")">
+                    #{orderingUnit}
+                </foreach>
+            </if>
+            <if test="vo.excludeIds != null and !vo.excludeIds.isEmpty()">
+                AND tb.id NOT IN
+                <foreach collection="vo.excludeIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
         </where>
         ORDER BY tb.update_time DESC
         ORDER BY tb.update_time DESC
     </select>
     </select>