1.外勤计划提示限制

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -4707,7 +4707,7 @@
 		7D2DA53E1DF55FAF00C2C4A8 /* icon_zan_nor222.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor222.png; sourceTree = "<group>"; };
 		7D2DA53F1DF55FAF00C2C4A8 /* icon_zan_nor333.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor333.png; sourceTree = "<group>"; };
 		7D2EFB871E4C43A400962098 /* icon_dakalandian_nor3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_dakalandian_nor3.png; sourceTree = "<group>"; };
-		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "$RL2N4PN.png"; sourceTree = "<group>"; };
+		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = $RL2N4PN.png; sourceTree = "<group>"; };
 		7D2FBD6A1E683D5500A08F1F /* JLHONGDIANDetailVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JLHONGDIANDetailVC.h; path = myOA/JLHONGDIANDetailVC.h; sourceTree = "<group>"; };
 		7D2FBD6B1E683D5500A08F1F /* JLHONGDIANDetailVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JLHONGDIANDetailVC.m; path = myOA/JLHONGDIANDetailVC.m; sourceTree = "<group>"; };
 		7D2FBD6E1E6841A000A08F1F /* NumButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NumButton.h; path = myOA/NumButton.h; sourceTree = "<group>"; };
@@ -20005,10 +20005,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -20049,10 +20049,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -20081,16 +20081,16 @@
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_ENTITLEMENTS = shiku_im/shiku_im.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer: QUANMING LV (83764JWNLL)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer: QUANMING LV (83764JWNLL)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: QUANMING LV (83764JWNLL)";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
+				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20114,18 +20114,18 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "shiku_im/shiku_im-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					"$DOUBANGO_HOME/bindings/_common",
-					"$DOUBANGO_HOME/tinySDP/include",
-					"$DOUBANGO_HOME/tinyHTTP/include",
-					"$DOUBANGO_HOME/tinySMS/include",
-					"$DOUBANGO/HOME/tinyMSRP/include",
+					$DOUBANGO_HOME/bindings/_common,
+					$DOUBANGO_HOME/tinySDP/include,
+					$DOUBANGO_HOME/tinyHTTP/include,
+					$DOUBANGO_HOME/tinySMS/include,
+					$DOUBANGO/HOME/tinyMSRP/include,
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					"$DOUBANGO_HOME/tinyDAV/include",
-					"$DOUBANGO_HOME/tinySAK/src",
-					"$DOUBANGO_HOME/tinyNET/src",
-					"$DOUBANGO_HOME/tinyMEDIA/include",
-					"$DOUBANGO_HOME/tinySIP/include",
+					$DOUBANGO_HOME/tinyDAV/include,
+					$DOUBANGO_HOME/tinySAK/src,
+					$DOUBANGO_HOME/tinyNET/src,
+					$DOUBANGO_HOME/tinyMEDIA/include,
+					$DOUBANGO_HOME/tinySIP/include,
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20156,8 +20156,48 @@
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay",
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay(支付宝)",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/shiku_im/LibBPush $(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/audioRecorder $(PROJECT_DIR)/shiku_im/RSA/include $(PROJECT_DIR)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im $(PROJECT_DIR) $(PROJECT_DIR)/shiku_im/controller/MapChoseLocation $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited) $DOUBANGO_LIBS $(SRCROOT)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/youMeng $(PROJECT_DIR)/shiku_im/audioRecorder $(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
+				"LIBRARY_SEARCH_PATHS[arch=*]" = (
+					"$(PROJECT_DIR)/shiku_im/LibBPush",
+					"$(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib",
+					"$(PROJECT_DIR)/shiku_im/audioRecorder",
+					"$(PROJECT_DIR)/shiku_im/RSA/include",
+					"$(PROJECT_DIR)/shiku_im/Vendor/libidn",
+					"$(PROJECT_DIR)/shiku_im/RSA",
+					"$(PROJECT_DIR)/shiku_im/admob5.05",
+					"$(PROJECT_DIR)/shiku_im",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/shiku_im/controller/MapChoseLocation",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
+					"$(inherited)",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
+				);
+				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
+					"$(inherited)",
+					$DOUBANGO_LIBS,
+					"$(SRCROOT)/shiku_im/Vendor/libidn",
+					"$(PROJECT_DIR)/shiku_im/RSA",
+					"$(PROJECT_DIR)/shiku_im/youMeng",
+					"$(PROJECT_DIR)/shiku_im/audioRecorder",
+					"$(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib",
+					"$(PROJECT_DIR)/shiku_im/admob5.05",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
+					"$(inherited)",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
+				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -20198,16 +20238,16 @@
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_ENTITLEMENTS = shiku_im/shiku_im.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer: QUANMING LV (83764JWNLL)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer: QUANMING LV (83764JWNLL)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: QUANMING LV (83764JWNLL)";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
+				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20233,16 +20273,16 @@
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					"$DOUBANGO_HOME/tinyDAV/include",
-					"$DOUBANGO_HOME/tinySAK/src",
-					"$DOUBANGO_HOME/tinyNET/src",
-					"$DOUBANGO_HOME/tinyMEDIA/include",
-					"$DOUBANGO/HOME/tinyMSRP/include",
-					"$DOUBANGO_HOME/tinySIP/include",
-					"$DOUBANGO_HOME/tinyHTTP/include",
-					"$DOUBANGO_HOME/tinySMS/include",
-					"$DOUBANGO_HOME/tinySDP/include",
-					"$DOUBANGO_HOME/bindings/_common",
+					$DOUBANGO_HOME/tinyDAV/include,
+					$DOUBANGO_HOME/tinySAK/src,
+					$DOUBANGO_HOME/tinyNET/src,
+					$DOUBANGO_HOME/tinyMEDIA/include,
+					$DOUBANGO/HOME/tinyMSRP/include,
+					$DOUBANGO_HOME/tinySIP/include,
+					$DOUBANGO_HOME/tinyHTTP/include,
+					$DOUBANGO_HOME/tinySMS/include,
+					$DOUBANGO_HOME/tinySDP/include,
+					$DOUBANGO_HOME/bindings/_common,
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20250,7 +20290,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$DOUBANGO_LIBS",
+					$DOUBANGO_LIBS,
 					"$(SRCROOT)/shiku_im/Vendor/libidn",
 					"$(PROJECT_DIR)/shiku_im/RSA",
 					"$(PROJECT_DIR)/shiku_im/youMeng",

shiku_im/shiku_im.xcodeproj/xcshareddata/xcschemes/shiku_im.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8409055517B693CF00F5C28D"
+               BuildableName = "shiku_im.app"
+               BlueprintName = "shiku_im"
+               ReferencedContainer = "container:shiku_im.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8409055517B693CF00F5C28D"
+            BuildableName = "shiku_im.app"
+            BlueprintName = "shiku_im"
+            ReferencedContainer = "container:shiku_im.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8409055517B693CF00F5C28D"
+            BuildableName = "shiku_im.app"
+            BlueprintName = "shiku_im"
+            ReferencedContainer = "container:shiku_im.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8409055517B693CF00F5C28D"
+            BuildableName = "shiku_im.app"
+            BlueprintName = "shiku_im"
+            ReferencedContainer = "container:shiku_im.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

shiku_im/shiku_im/controller/myOA/WorkTools/UASWorkManager.m

@@ -573,7 +573,7 @@
     
 }
 
-
+//更新最新的数据，把服务器清除的单据在本地删除，新增的数据加入
 -(void)operationObjectWithArray:(NSArray *)arr dict:(NSDictionary *)dict{
     
     
@@ -918,7 +918,7 @@
 
 -(void)erpOutPlanAutoPunch{
     
-    
+    //是否在境内
     if ([UASUserInfo shareManager].inRegion) {
         
         //如果是手动外勤，定位时间为5S
@@ -1021,7 +1021,7 @@
         //遍历取最适合打卡的对象
         OutWorkModel * modelPun = nil;
         int dist = INT_MAX;
-        
+        //
         for (int i=0; i<self.outPlanArr.count; i++)
         {//先取最近的点
             
@@ -1067,7 +1067,7 @@
             for(int i=0;i<self.outPlanArr.count;i++){
                 
                 OutWorkModel *temp = self.outPlanArr[i];
-                
+                //1:已执行签到 2：全天执行一次签退  3：全天已执行第二次签到
                 if ([temp.JO_STATUS isEqualToString:@"1"] || [temp.JO_STATUS isEqualToString:@"3"]) {
                     
                     model = temp;
@@ -1101,7 +1101,7 @@
                 }
                 
                 
-                
+            //不在签到范围内，但是也不满足签退条件
             }else if([model.JO_STATUS isEqualToString:@"0"] || [model.JO_STATUS isEqualToString:@""]){
                 
                 subTitle = [NSString stringWithFormat:@"拜访%@，相距%d米，超过考勤范围：%@米",reCoModel.MPD_COMPANY,dist,self.outArr[1]];
@@ -1215,7 +1215,7 @@
             
         }
         
-    }else{
+    }else{//取出的数据不符合规范
         
         
         if (self.autoOutPlan) {
@@ -1422,8 +1422,6 @@
                     } completed:^{
                         
                         
-                        [self createMsgTableWithTableName];
-                        
                         [self createMsgTableWithTableName];
                         
                         NSString * times=[self getLongCurrenTime];
@@ -1501,39 +1499,39 @@
                         }];
                         
                     } completed:^{
-                        
-                        [self createMsgTableWithTableName];
-                        
-                        NSString * times=[self getLongCurrenTime];
-                        
-                        NSString *remind = @"";
-                        
-                        if (self.autoOutPlan) {
-                            
-                            remind = @"自动外勤签到提醒";
-                            
-                        }else{
-                            
-                            remind = @"手动外勤签到提醒";
-                            
-                        }
-                        
-                        NSDictionary * dict = [NSDictionary dictionaryWithObjectsAndKeys:
-                                               times,@"createTime",
-                                               FORMAT(@"%d",[self getRandomIdFromSys]),@"id",
-                                               remind,@"title",
-                                               [NSString stringWithFormat:@"拜访%@签到成功",model.MPD_COMPANY],@"subTitle",
-                                               userName,@"releaser",
-                                               @"kpi",@"JO_TYPE",
-                                               @"未读",@"JO_STATUS",
-                                               g_master,@"JO_ZHANGTAO",
-                                               g_emcode,@"JO_UUID",
-                                               
-                                               nil];
-                        
-                        
-                        [self saveNeiqingData:dict];
-                        
+                        //记录状态不产生显示日志
+//                        [self createMsgTableWithTableName];
+//
+//                        NSString * times=[self getLongCurrenTime];
+//
+//                        NSString *remind = @"";
+//
+//                        if (self.autoOutPlan) {
+//
+//                            remind = @"自动外勤签到提醒";
+//
+//                        }else{
+//
+//                            remind = @"手动外勤签到提醒";
+//
+//                        }
+//
+//                        NSDictionary * dict = [NSDictionary dictionaryWithObjectsAndKeys:
+//                                               times,@"createTime",
+//                                               FORMAT(@"%d",[self getRandomIdFromSys]),@"id",
+//                                               remind,@"title",
+//                                               [NSString stringWithFormat:@"拜访%@签到成功",model.MPD_COMPANY],@"subTitle",
+//                                               userName,@"releaser",
+//                                               @"kpi",@"JO_TYPE",
+//                                               @"未读",@"JO_STATUS",
+//                                               g_master,@"JO_ZHANGTAO",
+//                                               g_emcode,@"JO_UUID",
+//
+//                                               nil];
+//
+//
+//                        [self saveNeiqingData:dict];
+//
                         if (self.autoOutPlan) {//如果是自动外勤，再次记录不需要提示
                             
                             return;
@@ -1638,9 +1636,9 @@
         
         
         if (self.autoOutPlan && ([model.JO_STATUS isEqualToString:@"0"] || model.JO_STATUS.length == 0 || [model.JO_STATUS isEqualToString:@"2"] || [switchs isEqualToString:@"签退"])) {
-            //只有首次签到才需要提示
+            //只有首次签到才需要弹框提示
             AppDelegate *delegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
-            
+            //插入数据库时，只有签到签退两种状态，此处深拷贝一份，不影响原先的状态
             NSString *statusStr = [switchs mutableCopy];
             
             if ([statusStr isEqualToString:@"记录"]) {
@@ -1710,6 +1708,7 @@
                         
                         [self saveNeiqingData:dict];
                         
+                        
                         [MBProgressHUD hideHUD];
                         
                         AppDelegate *delegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
@@ -1776,7 +1775,7 @@
                         
                         
                         [self saveNeiqingData:dict];
-                        
+                            
                         [MBProgressHUD hideHUD];
                         
                         if ([model.JO_STATUS isEqualToString:@"0"] || model.JO_STATUS.length == 0 || (!self.autoOutPlan)) {
@@ -1848,7 +1847,7 @@
                         
                         
                         [self saveNeiqingData:dict];
-                        
+                            
                         [MBProgressHUD hideHUD];
                         
                         if ([model.JO_STATUS isEqualToString:@"0"] || model.JO_STATUS.length == 0 || (!self.autoOutPlan)) {
@@ -1920,7 +1919,7 @@
                         
                         
                         [self saveNeiqingData:dict];
-                        
+                            
                         [MBProgressHUD hideHUD];
                         
                         AppDelegate *delegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
@@ -1947,34 +1946,35 @@
             
             [self createMsgTableWithTableName];
             
-            NSString * times=[self getLongCurrenTime];
-            
-            NSString *remind = @"";
-            
-            if (self.autoOutPlan) {
-                
-                remind = @"自动外勤签到提醒";
-                
-            }else{
-                
-                remind = @"手动外勤签到提醒";
-                
-            }
-            
-            NSDictionary * dict = [NSDictionary dictionaryWithObjectsAndKeys:
-                                   times,@"createTime",
-                                   FORMAT(@"%d",[self getRandomIdFromSys]),@"id",
-                                   remind,@"title",
-                                   [NSString stringWithFormat:@"拜访%@签到成功",model.MPD_COMPANY],@"subTitle",
-                                   userName,@"releaser",
-                                   @"kpi",@"JO_TYPE",
-                                   @"未读",@"JO_STATUS",
-                                   g_master,@"JO_ZHANGTAO",
-                                   g_emcode,@"JO_UUID",
-                                   nil];
-            
-            
-            [self saveNeiqingData:dict];
+            //记录时，不需要记录
+//            NSString * times=[self getLongCurrenTime];
+//
+//            NSString *remind = @"";
+//
+//            if (self.autoOutPlan) {
+//
+//                remind = @"自动外勤签到提醒";
+//
+//            }else{
+//
+//                remind = @"手动外勤签到提醒";
+//
+//            }
+            
+//            NSDictionary * dict = [NSDictionary dictionaryWithObjectsAndKeys:
+//                                   times,@"createTime",
+//                                   FORMAT(@"%d",[self getRandomIdFromSys]),@"id",
+//                                   remind,@"title",
+//                                   [NSString stringWithFormat:@"拜访%@签到成功",model.MPD_COMPANY],@"subTitle",
+//                                   userName,@"releaser",
+//                                   @"kpi",@"JO_TYPE",
+//                                   @"未读",@"JO_STATUS",
+//                                   g_master,@"JO_ZHANGTAO",
+//                                   g_emcode,@"JO_UUID",
+//                                   nil];
+//
+//
+//            [self saveNeiqingData:dict];
             
             [MBProgressHUD hideHUD];
             
@@ -2999,35 +2999,35 @@
                 
                 [self createMsgTableWithTableName];
                 
-                NSString * times=[self getLongCurrenTime];
-                
-                NSString *remind = @"";
-                
-                if (self.autoOutPlan) {
-                    
-                    remind = @"自动外勤签到提醒";
-                    
-                }else{
-                    
-                    remind = @"手动外勤签到提醒";
-                    
-                }
-                
-                NSDictionary * dict = [NSDictionary dictionaryWithObjectsAndKeys:
-                                       times,@"createTime",
-                                       FORMAT(@"%d",[self getRandomIdFromSys]),@"id",
-                                       remind,@"title",
-                                       [NSString stringWithFormat:@"拜访%@签退成功",model.MPD_COMPANY],@"subTitle",
-                                       userName,@"releaser",
-                                       @"kpi",@"JO_TYPE",
-                                       @"未读",@"JO_STATUS",
-                                       g_master,@"JO_ZHANGTAO",
-                                       g_emcode,@"JO_UUID",
-                                       
-                                       nil];
-                
-                
-                [self saveNeiqingData:dict];
+//                NSString * times=[self getLongCurrenTime];
+//
+//                NSString *remind = @"";
+//
+//                if (self.autoOutPlan) {
+//
+//                    remind = @"自动外勤签到提醒";
+//
+//                }else{
+//
+//                    remind = @"手动外勤签到提醒";
+//
+//                }
+//
+//                NSDictionary * dict = [NSDictionary dictionaryWithObjectsAndKeys:
+//                                       times,@"createTime",
+//                                       FORMAT(@"%d",[self getRandomIdFromSys]),@"id",
+//                                       remind,@"title",
+//                                       [NSString stringWithFormat:@"拜访%@签退成功",model.MPD_COMPANY],@"subTitle",
+//                                       userName,@"releaser",
+//                                       @"kpi",@"JO_TYPE",
+//                                       @"未读",@"JO_STATUS",
+//                                       g_master,@"JO_ZHANGTAO",
+//                                       g_emcode,@"JO_UUID",
+//
+//                                       nil];
+//
+//
+//                [self saveNeiqingData:dict];
                 
                 if (self.autoOutPlan) {//自动外勤不需要提示