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
5846e517
Commit
5846e517
authored
4 years ago
by
ilal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
ef9d2042
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
1 deletions
+50
-1
src/main/java/cn/timer/api/bean/xcgl/XcglAssoGztzt.java
+4
-0
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+32
-1
src/main/java/cn/timer/api/dto/xcgl/APPPayslipPeriodDto.java
+13
-0
src/main/resources/mapping/xcgl/XcglAssoGztztMapper.xml
+1
-0
No files found.
src/main/java/cn/timer/api/bean/xcgl/XcglAssoGztzt.java
View file @
5846e517
...
...
@@ -65,6 +65,9 @@ public class XcglAssoGztzt extends Model<XcglAssoGztzt> {
@ApiModelProperty
(
value
=
"实发工资"
,
example
=
"101"
)
private
Double
sfgz
;
@ApiModelProperty
(
value
=
"薪资组id"
,
example
=
"101"
)
private
Integer
xzzid
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
5846e517
...
...
@@ -95,6 +95,7 @@ import cn.timer.api.dao.xcgl.XcglSalaryItemMapper;
import
cn.timer.api.dao.yggl.YgglMainEmpMapper
;
import
cn.timer.api.dto.kqmk.CalculatingCompensationDto
;
import
cn.timer.api.dto.sbgjj.InspersonnelDto
;
import
cn.timer.api.dto.xcgl.APPPayslipPeriodDto
;
import
cn.timer.api.dto.xcgl.AdditionalDeductionDto
;
import
cn.timer.api.dto.xcgl.AppPaysSalaryOneDto
;
import
cn.timer.api.dto.xcgl.AppPaysSalaryTwoDto
;
...
...
@@ -2013,6 +2014,7 @@ public class SalaryManagementController {
gzt
.
setYhqm
(
null
);
gzt
.
setSfgz
(
net_salary
);
gzt
.
setQyid
(
orgcode
);
gzt
.
setXzzid
(
calcomtiondto
.
getPay_group_id
());
gzt
.
insert
();
}
//薪资组内成员--结束
...
...
@@ -3367,6 +3369,31 @@ public class SalaryManagementController {
return
ResultUtil
.
success
(
"成功"
);
}
@PostMapping
(
value
=
"/appacquisition"
)
@ApiOperation
(
value
=
"APP获取工资前期预备数据"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
AppAcquisition
(
@CurrentUser
UserBean
userBean
,
@RequestBody
APPPayslipPeriodDto
apppays
)
{
PushPayslipDto
pays
=
new
PushPayslipDto
();
XcglAssoGztzt
gzt
=
XcglAssoGztzt
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
XcglAssoGztzt
>().
lambda
().
eq
(
XcglAssoGztzt:
:
getUserid
,
apppays
.
getUserid
())
.
eq
(
XcglAssoGztzt:
:
getXzyf
,
apppays
.
getXzyf
()).
eq
(
XcglAssoGztzt:
:
getQyid
,
userBean
.
getOrgCode
()));
if
(
gzt
!=
null
)
{
pays
.
setGztid
(
gzt
.
getId
());
pays
.
setXzzid
(
gzt
.
getXzzid
());
pays
.
setUserid
(
gzt
.
getUserid
());
pays
.
setXzyf
(
gzt
.
getXzyf
());
}
else
{
pays
.
setGztid
(
0
);
pays
.
setXzzid
(
0
);
pays
.
setUserid
(
0
);
pays
.
setXzyf
(
""
);
}
return
ResultUtil
.
data
(
pays
,
"操作成功!"
);
}
@Autowired
private
KqglAssoRelationSummaryMapper
kqglassorelationsummarymapper
;
...
...
@@ -3382,7 +3409,7 @@ public class SalaryManagementController {
AppPayslipDetailsDto
top
=
new
AppPayslipDetailsDto
();
//工资条数据
XcglAssoGztzt
gzt
=
XcglAssoGztzt
.
builder
().
id
(
pays
.
getGztid
()).
build
().
selectById
();
if
(
gzt
!=
null
)
{
if
(
gzt
!=
null
&&
gzt
.
getFsType
()
==
1
)
{
//已发送的工资条
top
.
setId
(
gzt
.
getId
());
top
.
setNetsalary
(
gzt
.
getSfgz
());
//实发工资
top
.
setWagetime
(
gzt
.
getXzyf
());
//工资时间
...
...
@@ -3599,6 +3626,10 @@ public class SalaryManagementController {
}
return
ResultUtil
.
data
(
top
,
"操作成功!"
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/xcgl/APPPayslipPeriodDto.java
0 → 100644
View file @
5846e517
package
cn
.
timer
.
api
.
dto
.
xcgl
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
APPPayslipPeriodDto
{
private
Integer
userid
;
private
String
xzyf
;
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoGztztMapper.xml
View file @
5846e517
...
...
@@ -15,6 +15,7 @@
<result
column=
"qyid"
property=
"qyid"
/>
<result
column=
"gztszid"
property=
"gztszid"
/>
<result
column=
"sfgz"
property=
"sfgz"
/>
<result
column=
"xzzid"
property=
"xzzid"
/>
</resultMap>
<resultMap
id=
"PayslipDetailsMap"
type=
"cn.timer.api.dto.xcgl.PayslipDetailsDto"
>
...
...
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