Commit 680172fc by carrieyzzhang

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

parents e7cb3069 058ccb56
...@@ -3,11 +3,13 @@ package com.reyun.task; ...@@ -3,11 +3,13 @@ package com.reyun.task;
import com.reyun.model.Account; import com.reyun.model.Account;
import com.reyun.repository.AccountRepository; import com.reyun.repository.AccountRepository;
import com.reyun.service.AccountFlowRestrictService; import com.reyun.service.AccountFlowRestrictService;
import com.reyun.util.DateUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -27,9 +29,16 @@ public class AutoCalculateFlow { ...@@ -27,9 +29,16 @@ public class AutoCalculateFlow {
try{ try{
List<Account> superAccount = accountRepository.findSuperAccount(); List<Account> superAccount = accountRepository.findSuperAccount();
for(Account account:superAccount){ for(Account account:superAccount){
//System.out.println("**********************************************\n\n"); String pastDate1 = account.getPastDate();
accountFlowRestrictService.RestrictFlowByAccountTask(account.getId()); String pastDate5 = DateUtil.getBeforeDays(pastDate1, -5);
//System.out.println("**********************************************\n\n"); 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){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
......
...@@ -2049,7 +2049,7 @@ ...@@ -2049,7 +2049,7 @@
$scope.list = data; $scope.list = data;
$scope.noreadList = $scope.list.filter(function(item){ $scope.noreadList = $scope.list.filter(function(item){
return item.isRead === false; return item.isRead != true;
}) })
}); });
...@@ -2072,7 +2072,7 @@ ...@@ -2072,7 +2072,7 @@
$scope.isDetail = true; $scope.isDetail = true;
$scope.noreadList = $scope.list.filter(function(item){ $scope.noreadList = $scope.list.filter(function(item){
return item.isRead === false; return item.isRead != true;
}) })
} }
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
return "succ" return "succ"
} }
}, },
obj={ obj={
isNull:function(option){ isNull:function(option){
var options={ var options={
val:option.val, val:option.val,
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
var options={ var options={
val:option.val, val:option.val,
max:option.max || 96, max:option.max || 96,
reg:/^[a-zA-Z0-9_\-\u4E00-\u9FA5]+$/, reg:/^[a-zA-Z0-9_\s\-\u4E00-\u9FA5\(\)\(\)]+$/,
regFlag:false, regFlag:false,
regTxt:option.txt || optionTxt.errorCompany regTxt:option.txt || optionTxt.errorCompany
} }
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
} }
return fn(options); return fn(options);
}, },
pwd:function(option){ pwd:function(option){
var options={ var options={
val:option.val, val:option.val,
// min:6, // min:6,
...@@ -290,12 +290,12 @@ ...@@ -290,12 +290,12 @@
if(infoObj[i].txt != "succ"){ if(infoObj[i].txt != "succ"){
infoObj[i].status = true; infoObj[i].status = true;
} }
if(infoObj[i].status=="true"){ if(infoObj[i].status=="true"){
document.getElementById(i).focus(); document.getElementById(i).focus();
var top=document.getElementById(i).offsetTop var top=document.getElementById(i).offsetTop
document.documentElement.scrollTop=top-70; document.documentElement.scrollTop=top-70;
break break
} }
} }
}else{ }else{
...@@ -305,4 +305,4 @@ ...@@ -305,4 +305,4 @@
} }
return infoObj return infoObj
} }
})(); })();
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment