行情调研接口修改

XFFruit.xcodeproj/project.pbxproj

@@ -346,6 +346,7 @@
 		C1FE50561AE3587F00C18080 /* ICRAttachmentUnit.m in Sources */ = {isa = PBXBuildFile; fileRef = C1FE50551AE3587F00C18080 /* ICRAttachmentUnit.m */; };
 		C1FE50571AE3587F00C18080 /* ICRAttachmentUnit.m in Sources */ = {isa = PBXBuildFile; fileRef = C1FE50551AE3587F00C18080 /* ICRAttachmentUnit.m */; };
 		FE0C9B091B7C543D00335B39 /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = FE0C9B081B7C543D00335B39 /* User.m */; };
+		FE17F6791B85847D0078CE96 /* QueryOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = FE17F6781B85847D0078CE96 /* QueryOrder.m */; };
 		FE2FCC7F1B74511000BBC6FB /* ChooseProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC7E1B74511000BBC6FB /* ChooseProductViewController.m */; };
 		FE2FCC821B745E1A00BBC6FB /* SurveyDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC811B745E1A00BBC6FB /* SurveyDetailViewController.m */; };
 		FE2FCC881B7492C500BBC6FB /* ResultDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC871B7492C500BBC6FB /* ResultDetailViewController.m */; };
@@ -748,6 +749,8 @@
 		C1FE50551AE3587F00C18080 /* ICRAttachmentUnit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRAttachmentUnit.m; sourceTree = "<group>"; };
 		FE0C9B071B7C543D00335B39 /* User.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = User.h; path = ../Views/User.h; sourceTree = "<group>"; };
 		FE0C9B081B7C543D00335B39 /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = User.m; path = ../Views/User.m; sourceTree = "<group>"; };
+		FE17F6771B85847D0078CE96 /* QueryOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryOrder.h; sourceTree = "<group>"; };
+		FE17F6781B85847D0078CE96 /* QueryOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueryOrder.m; sourceTree = "<group>"; };
 		FE2FCC7D1B74511000BBC6FB /* ChooseProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseProductViewController.h; sourceTree = "<group>"; };
 		FE2FCC7E1B74511000BBC6FB /* ChooseProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseProductViewController.m; sourceTree = "<group>"; };
 		FE2FCC801B745E1A00BBC6FB /* SurveyDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurveyDetailViewController.h; sourceTree = "<group>"; };
@@ -873,6 +876,8 @@
 				72F56CB11B76EC200077F0C9 /* SurveyUser.m */,
 				FE7155D71B7B328400595B0A /* Product.h */,
 				FE7155D81B7B328400595B0A /* Product.m */,
+				FE17F6771B85847D0078CE96 /* QueryOrder.h */,
+				FE17F6781B85847D0078CE96 /* QueryOrder.m */,
 			);
 			name = Models;
 			path = models;
@@ -2148,6 +2153,7 @@
 				30ECD6241B00948A0088C57A /* ICRPatrolPlanCellContentView.m in Sources */,
 				C123A9291B26EDDA003C0C36 /* ICRQInputPopup.m in Sources */,
 				30D702421ADE37D3008DC0BF /* ICRAnnouncementDetailViewController.m in Sources */,
+				FE17F6791B85847D0078CE96 /* QueryOrder.m in Sources */,
 				C15039221ADE39190081A686 /* IBTUIControl.m in Sources */,
 				C112BC4D1AD91CF800F75F58 /* ICRPatrolDetailViewController.m in Sources */,
 				C142D2BC1AC3A155000109A7 /* UITableViewCell+Helper.m in Sources */,
@@ -2368,7 +2374,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -2406,7 +2412,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -2430,7 +2436,7 @@
 					"$(PROJECT_DIR)",
 				);
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -2451,7 +2457,7 @@
 					"$(PROJECT_DIR)",
 				);
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;
@@ -2474,7 +2480,7 @@
 				INFOPLIST_FILE = XFFruitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = XFFruitTests;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
@@ -2494,7 +2500,7 @@
 				INFOPLIST_FILE = XFFruitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = XFFruitTests;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -1327,7 +1327,7 @@ acceptTypeJson:YES
     NSDictionary *dict = data;
     NSString *currentTime = [[NSDate date] httpParameterString];
     ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
-    NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveySave] stringByAppendingFormat:@"?time=%@&operId=%@&operName=%@",currentTime,userUtil.userCode,userUtil.displayName];
+    NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveySave] stringByAppendingFormat:@"?time=%@&operId=%@&operName=%@",currentTime,userUtil.userId,userUtil.displayName];
     NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     [self POST:encodeUrlStr
     parameters:dict
@@ -1559,7 +1559,7 @@ acceptTypeJson:YES
     };
     NSString *currentTime = [[NSDate date] httpParameterString];
     ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
-    NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveyFinish] stringByAppendingFormat:@"/%@?version=%@&time=%@&operId=%@&operName=%@",uuid,version,currentTime,userUtil.userCode,userUtil.displayName];
+    NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveyFinish] stringByAppendingFormat:@"/%@?version=%@&time=%@&operId=%@&operName=%@",uuid,version,currentTime,userUtil.userId,userUtil.displayName];
     NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     [self POST:encodeUrlStr
    parameters:nil

XFFruit/ViewControllers/Home/ICRHomeViewController.m

@@ -143,11 +143,11 @@
             break;
         case kFunctionMyShop:
         {
-//            ICRStoreListViewController *sVC = [[ICRStoreListViewController alloc] initWithBHaveToChooseOne:NO];
-//            sVC.title = [IBTCommon localizableString:@"MyStore"];
-//            sVC.m_delegate = self;
-//            [self PushViewController:sVC animated:YES];
-            AddWorkSheetViewController *sVC = [[AddWorkSheetViewController alloc] init];
+            ICRStoreListViewController *sVC = [[ICRStoreListViewController alloc] initWithBHaveToChooseOne:NO];
+            sVC.title = [IBTCommon localizableString:@"MyStore"];
+            sVC.m_delegate = self;
+            [self PushViewController:sVC animated:YES];
+//            AddWorkSheetViewController *sVC = [[AddWorkSheetViewController alloc] init];
             [self PushViewController:sVC animated:YES];
         }
             break;

XFFruit/ViewControllers/Survey/Views/SurveyListCell.m

@@ -31,8 +31,8 @@
 {
     self.stateBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
-//    self.stateBtn.titleLabel.font = FontSize(ContentSize);
-//    [self.stateBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    self.stateBtn.titleLabel.font = FontSize(ContentSize);
+    [self.stateBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     self.stateBtn.enabled = NO;
     
     self.titleLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, TopMargin, ScreenSize.width - LeftMargin, TitleHeight))];
@@ -76,26 +76,22 @@
     self.productnameLabel.text = [NSString stringWithFormat:@"商品：%@[%@]",survey.productName,survey.productCode];
     self.begindateLabel.text = [NSString stringWithFormat:@"开始时间：%@",[survey.beginDate substringToIndex:10]];
     self.enddateLabel.text = [NSString stringWithFormat:@"结束时间：%@",[survey.endDate substringToIndex:10]];
-//    NSString *stateStr = @"";
+    NSString *stateStr = @"";
     if ([survey.state isEqualToString:@"initial"]) {
-//        [self.stateBtn setBackgroundColor:[UIColor redColor]];
-//        stateStr = @"未提交";
-        [self.stateBtn setImage:[UIImage imageNamed:@"initial"]  forState:UIControlStateDisabled];
+        stateStr = @"未提交";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"]  forState:UIControlStateDisabled];
     }else if ([survey.state isEqualToString:@"submitted"]) {
-//        [self.stateBtn setBackgroundColor:[UIColor greenColor]];
-//        stateStr = @"已提交";
-        [self.stateBtn setImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
+        stateStr = @"已提交";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
     }else if ([survey.state isEqualToString:@"insurvey"]) {
-//        [self.stateBtn setBackgroundColor:[UIColor grayColor]];
-//        stateStr = @"调研中";
-        [self.stateBtn setImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
+        stateStr = @"调研中";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
         
     }else if ([survey.state isEqualToString:@"finished"]) {
-//        [self.stateBtn setBackgroundColor:[UIColor blackColor]];
-//        stateStr = @"已完成";
-        [self.stateBtn setImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+        stateStr = @"已完成";
+        [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
     }
-//    [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
+    [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
     
 }
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m

@@ -13,6 +13,8 @@
 #import "BoltMaskView.h"
 #import "SurveyDetailViewController.h"
 #import "NewSurveyViewController.h"
+#import "QueryOrder.h"
+
 
 #define TopMargin 44
 #define TableHeight 120
@@ -84,53 +86,51 @@ typedef enum : NSUInteger {
     ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
     
     id orderFieldObject =  [NSNull null];
-    NSString *firstOrder = @"";
-    id orderObject = [NSNull null];
     NSMutableArray *orderArr =[NSMutableArray array];
     if (self.orderDirection.length > 0) {
-        orderObject = self.orderDirection;
-        firstOrder = @"lastModified";
-        [orderArr addObject:@"lastModified"];
+        QueryOrder *order = [QueryOrder new];
+        order.field = @"lastModified";
+        order.direction = self.orderDirection;
+        [orderArr addObject:[order dictForCommit]];
     }
     id billObject = [NSNull null];
     if (self.billNumberLike.length > 0) {
         billObject = self.billNumberLike;
-        if ([firstOrder isEqualToString: @"lastModified"]) {
-            [orderArr addObject:@"billNumber"];
+        if (self.orderDirection.length > 0) {
+            QueryOrder *order = [QueryOrder new];
+            order.field = @"billNumber";
+            order.direction = self.orderDirection;
+            [orderArr addObject:[order dictForCommit]];
         }
     }
     id stateObject = [NSNull null];
     if (self.state.length > 0 && ![self.state isEqualToString:@"none"]) {
         stateObject = self.state;
-        if ([firstOrder isEqualToString: @"lastModified"]) {
-            [orderArr addObject:@"state"];
+        if (self.orderDirection.length > 0) {
+            QueryOrder *order = [QueryOrder new];
+            order.field = @"state";
+            order.direction = self.orderDirection;
+            [orderArr addObject:[order dictForCommit]];
         }
     }
     id titleObject = [NSNull null];
     if (self.titleLike.length > 0) {
         titleObject = self.titleLike;
-        if ([firstOrder isEqualToString: @"lastModified"]) {
-            [orderArr addObject:@"title"];
-        }
-    }
-    
-    if (orderArr.count > 0) {
-        NSString *str = @"";
-        for (NSString *order in orderArr) {
-            str = [str stringByAppendingFormat:@"%@,",order];
+        if (self.orderDirection.length > 0) {
+            QueryOrder *order = [QueryOrder new];
+            order.field = @"title";
+            order.direction = self.orderDirection;
+            [orderArr addObject:[order dictForCommit]];
         }
-        orderFieldObject = str;
     }
-    NSLog(@"%@",orderFieldObject);
     NSDictionary *dict = @{
                            @"billNumberLike":billObject,
                            @"state":stateObject,
                            @"titleLike":titleObject,
-                           @"orderField":[NSNull null],
-                           @"orderDirection":orderObject,
+                           @"queryOrders":orderArr,
                            @"userUuid":userUtil.userId,
                            @"pageNumber":@(0),
-                           @"pageSize":@(20)};
+                           @"pageSize":@(100)};
     [[ICRHTTPController sharedController] querySurveyWithBillData:dict success:succ failure:fail];
 }
 #pragma mark -成功

XFFruit/ViewControllers/Survey/models/QueryOrder.h

+//
+//  QueryOrder.h
+//  XFFruit
+//
+//  Created by n22 on 15/8/20.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "IBTModel.h"
+
+@interface QueryOrder : IBTModel
+@property (nonatomic,strong)NSString *field;
+@property (nonatomic,strong)NSString *direction;//升序
+@end

XFFruit/ViewControllers/Survey/models/QueryOrder.m

+//
+//  QueryOrder.m
+//  XFFruit
+//
+//  Created by n22 on 15/8/20.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "QueryOrder.h"
+
+@implementation QueryOrder
+
+@end

XFFruit/ViewControllers/WorkSheet/Controllers/MaterialVIewController.m

@@ -69,6 +69,7 @@
     MaterialCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
     if (cell == nil) {
         cell = [[MaterialCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+        cell.selectionStyle = UITableViewCellSelectionStyleNone;
     }
     if (indexPath.row != _currentRow) {
         CGRect Linefrmame = cell.lineLabel.frame;
@@ -113,7 +114,7 @@
         Linefrmame.origin.y = TableHeight -1;
         showfrmame.size.height = 0;
         cell.showView.hidden = YES;
-        cell.backgroundColor = XXFBgColor;
+        cell.backgroundColor = [UIColor whiteColor];
 
     }
     cell.lineLabel.frame = Linefrmame;