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
adad0c8f
Commit
adad0c8f
authored
4 years ago
by
ilal
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into develop
parents
683636d1
ad2edc87
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+12
-1
src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
+1
-1
No files found.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
adad0c8f
...
@@ -871,7 +871,7 @@ public class SalaryManagementController {
...
@@ -871,7 +871,7 @@ public class SalaryManagementController {
if
(
paycus
.
length
>
0
)
{
if
(
paycus
.
length
>
0
)
{
int
z
=
xzdazdy
.
size
()
+
1
;
int
z
=
xzdazdy
.
size
()
+
1
;
for
(
int
p
=
0
;
p
<
paycus
.
length
;
p
++)
{
for
(
int
p
=
0
;
p
<
paycus
.
length
;
p
++)
{
if
(
paycus
[
p
].
getId
()
!=
0
)
{
// 修改
if
(
paycus
[
p
].
getId
()
!=
null
)
{
// 修改
XcglAssoXzdazdy
zdy
=
new
XcglAssoXzdazdy
();
XcglAssoXzdazdy
zdy
=
new
XcglAssoXzdazdy
();
zdy
.
setId
(
paycus
[
p
].
getId
());
zdy
.
setId
(
paycus
[
p
].
getId
());
zdy
.
setZdmc
(
paycus
[
p
].
getTitle
());
// 字段名
zdy
.
setZdmc
(
paycus
[
p
].
getTitle
());
// 字段名
...
@@ -968,8 +968,19 @@ public class SalaryManagementController {
...
@@ -968,8 +968,19 @@ public class SalaryManagementController {
int
zdyid
=
xzdadx
.
getId
();
int
zdyid
=
xzdadx
.
getId
();
List
<
XcglAssoXzdaz
>
xzdazlist
=
new
ArrayList
<
XcglAssoXzdaz
>();
List
<
XcglAssoXzdaz
>
xzdazlist
=
new
ArrayList
<
XcglAssoXzdaz
>();
CustomDto
[]
cus
=
fixedsalarydto
.
getCus
();
CustomDto
[]
cus
=
fixedsalarydto
.
getCus
();
List
<
XcglAssoXzdazdy
>
xzs
=
XcglAssoXzdazdy
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
XcglAssoXzdazdy
>().
lambda
().
eq
(
XcglAssoXzdazdy:
:
getQyid
,
userBean
.
getOrgCode
()));
for
(
XcglAssoXzdazdy
xz
:
xzs
)
{
XcglAssoXzdaz
xzdaz
=
XcglAssoXzdaz
.
builder
().
build
();
xzdaz
.
setXzdazdyid
(
xz
.
getId
());
//薪资档案自定义id
xzdaz
.
setRsz
(
"0"
);
//输入值
xzdaz
.
setXzdadxid
(
zdyid
);
//薪资档案-定薪id
xzdaz
.
insert
();
}
if
(
cus
.
length
>
0
){
if
(
cus
.
length
>
0
){
for
(
int
p
=
0
;
p
<
cus
.
length
;
p
++){
for
(
int
p
=
0
;
p
<
cus
.
length
;
p
++){
XcglAssoXzdaz
.
builder
().
build
().
delete
(
new
QueryWrapper
<
XcglAssoXzdaz
>().
lambda
().
eq
(
XcglAssoXzdaz:
:
getXzdazdyid
,
cus
[
p
].
getId
()).
eq
(
XcglAssoXzdaz:
:
getXzdadxid
,
zdyid
));
XcglAssoXzdaz
xzdaz
=
new
XcglAssoXzdaz
();
XcglAssoXzdaz
xzdaz
=
new
XcglAssoXzdaz
();
xzdaz
.
setXzdazdyid
(
cus
[
p
].
getId
());
//薪资档案自定义id
xzdaz
.
setXzdazdyid
(
cus
[
p
].
getId
());
//薪资档案自定义id
xzdaz
.
setRsz
(
cus
[
p
].
getVal
());
//输入值
xzdaz
.
setRsz
(
cus
[
p
].
getVal
());
//输入值
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
View file @
adad0c8f
...
@@ -195,7 +195,7 @@
...
@@ -195,7 +195,7 @@
xzdaz.rsz as dazrsz,
xzdaz.rsz as dazrsz,
xzdaz.xzdadxid as xzdadxid
xzdaz.xzdadxid as xzdadxid
from yggl_main_emp emp
from yggl_main_emp emp
LEFT JOIN xcgl_asso_xzdadx as dadx on dadx.userid = emp.emp_num and dadx.txzt = 0
LEFT JOIN xcgl_asso_xzdadx as dadx on dadx.userid = emp.emp_num and dadx.txzt = 0
and dadx.qyid = #{param.orgcode}
LEFT JOIN xcgl_asso_xzdaz as xzdaz on xzdaz.xzdadxid = dadx.id
LEFT JOIN xcgl_asso_xzdaz as xzdaz on xzdaz.xzdadxid = dadx.id
where emp.org_code = #{param.orgcode}
where emp.org_code = #{param.orgcode}
<if
test=
"param.status != ''"
>
<if
test=
"param.status != ''"
>
...
...
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