报表

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseClosingReportServiceImpl.java

@@ -63,7 +63,9 @@ public class PurchaseClosingReportServiceImpl extends ServiceImpl<PurchaseClosin
         pageView.put("startRecord", (purchaseClosingReport.getCurrentPage() - 1)
                 * purchaseClosingReport.getPageSize());
         List<String> businessKeys = null;
-        businessKeys = workflowService.getTaskBusinessKeysByCode("PROCUREMENT-CLOSE-REPORT");
+        if("1".equals(purchaseClosingReport.getSearchType())){
+            businessKeys = workflowService.getTaskBusinessKeysByCode("PROCUREMENT-CLOSE-REPORT");
+        }
         List<String> statusSet = new ArrayList<>();
         List<String> resourceIdList = this.getResourceIdList();
         if (resourceIdList.contains("procurementCloseReport-Edit")) { // 填写，提交    权限做完以后替换

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseReceiptReportServiceImpl.java

@@ -64,7 +64,9 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
         pageView.put("startRecord", (purchaseReceiptReport.getCurrentPage() - 1)
                 * purchaseReceiptReport.getPageSize());
         List<String> businessKeys = null;
-        businessKeys = workflowService.getTaskBusinessKeysByCode("PROCUREMENT-RECEIPT-REPORT");
+        if("1".equals(purchaseReceiptReport.getSearchType())){
+            businessKeys = workflowService.getTaskBusinessKeysByCode("PROCUREMENT-RECEIPT-REPORT");
+        }
         List<String> statusSet = new ArrayList<>();
         List<String> resourceIdList = this.getResourceIdList();
         if (resourceIdList.contains("procurementInReport-Edit")) { // 填写，提交    权限做完以后替换

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SalesClosingReportServiceImpl.java

@@ -65,7 +65,9 @@ public class SalesClosingReportServiceImpl extends ServiceImpl<SalesClosingRepor
         pageView.put("startRecord", (salesClosingReport.getCurrentPage() - 1)
                 * salesClosingReport.getPageSize());
         List<String> businessKeys = null;
-        businessKeys = workflowService.getTaskBusinessKeysByCode("SALE-CLOSE-REPORT");
+        if("1".equals(salesClosingReport.getSearchType())){
+            businessKeys = workflowService.getTaskBusinessKeysByCode("SALE-CLOSE-REPORT");
+        }
         List<String> statusSet = new ArrayList<>();
         List<String> resourceIdList = this.getResourceIdList();
         if (resourceIdList.contains("saleCloseReport-Edit")) { // 填写，提交    权限做完以后替换

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SalesDeliveryReportServiceImpl.java

@@ -60,7 +60,9 @@ public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryRep
         pageView.put("startRecord", (salesDeliveryReport.getCurrentPage() - 1)
                 * salesDeliveryReport.getPageSize());
         List<String> businessKeys = null;
-        businessKeys = workflowService.getTaskBusinessKeysByCode("SALE-RECEIPT-REPORT");
+        if("1".equals(salesDeliveryReport.getSearchType())){
+            businessKeys = workflowService.getTaskBusinessKeysByCode("SALE-RECEIPT-REPORT");
+        }
         List<String> statusSet = new ArrayList<>();
         List<String> resourceIdList = this.getResourceIdList();
         if (resourceIdList.contains("saleOutReport-Edit")) { // 填写，提交    权限做完以后替换