fix

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -1315,6 +1315,14 @@ GROUP BY platform_type,website";
             {
                 sql = $" select  sum(`val`) as 'val' from dc_report_cash_flow_log as t1 where t1.is_delete=0 and `val`!=0 ";
             }
+            else
+            {
+                if (search.view_type == 2)
+                {
+                    sql = $@" select  t1.data_type,t1.pay_type,sum(`val`) as 'val' 
+from dc_report_cash_flow_log as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where t1.is_delete=0 and `val`!=0 ";
+                }
+            }
             DynamicParameters parameters = new DynamicParameters();
             if (search.type == 1)
             {
@@ -1354,7 +1362,11 @@ GROUP BY platform_type,website";
                 sql += " and t1.data_type in @data_type ";
                 parameters.Add("data_type", search.data_type);
             }
-            if (search.issum)
+            if (search.view_type == 2)
+            {
+                sql += "group by t1.data_type ";
+            }
+                if (search.issum)
             {
                 return new Page<dc_report_cash_flow_log_dto>()
                 {

AutoTurnOver.Models/dc_report_cash_flow_log.cs

@@ -236,6 +236,7 @@ namespace AutoTurnOver.Models
         public string warehouse_code { get; set; }
         public string platform_type { get; set; }
         public string web_site { get; set; }
+        public int? view_type { get; set; }
     }
 
     public class dc_report_cash_flow_sku_group

AutoTurnOver/Controllers/CashFlowController.cs

@@ -133,7 +133,7 @@ namespace AutoTurnOver.Controllers
         }
 
         [HttpGet]
-        public JsonResult LogPage(int limit, int offset, string order, string sort, DateTime? btime, DateTime? etime, string bailun_sku, string data_type = null, int? type = null, string platform_type = null, string warehouse_code = null, string web_site = "")
+        public JsonResult LogPage(int limit, int offset, string order, string sort, DateTime? btime, DateTime? etime, string bailun_sku, string data_type = null, int? type = null, string platform_type = null, string warehouse_code = null, string web_site = "", int? view_type = 1)
         {
             try
             {
@@ -152,7 +152,8 @@ namespace AutoTurnOver.Controllers
                     sord = order,
                     sidx = sort,
                     warehouse_code = warehouse_code,
-                    web_site = web_site
+                    web_site = web_site,
+                    view_type = view_type
                 };