Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
4bc9f3cf
Commit
4bc9f3cf
authored
Dec 25, 2020
by
youling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
定时器
parent
7a917c87
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
8 deletions
+16
-8
src/main/java/cn/timer/api/controller/kqgl/.DS_Store
+0
-0
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+11
-4
src/main/resources/application-test.yml
+1
-1
src/main/resources/application.yml
+3
-2
src/main/resources/logback-spring.xml
+1
-1
No files found.
src/main/java/cn/timer/api/controller/kqgl/.DS_Store
View file @
4bc9f3cf
No preview for this file type
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
4bc9f3cf
...
...
@@ -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
;
...
...
src/main/resources/application-test.yml
View file @
4bc9f3cf
...
...
@@ -154,7 +154,7 @@ pagehelper:
logging
:
level
:
root
:
info
cn.timer.api.dao
:
error
cn.timer.api.dao
:
debug
pattern
:
console
:
'
--%p--%m%n'
...
...
src/main/resources/application.yml
View file @
4bc9f3cf
spring
:
profiles
:
active
:
'
@environment@'
\ No newline at end of file
active
:
test
# active: '@environment@'
\ No newline at end of file
src/main/resources/logback-spring.xml
View file @
4bc9f3cf
...
...
@@ -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 -->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment