请求修改

XFFruit.xcodeproj/project.pbxproj

@@ -65,7 +65,7 @@
 		7217E9F31B72364300FE5C1D /* SurveyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7217E9E11B72364300FE5C1D /* SurveyCell.m */; };
 		7217E9F41B72364300FE5C1D /* SurveyListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7217E9E31B72364300FE5C1D /* SurveyListCell.m */; };
 		7217E9F61B724A7600FE5C1D /* mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 7217E9F51B724A7600FE5C1D /* mask.png */; };
-		72880C8D1B738973004DD99F /* SurveyPerson.m in Sources */ = {isa = PBXBuildFile; fileRef = 72880C8C1B738973004DD99F /* SurveyPerson.m */; };
+		72F56CB21B76EC200077F0C9 /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F56CB11B76EC200077F0C9 /* User.m */; };
 		871F9F047CDDAC523E4358DC /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 86D33EC280C440156ED1B976 /* libPods.a */; };
 		C10214CD1AD8FE200024637E /* ICRStoreDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C10214CC1AD8FE200024637E /* ICRStoreDetailViewController.m */; };
 		C10214CE1AD8FE200024637E /* ICRStoreDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C10214CC1AD8FE200024637E /* ICRStoreDetailViewController.m */; };
@@ -435,8 +435,8 @@
 		7217E9E21B72364300FE5C1D /* SurveyListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurveyListCell.h; sourceTree = "<group>"; };
 		7217E9E31B72364300FE5C1D /* SurveyListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SurveyListCell.m; sourceTree = "<group>"; };
 		7217E9F51B724A7600FE5C1D /* mask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mask.png; sourceTree = "<group>"; };
-		72880C8B1B738973004DD99F /* SurveyPerson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurveyPerson.h; sourceTree = "<group>"; };
-		72880C8C1B738973004DD99F /* SurveyPerson.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SurveyPerson.m; sourceTree = "<group>"; };
+		72F56CB01B76EC200077F0C9 /* User.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = User.h; sourceTree = "<group>"; };
+		72F56CB11B76EC200077F0C9 /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = User.m; sourceTree = "<group>"; };
 		7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		86D33EC280C440156ED1B976 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		C10214CB1AD8FE200024637E /* ICRStoreDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICRStoreDetailViewController.h; sourceTree = "<group>"; };
@@ -811,8 +811,8 @@
 				7217E9CC1B72364300FE5C1D /* Survey.m */,
 				7217E9CD1B72364300FE5C1D /* SurveyResult.h */,
 				7217E9CE1B72364300FE5C1D /* SurveyResult.m */,
-				72880C8B1B738973004DD99F /* SurveyPerson.h */,
-				72880C8C1B738973004DD99F /* SurveyPerson.m */,
+				72F56CB01B76EC200077F0C9 /* User.h */,
+				72F56CB11B76EC200077F0C9 /* User.m */,
 			);
 			path = models;
 			sourceTree = "<group>";
@@ -1952,9 +1952,9 @@
 				C17DE85A1AD81D1600581AA6 /* NSMutableArray+SafeInsert.m in Sources */,
 				35C3C0B91AE9567B0035AC8A /* ICRNavigationViewController.mm in Sources */,
 				C123A8FB1B2561E1003C0C36 /* JTPopOverWindow.m in Sources */,
+				72F56CB21B76EC200077F0C9 /* User.m in Sources */,
 				C142D2B41AC3A155000109A7 /* UIImage+Helper.m in Sources */,
 				C18AEA9E1AD2F48200A1DB7B /* ICRStore.m in Sources */,
-				72880C8D1B738973004DD99F /* SurveyPerson.m in Sources */,
 				C15295BB1B244C8E00DF60D1 /* ICRQScoreViewController.m in Sources */,
 				C123A9221B26ED85003C0C36 /* ICRQuestionManager.m in Sources */,
 				C15918801AC4362D0013B391 /* UIApplication+CheckFirstRun.m in Sources */,

XFFruit/ViewControllers/Survey/Views/SurveyResultCell.m

@@ -68,7 +68,7 @@
 
 - (void)setSurveyResult:(SurveyResult *)surveyResult{
     [self.imageBtn setBackgroundImage:[UIImage imageNamed:@"SystemImage"] forState:UIControlStateNormal];
-    self.userNameLabel.text = surveyResult.personname;
+    self.userNameLabel.text = surveyResult.userName;
     self.placeLabel.text = surveyResult.place;
     self.priceLabel.text = surveyResult.price;
     self.capacityLabel.text = surveyResult.capacity;

XFFruit/ViewControllers/Survey/controllers/ChosePersonViewController.h

@@ -8,7 +8,7 @@
 
 #import "ICRBaseViewController.h"
 
-typedef void(^ChosePerson)(NSString *name);
+typedef void(^ChosePerson)(NSArray *user);
 
 @interface ChosePersonViewController : ICRBaseViewController
 

XFFruit/ViewControllers/Survey/controllers/ChosePersonViewController.m

@@ -8,6 +8,7 @@
 
 #import "ChosePersonViewController.h"
 #import "MaskCell.h"
+#import "User.h"
 #define TopMargin 50
 #define TableHeight 50
 @interface ChosePersonViewController ()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate>
@@ -29,21 +30,11 @@
 - (void)initData{
     _dataArr = [NSMutableArray array];
     _indexArr = [NSMutableArray array];
-    [_dataArr addObject:@"张三1"];
-    [_dataArr addObject:@"小李2"];
-    [_dataArr addObject:@"小思3"];
-    [_dataArr addObject:@"王五4"];
-    [_dataArr addObject:@"李四5"];
-    [_dataArr addObject:@"张三6"];
-    [_dataArr addObject:@"小李7"];
-    [_dataArr addObject:@"小思8"];
-    [_dataArr addObject:@"王五9"];
-    [_dataArr addObject:@"李四10"];
-    [_dataArr addObject:@"张三11"];
-    [_dataArr addObject:@"小李12"];
-    [_dataArr addObject:@"小思13"];
-    [_dataArr addObject:@"王五14"];
-    [_dataArr addObject:@"李四15"];
+    for (NSInteger i = 0; i < 10; i++) {
+        User *user = [[User alloc]init];
+        user.userName = [NSString stringWithFormat:@"张三%ld",(long)i];
+        [_dataArr addObject:user];
+    }
 }
 - (void)bulidLayout
 {
@@ -80,7 +71,12 @@
 }
 
 - (void)sureClick{
-    self.chosePerson(_selectTextFiled.text);
+    NSMutableArray *arr = [[NSMutableArray alloc]init];
+    for (NSIndexPath *index in _indexArr) {
+        User *user = _dataArr[index.row];
+        [arr addObject:user];
+    }
+    self.chosePerson(arr);
     [self PopViewControllerAnimated:YES];
 }
 
@@ -112,7 +108,11 @@
     }else{
         cell.Commitbtn.hidden = YES;
     }
-    [cell setTitleStr:_dataArr[indexPath.row]];
+    if (_dataArr.count > 0) {
+        User *user =  _dataArr[indexPath.row];
+        [cell setTitleStr:user.userName];
+
+    }
     return cell;
 }
 
@@ -127,7 +127,8 @@
         
         NSString *personStr = @"";
         for (NSIndexPath *index in _indexArr) {
-           personStr = [personStr stringByAppendingFormat:@"%@、",_dataArr[index.row]];
+            User *user = _dataArr[index.row];
+           personStr = [personStr stringByAppendingFormat:@"%@、",user.userName];
         }
         _selectTextFiled.text = personStr;
     }

XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.m

@@ -14,7 +14,7 @@
 #import "StartTimeView.h"
 #import "ChosePersonViewController.h"
 #import "ChooseProductViewController.h"
-
+#import "User.h"
 #import "Survey.h"
 #define LeftMargin 15
 #define BtnHeight 44
@@ -43,16 +43,15 @@ typedef enum : NSUInteger {
     UIDatePicker *_timePicker;
     BOOL _isClickStart;
     StartTimeView *_startTimeView;
-    
-    //内容
-    NSString *_title;
-    NSString *_productUuid;
-    NSString *_productName;
-    NSString *_beginDate;
-    NSString *_endDate;
-    NSString *_remark;
-    //user对象
 }
+@property (nonatomic,strong)NSString *surveyTitle;
+@property (nonatomic,strong)NSString *productUuid;
+@property (nonatomic,strong)NSString *productName;
+@property (nonatomic,strong)NSString *beginDate;
+@property (nonatomic,strong)NSString *endDate;
+@property (nonatomic,strong)NSString *remark;
+@property (nonatomic,strong)NSMutableArray *users;
+
 @end
 
 @implementation NewSurveyViewController
@@ -64,6 +63,7 @@ typedef enum : NSUInteger {
 }
 - (void)initData{
     _dataArr = [NSMutableArray array];
+    self.users = [NSMutableArray array];
     [_dataArr addObject:@"标题"];
     [_dataArr addObject:@"商品"];
     [_dataArr addObject:@"开始日期"];
@@ -100,21 +100,9 @@ typedef enum : NSUInteger {
     switch (btn.tag) {
         case SaveTag:
         {
-            //保存
-            void(^succ)(id) = ^(id data) {
-                [IBTLoadingView hideHUDWithText:nil];
-                NSLog(@"%@",data);
-            };
-            void(^fail)(id) = ^(id data) {
-                [IBTLoadingView hideHUDWithText:nil];
-                [IBTLoadingView showTips:data];
-            };
-            NSDate *begin = [NSDate date];
-            NSDate *endDate = [NSDate date];
-            
-            NSDictionary *dict = @{@"uuid":@"sssffff",@"billnumber":@"1111",@"title":@"gdgfd",@"productUuid":@"gdgfdgd",@"productCode":@"11111",@"productName":@"gfdgfds",@"beginDate":[begin httpParameterString],@"endDate":[endDate httpParameterString],@"remark":@"范德萨范德萨",@"users":@""};
-            [IBTLoadingView showProgressLabel:@"正在保存..."];
-            [[ICRHTTPController sharedController] saveSurveyWithAuthenticode:dict success:succ failure:fail];
+            if ([self checkSurvey]) {
+                [self saveSurvey];
+            }
         }
             break;
         case CommitTag:
@@ -126,7 +114,38 @@ typedef enum : NSUInteger {
             break;
     }
 }
+- (BOOL)checkSurvey{
+    self.surveyTitle = _titleField.text;
+    self.remark = _noteTextView.text;
+    if (self.surveyTitle.length == 0 || self.productUuid.length == 0 || self.productName.length == 0 || self.users.count <=0 || self.beginDate.length == 0 || self.endDate.length == 0) {
+        UIAlertView *alert = [[UIAlertView alloc]initWithTitle:@"提示信息" message:@"信息不完整" delegate:nil cancelButtonTitle:@"确定" otherButtonTitles:nil, nil];
+        [alert show];
+        return NO;
+    }
+    return YES;
+}
+
+
+#pragma mark - 保存
+- (void)saveSurvey
+{
+    //保存
+    void(^succ)(id) = ^(id data) {
+        [IBTLoadingView hideHUDWithText:nil];
+        NSLog(@"%@",data);
+    };
+    void(^fail)(id) = ^(id data) {
+        [IBTLoadingView hideHUDWithText:nil];
+        [IBTLoadingView showTips:data];
+    };
+    NSString *beginDate = [[NSDate date] httpParameterString];
+    NSString *endDate = [[NSDate date] httpParameterString];
+
 
+    NSDictionary *dict = @{@"uuid":@"sssffff",@"billnumber":@"1111",@"title":@"gdgfd",@"productUuid":@"gdgfdgd",@"productCode":@"11111",@"productName":@"gfdgfds",@"beginDate":beginDate,@"endDate":endDate,@"remark":@"范德萨范德萨",@"users":self.users};
+    [IBTLoadingView showProgressLabel:@"正在保存..."];
+    [[ICRHTTPController sharedController] saveSurveyWithAuthenticode:dict success:succ failure:fail];
+}
 
 
 #pragma mark - 协议方法
@@ -219,8 +238,16 @@ typedef enum : NSUInteger {
         [self startDatePickView];
     }else if(indexPath.row == 4){
         ChosePersonViewController *cvc = [ChosePersonViewController new];
-        cvc.chosePerson = ^(NSString *name){
-            _personLabel.text = name;
+        cvc.chosePerson = ^(NSArray *users){
+            NSString *textStr = @"";
+            if (self.users.count <=0) {
+                [self.users removeAllObjects];
+            }
+            for (User *user in users) {
+               textStr = [textStr stringByAppendingFormat:@"%@、",user.userName];
+                [self.users addObject:[user dictForCommit]];
+            }
+            _personLabel.text = textStr;
             _personLabel.textColor = HexColor(@"444444");
         };
         cvc.isMoreChose = YES;
@@ -230,6 +257,8 @@ typedef enum : NSUInteger {
         cvc.choseProduct = ^(NSString *name){
             _productLabel.text = name;
             _productLabel.textColor = HexColor(@"444444");
+            self.productName = name;
+            self.productUuid = name;
         };
         cvc.isMoreChose = NO;
         [self PushViewController:cvc animated:YES];
@@ -262,9 +291,11 @@ typedef enum : NSUInteger {
     if (_isClickStart) {
         _startDateLabel.textColor = HexColor(@"444444");
         _startDateLabel.text = [df stringFromDate:time];
+        self.beginDate = [df stringFromDate:time];
     }else{
         _endDateLabel.textColor = HexColor(@"444444");
         _endDateLabel.text = [df stringFromDate:time];
+        self.endDate = [df stringFromDate:time];
     }
     // 关闭选择器
     [self clearDatePickView];

XFFruit/ViewControllers/Survey/controllers/ResultDetailViewController.m

@@ -30,7 +30,7 @@
     _dataArr = [NSMutableArray array];
     for (NSInteger i = 0; i < 4; i++) {
         SurveyResult *survey = [[SurveyResult alloc]init];
-        survey.personname = @"南汇8424西瓜调研情况";
+        survey.unit = @"南汇8424西瓜调研情况";
         survey.place = @"150605000001";
         survey.price = @"南汇842[100213]";
         survey.capacity = @"22222222222";

XFFruit/ViewControllers/Survey/controllers/SurveyDetailViewController.m

@@ -69,7 +69,7 @@ typedef enum : NSUInteger {
     [contentArr addObject:[IBTCommon stringFromDate:self.survey.begindate]];
     [contentArr addObject:[IBTCommon stringFromDate:self.survey.enddate]];
     [contentArr addObject:self.survey.productcode];
-    [contentArr addObject:self.survey.note];
+    [contentArr addObject:self.survey.remark];
     
     for (NSInteger i = 0 ; i < leftArr.count; i++) {
         UILabel *leftLabel = [[UILabel alloc]initWithFrame:CGRectMake(LeftMargin, CGRectGetMaxY(tagLabel.frame) + LeftHeight *i, LeftWidth, LeftHeight)];

XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m

@@ -57,7 +57,7 @@ typedef enum : NSUInteger {
         survey.billnumber = @"150605000001";
         survey.productname = @"南汇842[100213]";
         survey.productcode = @"22222222222";
-        survey.note = @"费卡接口浪格可放大文化大fdsaf缴费卡接口浪费缴费卡上就付款放假快乐撒即可书法家开发商";
+        survey.remark = @"费卡接口浪格可放大文化大fdsaf缴费卡接口浪费缴费卡上就付款放假快乐撒即可书法家开发商";
         survey.begindate = [IBTCommon convertToDateFrom:@"2015.05.25"];
         survey.enddate = [IBTCommon convertToDateFrom:@"2015.08.06"];
         [_dataArr addObject:survey];

XFFruit/ViewControllers/Survey/models/Attachment.h

@@ -6,10 +6,10 @@
 //  Copyright (c) 2015年 Xummer. All rights reserved.
 //
 
-#import "IBTObject.h"
+#import "IBTModel.h"
 
-@interface Attachment : IBTObject
-@property (nonatomic,strong)NSString *seq;//序号
+@interface Attachment : IBTModel
+@property (nonatomic,strong)NSString *fileName;//文件名
 @property (nonatomic,strong)NSString *content;//图片内容
 
 @end

XFFruit/ViewControllers/Survey/models/Survey.h

@@ -12,13 +12,20 @@
 @property (nonatomic,strong)NSString *uuid;//唯一标识
 @property (nonatomic,strong)NSString *billnumber;//调研单号
 @property (nonatomic,strong)NSString *title;//标题
+@property (nonatomic,strong)NSString *productUuid;//商品uuid
+
 @property (nonatomic,strong)NSString *productcode;//商品代码
 @property (nonatomic,strong)NSString *productname;//商品名称
 @property (nonatomic,strong)NSDate *begindate;//调研开始时间
 @property (nonatomic,strong)NSDate *enddate;//调研结束时间
-@property (nonatomic,strong)NSString *note;//备注
+@property (nonatomic,strong)NSString *remark;//备注
 @property (nonatomic,strong)NSString *state;//状态saved(未提交)，submitted(已提交)，insurvey(调研中)，finished(已完成)
-@property (nonatomic,strong)NSString *creator;//创建人姓名
-@property (nonatomic,strong)NSDate *created;//创建时间
+@property (nonatomic,strong)NSDate *create_time;//创建时间
+@property (nonatomic,strong)NSString *create_id;//创建人代码
+@property (nonatomic,strong)NSString *create_operName;//创建人名称
+@property (nonatomic,strong)NSDate *lastModified_time;//最后修改时间
+
+@property (nonatomic,strong)NSString *lastModified_id;//最后修改人代码
+@property (nonatomic,strong)NSString *lastModified_operName;//最后修改人名称
 
 @end

XFFruit/ViewControllers/Survey/models/SurveyPerson.h

-//
-//  SurveyPerson.h
-//  XFFruit
-//
-//  Created by 陈俊俊 on 15/8/6.
-//  Copyright (c) 2015年 Xummer. All rights reserved.
-//
-
-#import "IBTObject.h"
-
-@interface SurveyPerson : IBTObject
-@property (nonatomic,strong)NSString *uuid;//唯一标识
-@property (nonatomic,strong)NSString *person;//用户id
-@property (nonatomic,strong)NSString *personcode;//用户编码
-@property (nonatomic,strong)NSString *personname;//用户名称
-@property (nonatomic,assign)NSInteger *state;//状态
-
-@end

XFFruit/ViewControllers/Survey/models/SurveyResult.h

@@ -6,23 +6,19 @@
 //  Copyright (c) 2015年 Xummer. All rights reserved.
 // 行情反馈
 
-#import "IBTObject.h"
+#import "IBTModel.h"
 
-@interface SurveyResult : IBTObject
+@interface SurveyResult : IBTModel
 @property (nonatomic,strong)NSString *uuid;//唯一标识
-@property (nonatomic,strong)NSString *survey;//调研单id
-@property (nonatomic,strong)NSString *billnumber;//调研单号
-@property (nonatomic,strong)NSString *person;//用户id
-@property (nonatomic,strong)NSString *personcode;//用户编码
-@property (nonatomic,strong)NSString *personname;//用户名称
-@property (nonatomic,strong)NSString *creator;//创建人
-@property (nonatomic,strong)NSDate *created;//创建时间
+@property (nonatomic,strong)NSString *userUuid;//用户uuid
+@property (nonatomic,strong)NSString *userCode;//用户编码
+@property (nonatomic,strong)NSString *userName;//用户名称
 @property (nonatomic,strong)NSString *price;//基础单价
 @property (nonatomic,strong)NSString *unit;//基础单位
 @property (nonatomic,strong)NSString *place;//产地
 @property (nonatomic,strong)NSString *capacity;//市场容量
 @property (nonatomic,strong)NSString *quality;//质量情况
-
-@property (nonatomic,strong)NSArray *Attachment;//行情反馈附件
+@property (nonatomic,strong)NSDate *feedbackTime;//反馈时间
+@property (nonatomic,strong)NSArray *attachmnets;//附件列表
 
 @end

XFFruit/ViewControllers/Survey/models/User.h

+//
+//  Users.h
+//  XFFruit
+//
+//  Created by 陈俊俊 on 15/8/9.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "IBTModel.h"
+
+@interface User : IBTModel
+@property (nonatomic,strong)NSString *userUuid;//用户UUid
+@property (nonatomic,strong)NSString *userCode;//用户编码
+@property (nonatomic,strong)NSString *userName;//用户名称
+@end

XFFruit/ViewControllers/Survey/models/SurveyPerson.m → XFFruit/ViewControllers/Survey/models/User.m

 //
-//  SurveyPerson.m
+//  Users.m
 //  XFFruit
 //
-//  Created by 陈俊俊 on 15/8/6.
+//  Created by 陈俊俊 on 15/8/9.
 //  Copyright (c) 2015年 Xummer. All rights reserved.
 //
 
-#import "SurveyPerson.h"
+#import "User.h"
 
-@implementation SurveyPerson
+@implementation User
 
 @end