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
bc64a06a
Commit
bc64a06a
authored
4 years ago
by
lal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复BUG
parent
cfa120db
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
60 additions
and
44 deletions
+60
-44
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+28
-41
src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java
+9
-3
src/main/java/cn/timer/api/dao/kqmk/KqglAssoMonthPunchSummaryMapper.java
+4
-0
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
+19
-0
No files found.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
bc64a06a
...
...
@@ -1648,14 +1648,12 @@ public class TimeCardController {
attesummqueto
.
setOrgCode
(
userBean
.
getOrgCode
());
String
year
=
null
,
month
=
null
;
String
staapptime
=
null
,
endapptime
=
null
;
String
staapptime
=
null
,
endapptime
=
null
,
time_
=
null
;
if
(
attesummqueto
.
getTimes
()
!=
null
&&
!(
""
).
equals
(
attesummqueto
.
getTimes
()))
{
year
=
attesummqueto
.
getTimes
().
substring
(
0
,
4
);
month
=
attesummqueto
.
getTimes
().
substring
(
5
,
7
);
// staapptime = ClockInTool.getFirstDayOfMonth1(Integer.valueOf(year),Integer.valueOf(month));
// endapptime = ClockInTool.getLastDayOfMonth1(Integer.valueOf(year),Integer.valueOf(month));
time_
=
attesummqueto
.
getTimes
();
String
time
=
attesummqueto
.
getTimes
()+
"-01"
;
String
sdaet
=
ClockInTool
.
getMinMonthDate
(
time
);
...
...
@@ -1666,13 +1664,7 @@ public class TimeCardController {
year
=
new
SimpleDateFormat
(
"yyyy"
).
format
(
new
Date
()).
toString
();
month
=
new
SimpleDateFormat
(
"MM"
).
format
(
new
Date
()).
toString
();
// Calendar c = Calendar.getInstance();
// c.add(Calendar.MONTH, 0);
// c.set(Calendar.DAY_OF_MONTH,1);
// staapptime = DateUtil.getStringFormat(DateUtil.getStringTime(mat.format(c.getTime()),"yyyy-MM-dd"));
// Calendar ca = Calendar.getInstance();
// ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
// endapptime = DateUtil.getStringFormat(DateUtil.getStringTime(mat.format(ca.getTime()),"yyyy-MM-dd"));
time_
=
new
SimpleDateFormat
(
"yyyy-MM"
).
format
(
new
Date
()).
toString
();
Calendar
c
=
Calendar
.
getInstance
();
c
.
add
(
Calendar
.
MONTH
,
0
);
...
...
@@ -1692,24 +1684,12 @@ public class TimeCardController {
attesummqueto
.
setMonth
(
month
);
attesummqueto
.
setStaapptime
(
staapptime
);
attesummqueto
.
setEndapptime
(
endapptime
);
attesummqueto
.
setTimes
(
time_
);
// 缺-部门id 搜索
IPage
<
KqglAssoMonthPunchSummaryDto
>
pageAs
=
kqglassomonthpunchsummarymapper
.
AttendanceSummaryData
(
page
,
attesummqueto
);
// List<BalanceSheetDataDto> balanceTo = new ArrayList<BalanceSheetDataDto>();
// int num = 0;
// int nums = 0;
//
// List<KqglAssoLeaveRules> rul = KqglAssoLeaveRules.builder().build().selectList(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getOrgCode, userBean.getOrgCode()));
// if(rul.size() > 0) {
// num = rul.size();
// }
//
// List<KqglAssoMonthPunchSummary> pusu = KqglAssoMonthPunchSummary.builder().build().selectList(new QueryWrapper<KqglAssoMonthPunchSummary>().lambda().eq(KqglAssoMonthPunchSummary::getOrgCode, userBean.getOrgCode())
// .eq(KqglAssoMonthPunchSummary::getBelongYear, year).eq(KqglAssoMonthPunchSummary::getBelongMonth, month));
// if(pusu.size() > 0) {
// nums = pusu.size();
// }
List
<
KqglAssoMonthPunchSummaryDto
>
listAs
=
pageAs
.
getRecords
();
List
<
KqglAssoMonthPunchSummaryDto
>
sumlist
=
new
ArrayList
<
KqglAssoMonthPunchSummaryDto
>();
...
...
@@ -1719,13 +1699,17 @@ public class TimeCardController {
BeanUtil
.
copyProperties
(
endo
,
dets
,
"balanceTo"
);
List
<
KqglAssoLeaveEmployeeBalance
>
empye
=
KqglAssoLeaveEmployeeBalance
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoLeaveEmployeeBalance
>().
lambda
().
eq
(
KqglAssoLeaveEmployeeBalance:
:
getUserid
,
endo
.
getNum
())
.
eq
(
KqglAssoLeaveEmployeeBalance:
:
getOrgCode
,
endo
.
getOrgCode
()));
// List<KqglAssoLeaveEmployeeBalance> empye = KqglAssoLeaveEmployeeBalance.builder().build().selectList(new QueryWrapper<KqglAssoLeaveEmployeeBalance>().lambda().eq(KqglAssoLeaveEmployeeBalance::getUserid, endo.getNum())
// .eq(KqglAssoLeaveEmployeeBalance::getOrgCode, endo.getOrgCode()));
List
<
BalanceSheetDataDto
>
empye
=
kqglassomonthpunchsummarymapper
.
MonthlySummaryLeave
(
endo
.
getOrgCode
(),
endo
.
getNum
(),
attesummqueto
.
getTimes
());
List
<
BalanceSheetDataDto
>
balanceTo
=
new
ArrayList
<
BalanceSheetDataDto
>();
for
(
KqglAssoLeaveEmployeeBalance
empyes
:
empye
)
{
for
(
BalanceSheetDataDto
empyes
:
empye
)
{
BalanceSheetDataDto
bal
=
BalanceSheetDataDto
.
builder
().
build
();
bal
.
setBalancedays
(
empyes
.
getBalance
D
ays
());
bal
.
setLeaverulesid
(
empyes
.
getLeave
RulesI
d
());
bal
.
setBalancedays
(
empyes
.
getBalance
d
ays
());
bal
.
setLeaverulesid
(
empyes
.
getLeave
rulesi
d
());
balanceTo
.
add
(
bal
);
}
dets
.
setBalanceTo
(
balanceTo
);
...
...
@@ -1733,7 +1717,6 @@ public class TimeCardController {
}
// return ResultUtil.attdata(pageAs, listAs, "操作成功!",num,nums);
return
ResultUtil
.
data
(
pageAs
,
sumlist
,
"操作成功!"
);
}
...
...
@@ -1792,7 +1775,6 @@ public class TimeCardController {
}
return
ResultUtil
.
data
(
pageAs
,
sumlist
,
"操作成功!"
);
}
...
...
@@ -2778,18 +2760,23 @@ public class TimeCardController {
KqglAssoMonthPunchSummary
punsum
=
KqglAssoMonthPunchSummary
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoMonthPunchSummary
>().
lambda
().
eq
(
KqglAssoMonthPunchSummary:
:
getNum
,
userBean
.
getEmpNum
())
.
eq
(
KqglAssoMonthPunchSummary:
:
getOrgCode
,
userBean
.
getOrgCode
()).
eq
(
KqglAssoMonthPunchSummary:
:
getBelongYear
,
belongyear
).
eq
(
KqglAssoMonthPunchSummary:
:
getBelongMonth
,
belongmonth
));
Double
compensatoryleave
=
0
d
;
if
(
punsum
!=
null
)
{
compensatoryleave
=
punsum
.
getWorkingTurnCompenLeave
()
+
punsum
.
getRestTurnCompenLeave
()
+
punsum
.
getHolidayTurnCompenLeave
(
);
}
BalanceSheetDataDto
empye
=
kqglassomonthpunchsummarymapper
.
FormMonthlySummaryLeave
(
userBean
.
getOrgCode
(),
userBean
.
getEmpNum
(),
ttstr
);
tabl
.
setAttendance
(
punsum
==
null
?
""
:
String
.
valueOf
(
punsum
.
getDaysOnDuty
()));
// 应出勤
tabl
.
setAttended
(
punsum
==
null
?
""
:
String
.
valueOf
(
punsum
.
getActualAttDays
()));
// 已出勤
tabl
.
setLeave
(
qjj
==
null
?
""
:
String
.
valueOf
(
qjj
.
getDuration
()));
// 请假
tabl
.
setLeave
(
qjj
==
null
?
""
:
String
.
valueOf
(
empye
.
getBalancedays
()));
// 请假*******************
tabl
.
setLackworkcard
(
punsum
==
null
?
""
:
String
.
valueOf
(
punsum
.
getNumberWorkCardShortage
()));
// 上班缺卡
tabl
.
setWorkovertime
(
sums
==
null
?
""
:
String
.
valueOf
(
sums
.
getDuration
()));
// 加班
tabl
.
setCompensatoryleave
(
String
.
valueOf
(
compensatoryleave
));
// 调休
tabl
.
setEvection
(
cxx
==
null
?
""
:
String
.
valueOf
(
cxx
.
getDuration
()));
// 出差
// tabl.setWorkovertime(sums == null ? "" : String.valueOf(sums.getDuration()));// 加班
tabl
.
setWorkovertime
(
sums
==
null
?
""
:
String
.
valueOf
(
punsum
.
getTotalOvertimeHours
()));
// 加班
tabl
.
setCompensatoryleave
(
String
.
valueOf
(
punsum
.
getDaysOff
()));
// 休息天数
// tabl.setEvection(cxx == null ? "" : String.valueOf(cxx.getDuration()));// 出差
tabl
.
setEvection
(
cxx
==
null
?
""
:
String
.
valueOf
(
punsum
.
getLengthBusinessTrip
()));
// 出差
tabl
.
setOffdutycardshortage
(
punsum
==
null
?
""
:
String
.
valueOf
(
punsum
.
getNumberDutyCardShortage
()));
// 下班缺卡
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java
View file @
bc64a06a
...
...
@@ -61,11 +61,13 @@ public class KqglServiceImpl implements KqglService {
String
startdate
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
).
format
(
leaveappr
.
getStarttime
());
String
enddate
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
).
format
(
leaveappr
.
getEndtime
());
String
[]
days
=
ClockInTool
.
listToString
(
ClockInTool
.
getDays
(
startdate
,
enddate
)).
split
(
","
);
int
i
=
1
;
for
(
String
num
:
days
)
{
//记入打卡月汇总关联表
KqglAssoRelationSummary
.
builder
().
userId
(
leaveappr
.
getUserid
()).
appTime
(
num
).
approvalId
(
leaveappr
.
getLeaveid
()).
approvalType
(
2
).
duration
(
leaveappr
.
getDuration
())
.
leaveTypeId
(
leaveappr
.
getLeavetype
()).
startTime
(
new
SimpleDateFormat
(
"yyyy-MM-dd' 'HH:mm:ss"
).
format
(
leaveappr
.
getStarttime
()))
.
endTime
(
new
SimpleDateFormat
(
"yyyy-MM-dd' 'HH:mm:ss"
).
format
(
leaveappr
.
getEndtime
())).
orgCode
(
leaveappr
.
getOrgcode
()).
build
().
insert
();
.
endTime
(
new
SimpleDateFormat
(
"yyyy-MM-dd' 'HH:mm:ss"
).
format
(
leaveappr
.
getEndtime
())).
orgCode
(
leaveappr
.
getOrgcode
()).
ordernum
(
i
).
totals
(
days
.
length
).
build
().
insert
();
i
++;
}
YgglMainEmp
emp
=
YgglMainEmp
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getEmpNum
,
leaveappr
.
getUserid
()).
eq
(
YgglMainEmp:
:
getOrgCode
,
leaveappr
.
getOrgcode
()));
...
...
@@ -259,21 +261,25 @@ public class KqglServiceImpl implements KqglService {
String
startdate
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
).
format
(
evecappr
.
getStarttime
());
String
enddate
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
).
format
(
evecappr
.
getEndtime
());
String
[]
days
=
ClockInTool
.
listToString
(
ClockInTool
.
getDays
(
startdate
,
enddate
)).
split
(
","
);
int
i
=
1
;
for
(
String
num
:
days
)
{
//记入打卡月汇总关联表
KqglAssoRelationSummary
.
builder
().
userId
(
evecappr
.
getUserid
()).
appTime
(
num
).
approvalId
(
evecappr
.
getEvectionid
()).
approvalType
(
3
).
duration
(
evecappr
.
getDuration
())
.
startTime
(
new
SimpleDateFormat
(
"yyyy-MM-dd' 'HH:mm:ss"
).
format
(
evecappr
.
getStarttime
())).
endTime
(
new
SimpleDateFormat
(
"yyyy-MM-dd' 'HH:mm:ss"
).
format
(
evecappr
.
getEndtime
()))
.
orgCode
(
evecappr
.
getOrgcode
()).
build
().
insert
();
.
orgCode
(
evecappr
.
getOrgcode
()).
ordernum
(
i
).
totals
(
days
.
length
).
build
().
insert
();
i
++;
}
}
else
{
//外出
String
startdate
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
).
format
(
evecappr
.
getStarttime
());
String
enddate
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
).
format
(
evecappr
.
getEndtime
());
String
[]
days
=
ClockInTool
.
listToString
(
ClockInTool
.
getDays
(
startdate
,
enddate
)).
split
(
","
);
int
i
=
1
;
for
(
String
num
:
days
)
{
//记入打卡月汇总关联表
KqglAssoRelationSummary
.
builder
().
userId
(
evecappr
.
getUserid
()).
appTime
(
num
).
approvalId
(
evecappr
.
getEvectionid
()).
approvalType
(
4
).
duration
(
evecappr
.
getDuration
())
.
startTime
(
new
SimpleDateFormat
(
"yyyy-MM-dd' 'HH:mm:ss"
).
format
(
evecappr
.
getStarttime
())).
endTime
(
new
SimpleDateFormat
(
"yyyy-MM-dd' 'HH:mm:ss"
).
format
(
evecappr
.
getEndtime
()))
.
orgCode
(
evecappr
.
getOrgcode
()).
build
().
insert
();
.
orgCode
(
evecappr
.
getOrgcode
()).
ordernum
(
i
).
totals
(
days
.
length
).
build
().
insert
();
i
++;
}
}
return
true
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/kqmk/KqglAssoMonthPunchSummaryMapper.java
View file @
bc64a06a
...
...
@@ -27,4 +27,8 @@ public interface KqglAssoMonthPunchSummaryMapper extends BaseMapper<KqglAssoMont
IPage
<
DailyDetailsDto
>
Dailydetails
(
IPage
<
DailyDetailsDto
>
page
,
@Param
(
"param"
)
AttendanceSummaryQueryDto
attendancesummaryquerydto
);
List
<
BalanceSheetDataDto
>
AttenSumDailyDetails
(
int
orgcode
,
int
userid
,
String
apptime
);
List
<
BalanceSheetDataDto
>
MonthlySummaryLeave
(
int
orgcode
,
int
userid
,
String
apptime
);
BalanceSheetDataDto
FormMonthlySummaryLeave
(
int
orgcode
,
int
userid
,
String
apptime
);
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
View file @
bc64a06a
...
...
@@ -241,6 +241,25 @@
GROUP BY su.leave_type_id
</select>
<select
id=
"MonthlySummaryLeave"
resultMap=
"BalanceSheetDataMap"
>
select res.leave_type_id as leaverulesid,res.duration as balancedays from kqgl_asso_relation_summary res
where res.user_id = #{userid}
and res.approval_type = 2
and res.org_code = #{orgcode}
and SUBSTR(res.app_time,1,7) = #{apptime}
GROUP BY res.leave_type_id,res.duration
</select>
<select
id=
"FormMonthlySummaryLeave"
resultMap=
"BalanceSheetDataMap"
>
select IFNULL(SUM(aa.balancedays),0) as balancedays from (
select res.leave_type_id as leaverulesid,res.duration as balancedays from kqgl_asso_relation_summary res
where res.user_id = #{userid}
and res.approval_type = 2
and res.org_code = #{orgcode}
and SUBSTR(res.app_time,1,7) = #{apptime}
GROUP BY res.leave_type_id,res.duration
) as aa
</select>
<select
id=
"AttendanceSummaryData"
resultMap=
"SummarydataMap"
>
select sum.*,
...
...
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