1

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

@@ -233,8 +233,8 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
         //查现货采购入库报表
         List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList = this.selectList(new EntityWrapper<StockPurchaseReceiptReport>()
                 .eq("comp_id", stockPurchaseReceiptReport.getCompId())
-                .gt("create_date",stockPurchaseReceiptReport.getStartDate())
-                .lt("create_date",stockPurchaseReceiptReport.getEndDate())
+                .ge("create_date",stockPurchaseReceiptReport.getStartDate())
+                .le("create_date",stockPurchaseReceiptReport.getEndDate())
                 .groupBy("contract_no")
                 .eq("delete_flag", "0"));
         if (!CollectionUtils.isEmpty(stockPurchaseReceiptReportList)) {
@@ -250,8 +250,8 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                     List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList1 = this.selectList(new EntityWrapper<StockPurchaseReceiptReport>()
                             .eq("comp_id", stockPurchaseReceiptReport1.getCompId())
                             .eq("contract_no",contractManagementInfo.getContractNo())
-                            .gt("create_date",stockPurchaseReceiptReport.getStartDate())
-                            .lt("create_date",stockPurchaseReceiptReport.getEndDate())
+                            .ge("create_date",stockPurchaseReceiptReport.getStartDate())
+                            .le("create_date",stockPurchaseReceiptReport.getEndDate())
                             .eq("delete_flag", "0"));
                     if (!CollectionUtils.isEmpty(stockPurchaseReceiptReportList1)){
                         money = (stockPurchaseReceiptReportList1.stream().mapToDouble(StockPurchaseReceiptReport::getAmountNotPayable).sum()) ;

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

@@ -287,8 +287,8 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
             //查现货销售出库报表
             List<StockSaleReceiptReport> stockSaleReceiptReportList = this.selectList(new EntityWrapper<StockSaleReceiptReport>()
                     .eq("comp_id", stockSaleReceiptReport.getCompId())
-                    .gt("create_date",stockSaleReceiptReport.getStartDate())
-                    .lt("create_date",stockSaleReceiptReport.getEndDate())
+                    .ge("create_date",stockSaleReceiptReport.getStartDate())
+                    .le("create_date",stockSaleReceiptReport.getEndDate())
                     .groupBy("contract_no")
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(stockSaleReceiptReportList)) {
@@ -335,8 +335,8 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
                         List<StockSaleReceiptReport> stockSaleReceiptReportList1 = this.selectList(new EntityWrapper<StockSaleReceiptReport>()
                                 .eq("comp_id", stockSaleReceiptReport.getCompId())
                                 .eq("contract_no",stockSaleReceiptReport1.getContractNo())
-                                .gt("create_date",stockSaleReceiptReport.getStartDate())
-                                .lt("create_date",stockSaleReceiptReport.getEndDate())
+                                .ge("create_date",stockSaleReceiptReport.getStartDate())
+                                .le("create_date",stockSaleReceiptReport.getEndDate())
                                 .eq("delete_flag", "0"));
                         if (!CollectionUtils.isEmpty(stockSaleReceiptReportList1)){
                             money = (stockSaleReceiptReportList1.stream().mapToDouble(StockSaleReceiptReport::getAmountNotReceivable).sum()) ;

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -267,7 +267,7 @@
             </foreach>
             )
         </if>
-        ORDER BY a.payment_no DESC
+        ORDER BY a.create_date DESC,a.payment_no DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>