客户详情统计添加时间筛查

GeliBusinessPlatform/ViewController/客户管理/KeHuXQViewController.swift

@@ -7,8 +7,9 @@
 //
 
 import UIKit
+import SwiftDate
 
-class KeHuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource {
+class KeHuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource ,WorkSelectTimeViewDelegate{
     var page = 0
     var model:CusListDataModel?
     var dataArr:Array<CusSalesStatisticsDataModel> = []
@@ -18,6 +19,8 @@ class KeHuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     override func viewDidLoad() {
         super.viewDidLoad()
         navbar.title = "客户详情"
+        navbar.rightImg = UIImage.init(named: "ShouZhiTongJiDayEdit")
+
         self.view.addSubview(navbar)
         topListView.separatorStyle = .none
         btmListView.separatorStyle = .none
@@ -38,9 +41,10 @@ class KeHuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     //MARK:--加载数据
     @objc func loadData(){
         print("加载数据")
-        
+        let star_time = Int(starTime.timeIntervalSince1970)
+        let end_time = Int(endTime.timeIntervalSince1970)
         page = 1
-        let dic = ["user_token":UserToken as Any,"page":page as Any,"cus_id":model!.cus_id as Any]
+        let dic = ["user_token":UserToken as Any,"page":page as Any,"cus_id":model!.cus_id as Any,"start_time":star_time as Any,"end_time":end_time as Any]
         
         cusSalesStatistics(dic, success: { (data) in
             self.dataArr.removeAll()
@@ -64,7 +68,9 @@ class KeHuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     //MARK:--加载更多数据
     @objc func loadMoreData(){
         print("加载更多数据")
-        let dic = ["user_token":UserToken as Any,"page":page as Any,"cus_id":model!.cus_id as Any]
+        let star_time = Int(starTime.timeIntervalSince1970)
+        let end_time = Int(endTime.timeIntervalSince1970)
+        let dic = ["user_token":UserToken as Any,"page":page as Any,"cus_id":model!.cus_id as Any,"start_time":star_time as Any,"end_time":end_time as Any]
         
         cusSalesStatistics(dic, success: { (data) in
             let dataM = data as! CusSalesStatisticsModel
@@ -129,10 +135,26 @@ class KeHuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             title.font = UIFont.boldSystemFont(ofSize: 15)
             view.addSubview(title)
             title.snp.makeConstraints { (make) in
-                make.top.left.right.equalTo(15)
+                make.top.left.equalTo(15)
                 make.height.equalTo(21)
             }
             
+            let dayLbl = UILabel()
+            dayLbl.font = UIFont.boldSystemFont(ofSize: 11)
+            dayLbl.textColor = UIColor(named: "灰色字体颜色")
+
+            let start = dateConvertString(date: starTime + 8.hours, dateFormat: "yyyy年MM月dd日")
+            let end = dateConvertString(date: endTime + 8.hours, dateFormat: "yyyy年MM月dd日")
+            if start == end {
+                dayLbl.text = "(日期统计区间: " + start + ")"
+            }else{
+                dayLbl.text = "(日期统计区间: " + start + " 至 " + end  + ")"
+            }
+            view.addSubview(dayLbl)
+            dayLbl.snp.makeConstraints { (make) in
+                make.centerY.equalTo(title)
+                make.left.equalTo(title.snp_right).offset(3)
+            }
             return view
         }
         return UIView()
@@ -201,5 +223,62 @@ class KeHuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         
         return cell
     }
+    //MARK:--日期筛选按钮（右上角按钮）
+    let selectV = WorkSelectTimeView()
+    var selelctIndex = 1001
+    var isShowSelectTimeV:Bool = false
+    var endTime = DateInRegion().dateAt(.endOfDay).date  - 8.hours
+    var starTime =  DateInRegion().dateAt(.startOfDay).date - 8.hours
+    func rightBtnClick() {
+        print("日期筛选按钮")
+        if isShowSelectTimeV {
+            selectV.removeFromSuperview()
+        }else{
+            selectV.delegate = self
+            selectV.selectIndex = selelctIndex
+            self.view.window?.addSubview(selectV)
+            selectV.snp.makeConstraints { (make) in
+                make.top.equalTo(navbar.snp_bottom)
+                make.left.right.bottom.equalToSuperview()
+            }
+            selectV.BeginDate = starTime
+            selectV.EndDate = endTime
+        }
+    }
+    //MARK:--时间选择视图反馈
+    func selectWorkIndx(sender: Int, beginDate: Date?, endginDate: Date?) {
+        selelctIndex = sender;
+        isShowSelectTimeV = false
+        switch sender {
+        case 1001:
+            endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
+            starTime = DateInRegion().dateAt(.startOfDay).date - 8.hours //今天开始时间
+            btmListView.mj_header?.beginRefreshing()
+            break
+        case 1002:
+            endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
+            starTime = DateInRegion().dateAt(.startOfWeek).date + 1.days - 8.hours //当周周一开始时间
+            btmListView.mj_header?.beginRefreshing()
+            break
+        case 1003:
+            endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
+            starTime = DateInRegion().dateAt(.startOfMonth).date - 9.hours - 1.minutes - 1.seconds //本月开始时间
+            btmListView.mj_header?.beginRefreshing()
+            break
+        case 1004:
+            if beginDate != nil && endginDate != nil {
+                let timeInterval:TimeInterval = beginDate!.timeIntervalSince1970
+                let timeIntervalEnd:TimeInterval = endginDate!.timeIntervalSince1970
+                let timestr = dayByDouble(sender: timeInterval) + "-" + dayByDouble(sender: timeIntervalEnd)
+                endTime = endginDate!
+                starTime = beginDate!
+                print(timestr)
+                btmListView.mj_header?.beginRefreshing()
+            }
             
+            break
+        default:
+            break
+        }
+    }
 }

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -112,7 +112,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
         case 1003:
             topNavBtn.setTitle("本月", for: .normal)
             endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
-            starTime = DateInRegion().dateAt(.startOfMonth).date - 8.hours //本月开始时间
+            starTime = DateInRegion().dateAt(.startOfMonth).date - 9.hours - 1.minutes - 1.seconds //本月开始时间
             loadData()
             break
         case 1004:
@@ -177,7 +177,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             starTime = DateInRegion().dateAt(.startOfWeek).date + 1.days - 8.hours //当周周一开始时间
         case "本月":
             endTime = DateInRegion().dateAt(.endOfDay).date  - 8.hours
-            starTime = DateInRegion().dateAt(.startOfMonth).date  - 8.hours//本月开始时间
+            starTime = DateInRegion().dateAt(.startOfMonth).date - 9.hours - 1.minutes - 1.seconds //本月开始时间
             break
         default:
             break

GeliBusinessPlatform/ViewController/收支统计/ShouZhiTongJiViewController.swift

@@ -166,7 +166,7 @@ class ShouZhiTongJiViewController: BaseViewController,UITableViewDelegate,UITabl
         case 1003:
             //               topNavBtn.setTitle("本月", for: .normal)
             endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
-            starTime = DateInRegion().dateAt(.startOfMonth).date - 8.hours //本月开始时间
+            starTime = DateInRegion().dateAt(.startOfMonth).date - 9.hours - 1.minutes - 1.seconds //本月开始时间
             loadData()
             break
         case 1004: