Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/java/com/reyun/task/AutoCalculateFlow.java

@@ -3,11 +3,13 @@ package com.reyun.task;
 import com.reyun.model.Account;
 import com.reyun.repository.AccountRepository;
 import com.reyun.service.AccountFlowRestrictService;
+import com.reyun.util.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,9 +29,16 @@ public class AutoCalculateFlow {
         try{
             List<Account> superAccount = accountRepository.findSuperAccount();
             for(Account account:superAccount){
-                //System.out.println("**********************************************\n\n");
-                accountFlowRestrictService.RestrictFlowByAccountTask(account.getId());
-                //System.out.println("**********************************************\n\n");
+                String pastDate1 = account.getPastDate();
+                String pastDate5 = DateUtil.getBeforeDays(pastDate1, -5);
+                Date pastDate = DateUtil.parseDate(pastDate5);
+                if(DateUtil.compareDate(pastDate, new Date())!=-1){
+                    try{
+                        accountFlowRestrictService.RestrictFlowByAccountTask(account.getId());
+                    }catch (Exception e){
+                        logger.info(e.getMessage());
+                    }
+                }
             }
         }catch(Exception e){
             e.printStackTrace();

src/main/websrc/js/app/directive.js

@@ -2049,7 +2049,7 @@
 			        		$scope.list = data;
 
 									$scope.noreadList = $scope.list.filter(function(item){
- 									 	return item.isRead === false;
+ 									 	return item.isRead != true;
  								 })
 
 			        	});
@@ -2072,7 +2072,7 @@
 								$scope.isDetail = true;
 
 								$scope.noreadList = $scope.list.filter(function(item){
-									return item.isRead === false;
+									return item.isRead != true;
 							 })
 			        }
 

src/main/websrc/js/common/judge.js

@@ -32,7 +32,7 @@
 			return "succ"
 		}
 	},
-	obj={		
+	obj={
 		isNull:function(option){
 			var options={
 				val:option.val,
@@ -128,7 +128,7 @@
 			var options={
 				val:option.val,
 				max:option.max || 96,
-				reg:/^[a-zA-Z0-9_\-\u4E00-\u9FA5]+$/,
+				reg:/^[a-zA-Z0-9_\s\-\u4E00-\u9FA5\(\)\（\）]+$/,
 				regFlag:false,
 				regTxt:option.txt || optionTxt.errorCompany
 			}
@@ -237,7 +237,7 @@
 			}
 			return fn(options);
 		},
-		pwd:function(option){			
+		pwd:function(option){
 			var options={
 				val:option.val,
 				// min:6,
@@ -290,12 +290,12 @@
 				if(infoObj[i].txt != "succ"){
 					infoObj[i].status = true;
 				}
-				
+
 				if(infoObj[i].status=="true"){
 					document.getElementById(i).focus();
 					var top=document.getElementById(i).offsetTop
 					document.documentElement.scrollTop=top-70;
-					break 
+					break
 				}
 			}
 		}else{
@@ -305,4 +305,4 @@
 		}
 		return infoObj
 	}
-})();
\ No newline at end of file
+})();