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
10cd9957
Commit
10cd9957
authored
4 years ago
by
lal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
f959147a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
120 additions
and
16 deletions
+120
-16
src/main/java/cn/timer/api/controller/LoginController.java
+30
-0
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+0
-0
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+54
-15
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+1
-1
src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveBalanceMapper.java
+2
-0
src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveRulesMapper.java
+4
-0
src/main/java/cn/timer/api/dto/kqmk/EmployeeLeaveBalanceDto.java
+5
-0
src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
+10
-0
src/main/resources/mapping/kqmk/KqglAssoLeaveRulesMapper.xml
+14
-0
No files found.
src/main/java/cn/timer/api/controller/LoginController.java
View file @
10cd9957
...
@@ -32,6 +32,7 @@ import cn.hutool.core.date.DateUtil;
...
@@ -32,6 +32,7 @@ import cn.hutool.core.date.DateUtil;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.timer.api.aspect.lang.annotation.Log
;
import
cn.timer.api.aspect.lang.annotation.Log
;
import
cn.timer.api.aspect.lang.enums.BusinessType
;
import
cn.timer.api.aspect.lang.enums.BusinessType
;
import
cn.timer.api.bean.kqmk.KqglAssoLeaveRules
;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.QyzxEmpLogin
;
import
cn.timer.api.bean.qyzx.QyzxEmpLogin
;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
import
cn.timer.api.bean.qyzx.QyzxEntInfoM
;
...
@@ -48,6 +49,7 @@ import cn.timer.api.config.enuminterface.YgEnumInterface.YgJobType;
...
@@ -48,6 +49,7 @@ import cn.timer.api.config.enuminterface.YgEnumInterface.YgJobType;
import
cn.timer.api.config.enums.CommonEnum
;
import
cn.timer.api.config.enums.CommonEnum
;
import
cn.timer.api.config.enums.SysRoleType
;
import
cn.timer.api.config.enums.SysRoleType
;
import
cn.timer.api.controller.spmk.service.SpmkServiceImpl
;
import
cn.timer.api.controller.spmk.service.SpmkServiceImpl
;
import
cn.timer.api.dao.kqmk.KqglAssoLeaveRulesMapper
;
import
cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper
;
import
cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper
;
import
cn.timer.api.dao.qyzx.QyzxEmpLoginMapper
;
import
cn.timer.api.dao.qyzx.QyzxEmpLoginMapper
;
import
cn.timer.api.dao.yggl.YgglMainEmpMapper
;
import
cn.timer.api.dao.yggl.YgglMainEmpMapper
;
...
@@ -457,6 +459,9 @@ public class LoginController {
...
@@ -457,6 +459,9 @@ public class LoginController {
@Autowired
@Autowired
SpmkServiceImpl
SpmkService
;
SpmkServiceImpl
SpmkService
;
@Autowired
private
KqglAssoLeaveRulesMapper
kqglassoleaverulesmapper
;
/**
/**
* 注册企业
* 注册企业
...
@@ -541,6 +546,31 @@ public class LoginController {
...
@@ -541,6 +546,31 @@ public class LoginController {
QyzxAuthAccount
.
builder
().
createdTime
(
new
Date
()).
maxChildAccount
(
maxChildAccount
).
name
(
username
)
QyzxAuthAccount
.
builder
().
createdTime
(
new
Date
()).
maxChildAccount
(
maxChildAccount
).
name
(
username
)
.
accountPhone
(
phone
).
empNum
(
login
.
getId
()).
orgCode
(
qyzxEntInfoM
.
getId
()).
build
().
insert
();
// TODO
.
accountPhone
(
phone
).
empNum
(
login
.
getId
()).
orgCode
(
qyzxEntInfoM
.
getId
()).
build
().
insert
();
// TODO
// 主账号权限表
// 主账号权限表
//*****************************考勤假期初始化
//获取模板数据
List
<
KqglAssoLeaveRules
>
ruless
=
new
LambdaQueryChainWrapper
<
KqglAssoLeaveRules
>(
kqglassoleaverulesmapper
).
eq
(
KqglAssoLeaveRules:
:
getOrgCode
,
0
).
list
();
//查询当前公司是否已初始化
KqglAssoLeaveRules
rule
=
kqglassoleaverulesmapper
.
selectOne
(
new
QueryWrapper
<
KqglAssoLeaveRules
>().
lambda
().
eq
(
KqglAssoLeaveRules:
:
getOrgCode
,
qyzxEntInfoM
.
getId
())
.
eq
(
KqglAssoLeaveRules:
:
getLeaveType
,
1
).
last
(
"LIMIT 1"
));
if
(
rule
==
null
)
{
List
<
KqglAssoLeaveRules
>
rullist
=
new
ArrayList
<
KqglAssoLeaveRules
>();
for
(
KqglAssoLeaveRules
rul
:
ruless
){
KqglAssoLeaveRules
vice
=
KqglAssoLeaveRules
.
builder
().
name
(
rul
.
getName
()).
company
(
rul
.
getCompany
()).
leaveType
(
rul
.
getLeaveType
())
.
apply
(
rul
.
getApply
()).
createTime
(
new
Date
().
getTime
()).
createUserid
(
999
).
orgCode
(
qyzxEntInfoM
.
getId
())
.
isOpen
(
rul
.
getIsOpen
()).
leaveBalance
(
rul
.
getLeaveBalance
()).
rulesType
(
rul
.
getRulesType
()).
build
();
rullist
.
add
(
vice
);
}
if
(
rullist
.
size
()
>
0
)
{
kqglassoleaverulesmapper
.
insertleaverulesList
(
rullist
);
}
System
.
out
.
println
(
"操作成功!"
);
}
else
{
System
.
out
.
println
(
"重复初始化数据!"
);
}
return
ResultUtil
.
success
(
"注册企业成功"
);
return
ResultUtil
.
success
(
"注册企业成功"
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
10cd9957
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
10cd9957
...
@@ -343,13 +343,18 @@ public class TimeCardController {
...
@@ -343,13 +343,18 @@ public class TimeCardController {
StartTimeRestDto
[]
rest
=
overrules
.
getStarttime
();
StartTimeRestDto
[]
rest
=
overrules
.
getStarttime
();
if
(
rest
!=
null
&&
rest
.
length
>
0
){
if
(
rest
!=
null
&&
rest
.
length
>
0
){
for
(
int
p
=
0
;
p
<
rest
.
length
;
p
++){
for
(
int
p
=
0
;
p
<
rest
.
length
;
p
++){
KqglAssOvertimeVice
.
builder
().
build
().
delete
(
new
QueryWrapper
<
KqglAssOvertimeVice
>().
lambda
().
eq
(
KqglAssOvertimeVice:
:
getOvertimeRulesId
,
id
));
if
(
rest
[
p
].
getStarttime
()
!=
null
)
{
KqglAssOvertimeVice
vice
=
new
KqglAssOvertimeVice
();
KqglAssOvertimeVice
.
builder
().
build
().
delete
(
new
QueryWrapper
<
KqglAssOvertimeVice
>().
lambda
().
eq
(
KqglAssOvertimeVice:
:
getOvertimeRulesId
,
id
));
vice
.
setOvertimeRulesId
(
id
);
KqglAssOvertimeVice
vice
=
new
KqglAssOvertimeVice
();
vice
.
setBreakStartTime
(
rest
[
p
].
getStarttime
());
vice
.
setOvertimeRulesId
(
id
);
vice
.
setBreakEndTime
(
rest
[
p
].
getEndtime
());
vice
.
setBreakStartTime
(
rest
[
p
].
getStarttime
());
vice
.
setOverType
(
rest
[
p
].
getOvertype
());
vice
.
setBreakEndTime
(
rest
[
p
].
getEndtime
());
overtimes
.
add
(
vice
);
vice
.
setOverType
(
rest
[
p
].
getOvertype
());
overtimes
.
add
(
vice
);
}
else
{
break
;
}
}
}
}
}
if
(
overtimes
.
size
()>
0
){
if
(
overtimes
.
size
()>
0
){
...
@@ -481,7 +486,7 @@ public class TimeCardController {
...
@@ -481,7 +486,7 @@ public class TimeCardController {
}
}
}
else
{
}
else
{
for
(
YgglMainEmp
ye:
yggl
)
{
for
(
YgglMainEmp
ye:
yggl
)
{
KqglAssoLeaveBalance
.
builder
().
leaveRulesId
(
id
).
userid
(
ye
.
getEmpNum
()).
modifyAction
(
1
).
balanceDays
(
"-1
-1
"
)
KqglAssoLeaveBalance
.
builder
().
leaveRulesId
(
id
).
userid
(
ye
.
getEmpNum
()).
modifyAction
(
1
).
balanceDays
(
"-1"
)
.
reason
(
"不限制余额"
).
modifyUserid
(
userBean
.
getEmpNum
()).
modifyTimer
(
new
Date
().
getTime
()).
orgCode
(
userBean
.
getOrgCode
()).
isAutomatic
(
1
).
modifyNumber
(
1
).
build
().
insert
();
//员工假期余额
.
reason
(
"不限制余额"
).
modifyUserid
(
userBean
.
getEmpNum
()).
modifyTimer
(
new
Date
().
getTime
()).
orgCode
(
userBean
.
getOrgCode
()).
isAutomatic
(
1
).
modifyNumber
(
1
).
build
().
insert
();
//员工假期余额
}
}
}
}
...
@@ -852,6 +857,17 @@ public class TimeCardController {
...
@@ -852,6 +857,17 @@ public class TimeCardController {
}
}
/**
/**
* 根据考勤余额id获取信息
*/
@GetMapping
(
value
=
"/hqleavebalance/{id}"
)
@ApiOperation
(
value
=
"获取班次信息-根据班次id"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
hqleavebalance
(
@PathVariable
(
"id"
)
Integer
id
,
@CurrentUser
UserBean
userBean
)
{
EmployeeLeaveBalanceDto
leanemp
=
kqglassoleavebalancemapper
.
selectleavebalanceList
(
id
,
userBean
.
getEmpNum
());
return
ResultUtil
.
data
(
leanemp
,
"操作成功!"
);
}
/**
* 根据 组织机构代码获取员工假期余额表头
* 根据 组织机构代码获取员工假期余额表头
*/
*/
@GetMapping
(
value
=
"/balance_header"
)
@GetMapping
(
value
=
"/balance_header"
)
...
@@ -871,15 +887,38 @@ public class TimeCardController {
...
@@ -871,15 +887,38 @@ public class TimeCardController {
@ApiOperation
(
value
=
"30: 查询列表-假期规则"
,
httpMethod
=
"GET"
,
notes
=
" 查询列表-假期规则"
)
@ApiOperation
(
value
=
"30: 查询列表-假期规则"
,
httpMethod
=
"GET"
,
notes
=
" 查询列表-假期规则"
)
@ApiOperationSupport
(
order
=
30
)
@ApiOperationSupport
(
order
=
30
)
public
Result
<
Object
>
selectListLeaveRules
(
@CurrentUser
UserBean
userBean
)
{
public
Result
<
Object
>
selectListLeaveRules
(
@CurrentUser
UserBean
userBean
)
{
List
<
KqglAssoLeaveRules
>
balheas
=
new
LambdaQueryChainWrapper
<
KqglAssoLeaveRules
>(
kqglassoleaverulesmapper
).
eq
(
KqglAssoLeaveRules
::
getOrgCode
,
userBean
.
getOrgCode
())
//
List<KqglAssoLeaveRules> balheas = new LambdaQueryChainWrapper<KqglAssoLeaveRules>(kqglassoleaverulesmapper).eq(KqglAssoLeaveRules :: getOrgCode,userBean.getOrgCode())
.
eq
(
KqglAssoLeaveRules
::
getLeaveType
,
2
).
or
().
eq
(
KqglAssoLeaveRules
::
getIsOpen
,
1
).
list
();
//
.eq(KqglAssoLeaveRules :: getLeaveType, 2).or().eq(KqglAssoLeaveRules :: getIsOpen, 1).list();
List
<
LeaveTypeDto
>
leas
=
new
ArrayList
<
LeaveTypeDto
>();
List
<
LeaveTypeDto
>
leas
=
new
ArrayList
<
LeaveTypeDto
>();
for
(
KqglAssoLeaveRules
rul
:
balheas
)
{
KqglAssoYhkqz
yhd
=
KqglAssoYhkqz
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoYhkqz
>().
lambda
().
eq
(
KqglAssoYhkqz:
:
getUserid
,
userBean
.
getEmpNum
()).
eq
(
KqglAssoYhkqz:
:
getQyid
,
userBean
.
getOrgCode
()));
LeaveTypeDto
lea
=
LeaveTypeDto
.
builder
().
build
();
lea
.
setId
(
rul
.
getId
());
if
(
yhd
!=
null
)
{
lea
.
setValue
(
rul
.
getName
());
//获取假期适用全公司的
leas
.
add
(
lea
);
List
<
KqglAssoLeaveRules
>
whole
=
kqglassoleaverulesmapper
.
selCompanywidedata
(
userBean
.
getOrgCode
(),
2
,
1
);
for
(
KqglAssoLeaveRules
rul
:
whole
)
{
LeaveTypeDto
lea
=
LeaveTypeDto
.
builder
().
build
();
lea
.
setId
(
rul
.
getId
());
lea
.
setValue
(
rul
.
getName
());
leas
.
add
(
lea
);
}
List
<
KqglAssoLeaveRules
>
assholi
=
kqglassoleaverulesmapper
.
AssociatedHolidays
(
yhd
.
getKqzid
());
for
(
KqglAssoLeaveRules
rul1
:
assholi
)
{
LeaveTypeDto
lea
=
LeaveTypeDto
.
builder
().
build
();
lea
.
setId
(
rul1
.
getId
());
lea
.
setValue
(
rul1
.
getName
());
leas
.
add
(
lea
);
}
}
}
// List<KqglAssoLeaveRules> balheas = kqglassoleaverulesmapper.selHeaderdata(userBean.getOrgCode(), 2, 1);
// List<LeaveTypeDto> leas = new ArrayList<LeaveTypeDto>();
// for(KqglAssoLeaveRules rul : balheas) {
// LeaveTypeDto lea = LeaveTypeDto.builder().build();
// lea.setId(rul.getId());
// lea.setValue(rul.getName());
// leas.add(lea);
// }
return
ResultUtil
.
data
(
leas
,
"操作成功!"
);
return
ResultUtil
.
data
(
leas
,
"操作成功!"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
10cd9957
...
@@ -105,7 +105,7 @@ public class AttendanceTaskTiming{
...
@@ -105,7 +105,7 @@ public class AttendanceTaskTiming{
*/
*/
//3.添加定时任务 每天下午七点执行一次
//3.添加定时任务 每天下午七点执行一次
@Scheduled
(
cron
=
"0 0 19 * * ?"
)
//
@Scheduled(cron = "0 0 19 * * ?")
//或直接指定时间间隔,例如:5秒
//或直接指定时间间隔,例如:5秒
//@Scheduled(fixedRate=5000)
//@Scheduled(fixedRate=5000)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveBalanceMapper.java
View file @
10cd9957
...
@@ -26,4 +26,6 @@ public interface KqglAssoLeaveBalanceMapper extends BaseMapper<KqglAssoLeaveBala
...
@@ -26,4 +26,6 @@ public interface KqglAssoLeaveBalanceMapper extends BaseMapper<KqglAssoLeaveBala
AdditionalDto
selectAdditional
(
int
orgcode
,
int
empnum
);
AdditionalDto
selectAdditional
(
int
orgcode
,
int
empnum
);
List
<
AdditionalDto
>
selectAdditionalList
(
int
orgcode
);
List
<
AdditionalDto
>
selectAdditionalList
(
int
orgcode
);
EmployeeLeaveBalanceDto
selectleavebalanceList
(
int
leaverulesid
,
int
userid
);
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveRulesMapper.java
View file @
10cd9957
...
@@ -19,4 +19,8 @@ public interface KqglAssoLeaveRulesMapper extends BaseMapper<KqglAssoLeaveRules>
...
@@ -19,4 +19,8 @@ public interface KqglAssoLeaveRulesMapper extends BaseMapper<KqglAssoLeaveRules>
int
insertleaverulesList
(
List
<
KqglAssoLeaveRules
>
kqglassoleaverules
);
int
insertleaverulesList
(
List
<
KqglAssoLeaveRules
>
kqglassoleaverules
);
List
<
KqglAssoLeaveRules
>
selHeaderdata
(
int
orgcode
,
int
leavetype
,
int
isopen
);
List
<
KqglAssoLeaveRules
>
selHeaderdata
(
int
orgcode
,
int
leavetype
,
int
isopen
);
List
<
KqglAssoLeaveRules
>
selCompanywidedata
(
int
orgcode
,
int
leavetype
,
int
isopen
);
List
<
KqglAssoLeaveRules
>
AssociatedHolidays
(
int
attgroupid
);
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/kqmk/EmployeeLeaveBalanceDto.java
View file @
10cd9957
...
@@ -25,6 +25,11 @@ public class EmployeeLeaveBalanceDto {
...
@@ -25,6 +25,11 @@ public class EmployeeLeaveBalanceDto {
@ApiModelProperty
(
value
=
"入职日期 "
,
example
=
"字段说明"
)
@ApiModelProperty
(
value
=
"入职日期 "
,
example
=
"字段说明"
)
private
String
rztime
;
private
String
rztime
;
@ApiModelProperty
(
value
=
" "
,
example
=
"字段说明"
)
private
String
userid
;
@ApiModelProperty
(
value
=
" "
,
example
=
"字段说明"
)
private
String
balancedays
;
@ApiModelProperty
(
value
=
"表数据"
,
example
=
"字段说明"
)
@ApiModelProperty
(
value
=
"表数据"
,
example
=
"字段说明"
)
List
<
BalanceSheetDataDto
>
balanceTo
;
List
<
BalanceSheetDataDto
>
balanceTo
;
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
View file @
10cd9957
...
@@ -22,6 +22,8 @@
...
@@ -22,6 +22,8 @@
<result
column=
"empname"
property=
"empname"
/>
<result
column=
"empname"
property=
"empname"
/>
<result
column=
"department"
property=
"department"
/>
<result
column=
"department"
property=
"department"
/>
<result
column=
"rztime"
property=
"rztime"
/>
<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"
>
<collection
property=
"balanceTo"
ofType=
"cn.timer.api.dto.kqmk.BalanceSheetDataDto"
>
<result
column=
"leaverulesid"
property=
"leaverulesid"
/>
<result
column=
"leaverulesid"
property=
"leaverulesid"
/>
<result
column=
"balancedays"
property=
"balancedays"
/>
<result
column=
"balancedays"
property=
"balancedays"
/>
...
@@ -113,6 +115,14 @@
...
@@ -113,6 +115,14 @@
where emp.org_code = #{orgcode}
where emp.org_code = #{orgcode}
and emp.job_status in (0,1)
and emp.job_status in (0,1)
</select>
</select>
<select
id=
"selectleavebalanceList"
resultMap=
"LeaveBalanceMap"
>
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}
GROUP BY bal.userid
</select>
<!--
<!--
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoLeaveRulesMapper.xml
View file @
10cd9957
...
@@ -50,6 +50,20 @@
...
@@ -50,6 +50,20 @@
WHERE org_code = #{orgcode}
WHERE org_code = #{orgcode}
AND (leave_type = #{leavetype} OR is_open = #{isopen})
AND (leave_type = #{leavetype} OR is_open = #{isopen})
</select>
</select>
<select
id=
"selCompanywidedata"
resultMap=
"BaseResultMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM kqgl_asso_leave_rules
WHERE org_code = #{orgcode}
and apply = 0
AND (leave_type = #{leavetype} OR is_open = #{isopen})
</select>
<select
id=
"AssociatedHolidays"
resultMap=
"BaseResultMap"
>
SELECT * FROM kqgl_asso_leave_rules rul
where rul.id in (select vic.leave_rules_id from kqgl_asso_rules_vice vic where vic.attgroup_id = #{attgroupid})
</select>
<insert
id=
"insertleaverulesList"
parameterType=
"java.util.List"
>
<insert
id=
"insertleaverulesList"
parameterType=
"java.util.List"
>
insert into kqgl_asso_leave_rules (name,company,leave_type,apply,create_time,create_userid,org_code,is_open,leave_balance,rules_type)
insert into kqgl_asso_leave_rules (name,company,leave_type,apply,create_time,create_userid,org_code,is_open,leave_balance,rules_type)
...
...
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