Commit a7941cb7796741fc763a5c2833e00ca46235596a
1 parent
cd81cac6
Exists in
parentassistant
添加考勤接口
Showing
8 changed files
with
57 additions
and
1 deletions
Show diff stats
ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
| ... | ... | @@ -54,6 +54,7 @@ |
| 54 | 54 | AD4BA4A920819AB000F83F13 /* ReportHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4BA4A820819AB000F83F13 /* ReportHeaderView.swift */; }; |
| 55 | 55 | AD4BA4AC20819CAD00F83F13 /* ReportHeaderCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4BA4AA20819CAD00F83F13 /* ReportHeaderCollectionViewCell.swift */; }; |
| 56 | 56 | AD4BA4AD20819CAD00F83F13 /* ReportHeaderCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD4BA4AB20819CAD00F83F13 /* ReportHeaderCollectionViewCell.xib */; }; |
| 57 | + AD51475B208735FB00EEABDC /* StudentCardModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD51475A208735FB00EEABDC /* StudentCardModel.swift */; }; | |
| 57 | 58 | AD5681CA208044860034A948 /* GrowCheckUpTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD5681C8208044860034A948 /* GrowCheckUpTableViewCell.swift */; }; |
| 58 | 59 | AD5681CB208044860034A948 /* GrowCheckUpTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD5681C9208044860034A948 /* GrowCheckUpTableViewCell.xib */; }; |
| 59 | 60 | AD5681CE2080449A0034A948 /* GrowCheckDownTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD5681CC2080449A0034A948 /* GrowCheckDownTableViewCell.swift */; }; |
| ... | ... | @@ -231,6 +232,7 @@ |
| 231 | 232 | AD4BA4A820819AB000F83F13 /* ReportHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportHeaderView.swift; sourceTree = "<group>"; }; |
| 232 | 233 | AD4BA4AA20819CAD00F83F13 /* ReportHeaderCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportHeaderCollectionViewCell.swift; sourceTree = "<group>"; }; |
| 233 | 234 | AD4BA4AB20819CAD00F83F13 /* ReportHeaderCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReportHeaderCollectionViewCell.xib; sourceTree = "<group>"; }; |
| 235 | + AD51475A208735FB00EEABDC /* StudentCardModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudentCardModel.swift; sourceTree = "<group>"; }; | |
| 234 | 236 | AD5681C8208044860034A948 /* GrowCheckUpTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GrowCheckUpTableViewCell.swift; sourceTree = "<group>"; }; |
| 235 | 237 | AD5681C9208044860034A948 /* GrowCheckUpTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GrowCheckUpTableViewCell.xib; sourceTree = "<group>"; }; |
| 236 | 238 | AD5681CC2080449A0034A948 /* GrowCheckDownTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GrowCheckDownTableViewCell.swift; sourceTree = "<group>"; }; |
| ... | ... | @@ -605,6 +607,7 @@ |
| 605 | 607 | ADC9AB70207C558600348EF1 /* Model */ = { |
| 606 | 608 | isa = PBXGroup; |
| 607 | 609 | children = ( |
| 610 | + AD51475A208735FB00EEABDC /* StudentCardModel.swift */, | |
| 608 | 611 | ); |
| 609 | 612 | path = Model; |
| 610 | 613 | sourceTree = "<group>"; |
| ... | ... | @@ -1177,6 +1180,7 @@ |
| 1177 | 1180 | AD122AC8208448E900C7D0AD /* ProgramVacateAddViewController.swift in Sources */, |
| 1178 | 1181 | AD122AB8208436F100C7D0AD /* ProgramVacateDetailView.swift in Sources */, |
| 1179 | 1182 | BFBC06C82063AE8900CCFAFF /* ZLaunchAdCache.swift in Sources */, |
| 1183 | + AD51475B208735FB00EEABDC /* StudentCardModel.swift in Sources */, | |
| 1180 | 1184 | BFF9B7F62057A4C900F39B3E /* ChildrenDetailViewController.swift in Sources */, |
| 1181 | 1185 | 599364FF204E945600C8B371 /* BindingViewController.swift in Sources */, |
| 1182 | 1186 | 590944E020579CFA004478B5 /* InvitationCodeVerificationViewController.swift in Sources */, | ... | ... |
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
| ... | ... | @@ -13,5 +13,21 @@ |
| 13 | 13 | stopOnStyle = "0"> |
| 14 | 14 | </BreakpointContent> |
| 15 | 15 | </BreakpointProxy> |
| 16 | + <BreakpointProxy | |
| 17 | + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | |
| 18 | + <BreakpointContent | |
| 19 | + shouldBeEnabled = "Yes" | |
| 20 | + ignoreCount = "0" | |
| 21 | + continueAfterRunningActions = "No" | |
| 22 | + filePath = "ParentAssistant/Classes/controllers/Grow/Program/ProgramCheckViewController.swift" | |
| 23 | + timestampString = "545732019.229158" | |
| 24 | + startingColumnNumber = "9223372036854775807" | |
| 25 | + endingColumnNumber = "9223372036854775807" | |
| 26 | + startingLineNumber = "38" | |
| 27 | + endingLineNumber = "38" | |
| 28 | + landmarkName = "downLoadDataFromNet()" | |
| 29 | + landmarkType = "7"> | |
| 30 | + </BreakpointContent> | |
| 31 | + </BreakpointProxy> | |
| 16 | 32 | </Breakpoints> |
| 17 | 33 | </Bucket> | ... | ... |
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Model/StudentCardModel.swift
0 → 100644
| ... | ... | @@ -0,0 +1,18 @@ |
| 1 | +// | |
| 2 | +// StudentCardModel.swift | |
| 3 | +// ParentAssistant | |
| 4 | +// | |
| 5 | +// Created by Cao yang on 2018/4/18. | |
| 6 | +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. | |
| 7 | +// | |
| 8 | + | |
| 9 | +import UIKit | |
| 10 | + | |
| 11 | +class StudentCardModel: NSObject { | |
| 12 | + | |
| 13 | + var user_id = String() | |
| 14 | + var school_id = String() | |
| 15 | + var head_image = String() | |
| 16 | + var situation = String() | |
| 17 | + | |
| 18 | +} | ... | ... |
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCheckViewController.swift
| ... | ... | @@ -28,6 +28,18 @@ class ProgramCheckViewController: UIViewController,UITableViewDelegate,UITableVi |
| 28 | 28 | super.viewDidLoad() |
| 29 | 29 | self.view.addSubview(self.tableView) |
| 30 | 30 | // Do any additional setup after loading the view. |
| 31 | + downLoadDataFromNet() | |
| 32 | + } | |
| 33 | + | |
| 34 | + /// 获取数据 | |
| 35 | + private func downLoadDataFromNet(){ | |
| 36 | + let params = ["studentid":185,"schoolid":1,"starttime":"2017-07-19"] as [String : Any] | |
| 37 | + HTTPServer.shared.getStudentCheckList(parameters: params as [String : AnyObject]) { (backData, error) in | |
| 38 | + print(backData!) | |
| 39 | + if error == nil && JSON.fromString(backData)!["status"].intValue == 1 { | |
| 40 | + | |
| 41 | + } | |
| 42 | + } | |
| 31 | 43 | } |
| 32 | 44 | |
| 33 | 45 | ... | ... |
ParentAssistant/ParentAssistant/Classes/util/Macro.swift
| ... | ... | @@ -75,6 +75,7 @@ let URL_PARENTSERVICE_GETADS="/api/ParentService/GetAds" //获å–广告ä½ä |
| 75 | 75 | //MARK: - æˆé•¿ |
| 76 | 76 | //MARK: 应用 |
| 77 | 77 | let URL_POST_MEND_CARD = "/api/OneCard/AddStuCard" //è¡¥å¡ |
| 78 | +let URL_GET_ATTENDANCE_LIST = "/api/ParentService/GetAttendanceList" //考勤 | |
| 78 | 79 | |
| 79 | 80 | |
| 80 | 81 | //MARK: é‡è§„评价 | ... | ... |
ParentAssistant/ParentAssistant/Classes/util/network.swift
| ... | ... | @@ -228,10 +228,14 @@ final class HTTPServer{ |
| 228 | 228 | |
| 229 | 229 | //MARK: - 成长 |
| 230 | 230 | //MARK: 应用 |
| 231 | + ///补卡 | |
| 231 | 232 | func postStudentMendCard(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){ |
| 232 | 233 | KHttp.POST(url: URL_POST_MEND_CARD, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler) |
| 233 | 234 | } |
| 234 | - | |
| 235 | + ///考勤 | |
| 236 | + func getStudentCheckList(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){ | |
| 237 | + KHttp.GET(url: URL_GET_ATTENDANCE_LIST, parameters: parameters,headers:["Authorization":token!], completionHandler: completionHandler) | |
| 238 | + } | |
| 235 | 239 | //MARK:量规评价 |
| 236 | 240 | //获取报告详情 |
| 237 | 241 | func workReportDetails(parameters: [String : AnyObject]?,completionHandler:@escaping (String?, NSError?) -> ()){ | ... | ... |