Commit a9b75cec by youling Committed by chenzg

定时器

parent 59e50232
......@@ -271,19 +271,26 @@ public class AttendanceTaskTiming{
sdf1.setLenient(false);
int y = 0,q = 0,jj = 0,xx = 0;//jj:节假日
String[] zdxx = new String[31];//法定休息的具体天数(yyyy-MM-dd)
for(int i = 1; i <= ClockInTool.getDaysByYearMonth(year,month); i++){
log.error("ClockInTool:" + i);
int wd = ClockInTool.getDaysByYearMonth(year,month);
log.error("ClockInTool:" + wd);
for(int i = 1; i <= wd; i++){
boolean xixi = true;
Date date1 = sdf1.parse(yemo + "-" + i);
for(int u=0;u<week.length;u++){
log.error("week:" + u);
if(sdf2.format(date1).equals(week[u])){
String webbuf = sdf2.format(date1);
log.error("webbuf:" + webbuf + " week[u]:" + week[u]);
if(webbuf.equals(week[u])){
q++;
y++;
log.error("appmaps: " + appmaps.toString());
if(Arrays.asList(appmaps).contains(String.valueOf(sdf1.format(date1)))){
y = y-1;
}
log.error("getIsFdjjr: " + attgro.getIsFdjjr());
if(attgro.getIsFdjjr().equals(1111)) {
if(Arrays.asList(holidays).contains(String.valueOf(sdf1.format(date1)))){
y = y-1;
......
......@@ -154,7 +154,7 @@ pagehelper:
logging:
level:
root: info
cn.timer.api.dao: error
cn.timer.api.dao: debug
pattern:
console: '--%p--%m%n'
......
spring:
profiles:
active: '@environment@'
\ No newline at end of file
active: test
# active: '@environment@'
\ No newline at end of file
......@@ -6,7 +6,7 @@
<!--3、设置变量 用来定义变量值的标签, 有两个属性,name和value;其中name的值是变量的名称,value的值时变量定义的值。 通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
<!--<property name="log.path" value="/logs/logback.log" /> -->
<!--<property name="log.path" value="/logs/logback" /> -->
<property name="logback.logdir" value="/deploy/logs/" />
<property name="logback.logdir" value="../" />
<property name="logback.appname" value="8timer-api" />
<!--4、appender用来格式化日志输出节点,有俩个属性name和class,class用来指定哪种输出策略,常用就是控制台输出策略和文件输出策略。
控制台输出 ConsoleAppender 输出到文件 RollingFileAppender -->
......
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