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
2a5d4cca
Commit
2a5d4cca
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
临时提交
parent
493cda44
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
332 additions
and
5 deletions
+332
-5
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+219
-5
src/main/java/cn/timer/api/controller/xcgl/SalaryTool.java
+8
-0
src/main/java/cn/timer/api/dao/kqmk/KqglAssoRelationSummaryMapper.java
+2
-0
src/main/java/cn/timer/api/dto/xcgl/AppPaysSalaryOneDto.java
+24
-0
src/main/java/cn/timer/api/dto/xcgl/AppPaysSalaryTwoDto.java
+20
-0
src/main/java/cn/timer/api/dto/xcgl/AppPayslipDetailsDto.java
+27
-0
src/main/java/cn/timer/api/dto/xcgl/PushPayslipDto.java
+22
-0
src/main/resources/mapping/kqmk/KqglAssoRelationSummaryMapper.xml
+10
-0
No files found.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
2a5d4cca
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/xcgl/SalaryTool.java
View file @
2a5d4cca
package
cn
.
timer
.
api
.
controller
.
xcgl
;
import
java.text.DecimalFormat
;
import
java.text.ParseException
;
import
java.text.ParsePosition
;
import
java.text.SimpleDateFormat
;
...
...
@@ -19,6 +20,13 @@ public class SalaryTool {
return
(
double
)
Math
.
round
(
d
*
10000
)/
10000
;
}
public
static
double
formatDouble_
(
double
d
)
{
double
zhi
=
0
;
DecimalFormat
df
=
new
DecimalFormat
(
"0.00"
);
zhi
=
Double
.
valueOf
(
df
.
format
(
d
));
return
zhi
;
}
/**
* 获取两个日期相差的月数
* @param d2 较大的日期
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/kqmk/KqglAssoRelationSummaryMapper.java
View file @
2a5d4cca
...
...
@@ -28,4 +28,6 @@ public interface KqglAssoRelationSummaryMapper extends BaseMapper<KqglAssoRelati
KqglAssoRelationSummary
Businessdayclockin
(
int
userid
,
int
approvaltype
,
String
apptime
,
int
orgcode
);
List
<
KqglAssoRelationSummary
>
HolidayDetails
(
int
orgcode
,
String
apptime
,
int
rules_type
,
int
userid
);
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/xcgl/AppPaysSalaryOneDto.java
0 → 100644
View file @
2a5d4cca
package
cn
.
timer
.
api
.
dto
.
xcgl
;
import
java.io.Serializable
;
import
java.util.List
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
AppPaysSalaryOneDto
implements
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
193839030071552299L
;
private
String
itemname
;
//基本工资、岗位津贴、事假、事假扣款......
private
Double
deduction
;
//扣款额
private
String
fieldone
;
//字段1(共2次、共11.5小时=1.44天)
private
String
fieldtwo
;
//字段2(共迟到8/分钟,早退20/分钟)
List
<
AppPaysSalaryTwoDto
>
detailed
;
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/xcgl/AppPaysSalaryTwoDto.java
0 → 100644
View file @
2a5d4cca
package
cn
.
timer
.
api
.
dto
.
xcgl
;
import
java.io.Serializable
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
AppPaysSalaryTwoDto
implements
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
5773269251839518331L
;
private
String
term
;
//早退时间、迟到时间....
private
String
specifictime
;
//时间 08:25
private
Double
field
;
//字段 8、3.5....
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/xcgl/AppPayslipDetailsDto.java
0 → 100644
View file @
2a5d4cca
package
cn
.
timer
.
api
.
dto
.
xcgl
;
import
java.io.Serializable
;
import
java.util.List
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
AppPayslipDetailsDto
implements
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
1672310141723169753L
;
private
Integer
id
;
// 工资条id
private
Double
netsalary
;
// 实发工资
private
String
wagetime
;
// 工资时间
private
Integer
userid
;
// 用户id
private
Integer
sfyqrgz
;
// 是否已确认工资
List
<
AppPaysSalaryOneDto
>
specific
=
null
;
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/xcgl/PushPayslipDto.java
0 → 100644
View file @
2a5d4cca
package
cn
.
timer
.
api
.
dto
.
xcgl
;
import
java.io.Serializable
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
PushPayslipDto
implements
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
6984424343409821996L
;
private
Integer
gztid
;
//工资条id
private
Integer
xzzid
;
//薪资组id
private
Integer
userid
;
// 用户id
private
String
xzyf
;
// 薪资月份
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoRelationSummaryMapper.xml
View file @
2a5d4cca
...
...
@@ -37,6 +37,16 @@
totals
</sql>
<select
id=
"HolidayDetails"
resultMap=
"BaseResultMap"
>
select su.*
from kqgl_asso_relation_summary su
where su.approval_type = 2
and su.org_code = #{orgcode}
and su.ordernum = 1
and SUBSTR(su.app_time,1,7) = #{apptime}
and su.leave_type_id = (select ru.id from kqgl_asso_leave_rules ru where ru.org_code = #{orgcode} and ru.rules_type = #{rules_type})
and su.user_id = #{userid}
</select>
<select
id=
"SecondaryValue"
resultMap=
"BaseResultMap"
>
select a.user_id,
...
...
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