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
2e49616d
Commit
2e49616d
authored
4 years ago
by
ilal
Committed by
chenzg
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
f05cbf2a
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
1 deletions
+30
-1
src/main/java/cn/timer/api/controller/LoginController.java
+2
-0
src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
+19
-0
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+0
-0
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
+0
-0
src/main/java/cn/timer/api/dto/kqmk/KqglAssoMonthPunchSummaryDto.java
+4
-0
src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
+1
-0
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
+4
-1
No files found.
src/main/java/cn/timer/api/controller/LoginController.java
View file @
2e49616d
...
...
@@ -843,6 +843,8 @@ public class LoginController {
// 用户信息缓存
session
.
setAttribute
(
"ui"
,
qyzxEmpLogin1
);
System
.
err
.
println
(
session
.
getId
());
return
ResultUtil
.
data
(
qyzxEmpLogin1
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
View file @
2e49616d
...
...
@@ -16,6 +16,8 @@ import java.util.List;
import
java.util.Locale
;
import
java.util.Set
;
import
org.apache.commons.lang3.ArrayUtils
;
/**
* @author lal 2020-05-11
*
...
...
@@ -24,6 +26,23 @@ public class ClockInTool {
static
SimpleDateFormat
famt
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
public
static
boolean
useArrayUtils
(
String
[]
arr
,
String
targetValue
)
{
return
ArrayUtils
.
contains
(
arr
,
targetValue
);
}
// 获得上个月月份年份
public
static
String
getYearMonth
()
{
Calendar
now
=
Calendar
.
getInstance
();
int
month
=
now
.
get
(
Calendar
.
MONTH
);
String
m
;
if
(
month
<
10
)
{
m
=
"0"
+
month
;
}
else
{
m
=
month
+
""
;
}
return
now
.
get
(
Calendar
.
YEAR
)
+
"-"
+
m
;
}
/**
* 将传入的日期的年月得到一个值
* @param date 日期
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
2e49616d
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
0 → 100644
View file @
2e49616d
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/kqmk/KqglAssoMonthPunchSummaryDto.java
View file @
2e49616d
...
...
@@ -236,4 +236,7 @@ public class KqglAssoMonthPunchSummaryDto implements Serializable{
@ApiModelProperty
(
value
=
"表数据"
,
example
=
"字段说明"
)
List
<
BalanceSheetDataDto
>
balanceTo
;
@ApiModelProperty
(
value
=
"表数据"
,
example
=
"离职状态"
)
private
Integer
turnover_status
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
View file @
2e49616d
...
...
@@ -133,6 +133,7 @@
LEFT JOIN zzgl_bmgw_m as gw on gw.id = emp.bmgw_id
LEFT JOIN zzgl_bmgw_m as c ON c.id = gw.up_id
where emp.org_code = #{orgcode}
<!-- and emp.emp_num = 12 -->
<!-- and emp.job_status != 3 -->
</select>
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
View file @
2e49616d
...
...
@@ -139,6 +139,8 @@
<result
column=
"org_code"
property=
"orgCode"
/>
<result
column=
"last_modified"
property=
"lastModified"
/>
<result
column=
"turnover_status"
property=
"turnover_status"
/>
<collection
property=
"balanceTo"
ofType=
"cn.timer.api.dto.kqmk.BalanceSheetDataDto"
>
<id
column=
"yzid"
property=
"yzid"
/>
<result
column=
"leaverulesid"
property=
"leaverulesid"
/>
...
...
@@ -276,7 +278,8 @@
<select
id=
"AttendanceSummaryData"
resultMap=
"SummarydataMap"
>
select sum.*,
(select kqz.name from kqgl_main_kqz kqz where kqz.id = sum.att_group) as attname
(select kqz.name from kqgl_main_kqz kqz where kqz.id = sum.att_group) as attname,
IFNULL((select em.job_status from yggl_main_lzb em where em.emp_num = sum.num and em.org_code = sum.org_code),0) as turnover_status
from kqgl_asso_month_punch_summary sum
where sum.org_code = #{param.orgCode}
and sum.belong_year = #{param.year}
...
...
This diff is collapsed.
Click to expand it.
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