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
af110367
Commit
af110367
authored
Jun 20, 2020
by
lal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
5a64f105
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
11 deletions
+32
-11
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+3
-2
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+1
-1
src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java
+0
-0
src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveBalanceMapper.java
+2
-1
src/main/java/cn/timer/api/dto/kqmk/EmployeeLeaveBalanceDto.java
+0
-4
src/main/java/cn/timer/api/dto/kqmk/JiaqibalanceDto.java
+20
-0
src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
+6
-3
No files found.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
af110367
...
...
@@ -111,6 +111,7 @@ import cn.timer.api.dto.kqmk.DailyDetailsDto;
import
cn.timer.api.dto.kqmk.DetailsofbusinessDto
;
import
cn.timer.api.dto.kqmk.EmployeeLeaveBalanceDto
;
import
cn.timer.api.dto.kqmk.IndividualOvertimeRuleDto
;
import
cn.timer.api.dto.kqmk.JiaqibalanceDto
;
import
cn.timer.api.dto.kqmk.KqglAssoLeaveRulesDto
;
import
cn.timer.api.dto.kqmk.KqglAssoMonthPunchSummaryDto
;
import
cn.timer.api.dto.kqmk.KqglAssoOvertimeRulesDto
;
...
...
@@ -871,9 +872,9 @@ public class TimeCardController {
* 根据考勤余额id获取信息
*/
@GetMapping
(
value
=
"/hqleavebalance/{id}"
)
@ApiOperation
(
value
=
"
获取班次信息-根据班次id
"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"
根据考勤余额id获取信息
"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
hqleavebalance
(
@PathVariable
(
"id"
)
Integer
id
,
@CurrentUser
UserBean
userBean
)
{
EmployeeLeaveB
alanceDto
leanemp
=
kqglassoleavebalancemapper
.
selectleavebalanceList
(
id
,
userBean
.
getEmpNum
());
Jiaqib
alanceDto
leanemp
=
kqglassoleavebalancemapper
.
selectleavebalanceList
(
id
,
userBean
.
getEmpNum
());
return
ResultUtil
.
data
(
leanemp
,
"操作成功!"
);
}
...
...
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
af110367
...
...
@@ -105,7 +105,7 @@ public class AttendanceTaskTiming{
*/
//3.添加定时任务 每天下午七点执行一次
// @Scheduled(cron = "0 0 19
* * ?")
@Scheduled
(
cron
=
"0 50 8
* * ?"
)
//或直接指定时间间隔,例如:5秒
//@Scheduled(fixedRate=5000)
...
...
src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java
View file @
af110367
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveBalanceMapper.java
View file @
af110367
...
...
@@ -12,6 +12,7 @@ import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance;
import
cn.timer.api.dto.kqmk.AdditionalDto
;
import
cn.timer.api.dto.kqmk.AttqueryCriteriaDto
;
import
cn.timer.api.dto.kqmk.EmployeeLeaveBalanceDto
;
import
cn.timer.api.dto.kqmk.JiaqibalanceDto
;
/**
* 员工假期余额
...
...
@@ -27,5 +28,5 @@ public interface KqglAssoLeaveBalanceMapper extends BaseMapper<KqglAssoLeaveBala
List
<
AdditionalDto
>
selectAdditionalList
(
int
orgcode
);
EmployeeLeaveB
alanceDto
selectleavebalanceList
(
int
leaverulesid
,
int
userid
);
Jiaqib
alanceDto
selectleavebalanceList
(
int
leaverulesid
,
int
userid
);
}
src/main/java/cn/timer/api/dto/kqmk/EmployeeLeaveBalanceDto.java
View file @
af110367
...
...
@@ -26,10 +26,6 @@ public class EmployeeLeaveBalanceDto {
@ApiModelProperty
(
value
=
"入职日期 "
,
example
=
"字段说明"
)
private
String
rztime
;
@ApiModelProperty
(
value
=
" "
,
example
=
"字段说明"
)
private
String
userid
;
@ApiModelProperty
(
value
=
" "
,
example
=
"字段说明"
)
private
String
balancedays
;
@ApiModelProperty
(
value
=
"表数据"
,
example
=
"字段说明"
)
List
<
BalanceSheetDataDto
>
balanceTo
;
...
...
src/main/java/cn/timer/api/dto/kqmk/JiaqibalanceDto.java
0 → 100644
View file @
af110367
package
cn
.
timer
.
api
.
dto
.
kqmk
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public
class
JiaqibalanceDto
{
@ApiModelProperty
(
value
=
" "
,
example
=
"字段说明"
)
private
String
userid
;
@ApiModelProperty
(
value
=
" "
,
example
=
"字段说明"
)
private
String
balancedays
;
}
src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
View file @
af110367
...
...
@@ -22,14 +22,17 @@
<result
column=
"empname"
property=
"empname"
/>
<result
column=
"department"
property=
"department"
/>
<result
column=
"rztime"
property=
"rztime"
/>
<result
column=
"userid"
property=
"userid"
/>
<result
column=
"balancedays"
property=
"balancedays"
/>
<collection
property=
"balanceTo"
ofType=
"cn.timer.api.dto.kqmk.BalanceSheetDataDto"
>
<result
column=
"leaverulesid"
property=
"leaverulesid"
/>
<result
column=
"balancedays"
property=
"balancedays"
/>
</collection>
</resultMap>
<resultMap
id=
"JiaqibalanceMap"
type=
"cn.timer.api.dto.kqmk.JiaqibalanceDto"
>
<result
column=
"userid"
property=
"userid"
/>
<result
column=
"balancedays"
property=
"balancedays"
/>
</resultMap>
<resultMap
id=
"AdditionalMap"
type=
"cn.timer.api.dto.kqmk.AdditionalDto"
>
<result
column=
"empnum"
property=
"empnum"
/>
<result
column=
"empname"
property=
"empname"
/>
...
...
@@ -117,7 +120,7 @@
</select>
<select
id=
"selectleavebalanceList"
resultMap=
"
LeaveB
alanceMap"
>
<select
id=
"selectleavebalanceList"
resultMap=
"
Jiaqib
alanceMap"
>
select bal.userid,SUM(bal.balance_days) as balancedays
from kqgl_asso_leave_balance bal
where bal.leave_rules_id = #{leaverulesid} and bal.userid = #{userid}
...
...
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