src/main/java/fi/em/formPlugin/BusinessProcessingConvertPlugIn.java

@@ -18,9 +18,11 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
         JSONArray objects = JSONArray.parseArray(jsonArray);
         String type = this.getOption().getVariableValue("type");//1
         if("drawyfgz".equals(type)){
+            String bdsupplier = this.getOption().getVariableValue("bdsupplier");
             String billtype = this.getOption().getVariableValue("billtype");
             QFilter numberQFilter = new QFilter("ap_finapbill.org.number", QCP.equals, orgnumber);
             numberQFilter.and("ap_finapbill.billstatus", QCP.equals, "C");
+            numberQFilter.and("ap_finapbill.asstact.id", QCP.equals, Long.valueOf(bdsupplier));
             for(int i=0;i<objects.size();i++){
                 JSONObject jsonObject = objects.getJSONObject(i);
                 String id = jsonObject.getString("id");
@@ -61,12 +63,12 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
             e.getCustQFilters().add(numberQFilter);
         }else if("draw-ssysd".equals(type)){
             String customersid = this.getOption().getVariableValue("customersid");
-            QFilter numberQFilter = new QFilter("nckd_customers.id", QCP.equals, customersid);
-            numberQFilter.and("nckd_customers.enable", QCP.equals, "1");
+            QFilter numberQFilter = new QFilter("ar_finarbill.asstact.id", QCP.equals, customersid);
+            numberQFilter.and("ar_finarbill.billstatus", QCP.equals, "C");
             for(int i=0;i<objects.size();i++){
                 JSONObject jsonObject = objects.getJSONObject(i);
                 String id = jsonObject.getString("id");
-                numberQFilter.and("nckd_customers.id", QCP.not_equals2, Long.valueOf(id));
+                numberQFilter.and("ar_finarbill.id", QCP.not_equals2, Long.valueOf(id));
             }
             e.getCustQFilters().add(numberQFilter);
         }else if("draw-clyf".equals(type)){