记录索引键

AutoTurnOver.Models/dc_report_cash_flow_log.cs

@@ -57,6 +57,8 @@ namespace AutoTurnOver.Models
         /// </summary>
         public int is_delete { get; set; }
         public DateTime? update_time { get; set; }
+        public string pay_time_year_month_no { get; set; }
+        public string occur_time_year_month_no { get; set; }
     }
 
     public class dc_report_cash_flow_log_dto: dc_report_cash_flow_log
@@ -148,7 +150,7 @@ namespace AutoTurnOver.Models
     {
         public string remarks { get; set; }
         public string date_type_str { get; set; }
-        public int date_type { get; set; }
+        public List<int> date_type { get; set; }
         public List<date_dto> dates { get; set; }
         public class date_dto
         {
@@ -171,7 +173,7 @@ namespace AutoTurnOver.Models
     {
         public DateTime? btime { get; set; }
         public DateTime? etime { get; set; }
-        public int? data_type { get; set; }
+        public List<int> data_type { get; set; }
         /// <summary>
         /// 1 = 根据发生时间查询
         /// 2 = 根据支付时间查询

AutoTurnOver.Services/CashFlowServices.cs

@@ -16,7 +16,7 @@ namespace AutoTurnOver.Services
             foreach (var item in order_list)
             {
                 dynamic o = new ExpandoObject();
-                o.date_type = item.date_type;
+                o.date_type = string.Join(",", item.date_type);
                 o.date_type_str = item.date_type_str;
                 o.remarks = item.remarks;
                 foreach (var dat_item in item.dates)
@@ -24,7 +24,7 @@ namespace AutoTurnOver.Services
                     var dic = (IDictionary<string, object>)o;
                     dic["occur_" + (dat_item.date_title)] = new { val = Math.Round(dat_item.occur_val, 2), btime = dat_item.btime, etime = dat_item.etime, data_type = item.date_type };
                     if(
-                        item.date_type == (int)dc_report_cash_flow_log_data_type_enum.销售数量
+                        item.date_type .Contains( (int)dc_report_cash_flow_log_data_type_enum.销售数量)
                         //|| item.date_type==(int)dc_report_cash_flow_log_data_type_enum.利润 
                         //|| item.date_type == (int)dc_report_cash_flow_log_data_type_enum.退款
                         //|| item.date_type == (int)dc_report_cash_flow_log_data_type_enum.平台费用

AutoTurnOver/Controllers/CashFlowController.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using AutoTurnOver.Common;
 using AutoTurnOver.Models;
 using AutoTurnOver.Services;
+using Dapper;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -32,11 +33,11 @@ namespace AutoTurnOver.Controllers
             });
         }
 
-        public FileResult Export(DateTime? btime, DateTime? etime, int? data_type = null,int? type = null)
+        public FileResult Export(DateTime? btime, DateTime? etime, string data_type = null,int? type = null)
         {
             var m = new dc_report_cash_flow_log_export_search_dto
             {
-                data_type = data_type,
+                data_type = string.IsNullOrWhiteSpace(data_type) ?new List<int> { } : data_type.Split(',').Select(s=>int.Parse(s)).ToList(),
                 btime = btime,
                 etime = etime,
                 type = type,