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
f6830ecb
Commit
f6830ecb
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
b8684558
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
20 deletions
+21
-20
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+13
-18
src/main/java/cn/timer/api/dto/xcgl/PayTermDto.java
+2
-0
src/main/resources/mapping/xcgl/XcglAssoJsgzzxMapper.xml
+3
-1
src/main/resources/mapping/xcgl/XcglAssoJxgzMapper.xml
+3
-1
No files found.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
f6830ecb
...
@@ -1274,22 +1274,17 @@ public class SalaryManagementController {
...
@@ -1274,22 +1274,17 @@ public class SalaryManagementController {
@PostMapping
(
value
=
"/payimport"
)
@PostMapping
(
value
=
"/payimport"
)
@ApiOperation
(
value
=
"导入薪资"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"导入薪资"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
ResponseResult
ImportSalaryData
(
@CurrentUser
UserBean
userBean
,
@RequestBody
ImportSalarySetDto
impor
)
{
public
ResponseResult
ImportSalaryData
(
@CurrentUser
UserBean
userBean
,
@RequestBody
ImportSalarySetDto
impor
)
{
// XcglAdminXzz xzz = new LambdaQueryChainWrapper<XcglAdminXzz>(xcgladminxzzmapper).eq(XcglAdminXzz::getId, impor.getGid()).one();
//用户工号来匹配入库
//XcglAssoXzury xzuryone = new LambdaQueryChainWrapper<XcglAssoXzury>(xcglassoxzurymapper).eq(XcglAssoXzury::getQyid, orgCode).eq(XcglAssoXzury::getXzzid, impor.getGid()).eq(XcglAssoXzury::getUserid, impor.getUsernum()).one();
//用户名称来匹配入库
//XcglAssoXzury yhmpp = xcglassoxzurymapper.selectImportedSalary(impor.getGid(),impor.getUsername(),String.valueOf(orgCode));
ImportSalaryDto
[]
ims
=
impor
.
getImsalary
();
//
ImportSalaryDto
[]
ims
=
impor
.
getImsalary
();
//
if
(
ims
.
length
>
0
){
if
(
ims
.
length
>
0
){
for
(
int
p
=
0
;
p
<
ims
.
length
;
p
++){
for
(
int
p
=
0
;
p
<
ims
.
length
;
p
++){
//用户工号来匹配入库
//用户工号来匹配入库
XcglAssoXzury
xzuryone
=
new
LambdaQueryChainWrapper
<
XcglAssoXzury
>(
xcglassoxzurymapper
).
eq
(
XcglAssoXzury:
:
getQyid
,
userBean
.
getOrgCode
()).
eq
(
XcglAssoXzury:
:
getXzzid
,
impor
.
getGid
()).
eq
(
XcglAssoXzury:
:
getUserid
,
ims
[
p
].
getUsernum
()).
one
();
XcglAssoXzury
xzuryone
=
new
LambdaQueryChainWrapper
<
XcglAssoXzury
>(
xcglassoxzurymapper
).
eq
(
XcglAssoXzury:
:
getQyid
,
userBean
.
getOrgCode
())
.
eq
(
XcglAssoXzury:
:
getXzzid
,
impor
.
getGid
()).
eq
(
XcglAssoXzury:
:
getUserid
,
ims
[
p
].
getUsernum
()).
one
();
//用户名称来匹配入库
//用户名称来匹配入库
XcglAssoXzury
yhmpp
=
xcglassoxzurymapper
.
selectImportedSalary
(
impor
.
getGid
(),
ims
[
p
].
getUsername
(),
String
.
valueOf
(
userBean
.
getOrgCode
()));
//
XcglAssoXzury yhmpp = xcglassoxzurymapper.selectImportedSalary(impor.getGid(),ims[p].getUsername(),String.valueOf(userBean.getOrgCode()));
int
k
=
0
;
int
k
=
0
;
if
(
xzuryone
!=
null
)
{
if
(
xzuryone
!=
null
)
{
...
@@ -1302,18 +1297,18 @@ public class SalaryManagementController {
...
@@ -1302,18 +1297,18 @@ public class SalaryManagementController {
xcglassoxzbmapper
.
ModifyImportedSalary
(
xzb
);
xcglassoxzbmapper
.
ModifyImportedSalary
(
xzb
);
k
++;
k
++;
}
}
if
(
yhmpp
!=
null
&&
k
==
0
)
{
//
if(yhmpp != null && k == 0) {
XcglAssoXzb
xzb
=
XcglAssoXzb
.
builder
().
build
();
//
XcglAssoXzb xzb = XcglAssoXzb.builder().build();
xzb
.
setUserid
(
yhmpp
.
getUserid
());
//
//
xzb.setUserid(yhmpp.getUserid());//
xzb
.
setXzyf
(
impor
.
getSxrq
());
//
//
xzb.setXzyf(impor.getSxrq());//
xzb
.
setXzxid
(
ims
[
p
].
getJsgzzx
());
//
//
xzb.setXzxid(ims[p].getJsgzzx());//
xzb
.
setXzxjg
(
Double
.
valueOf
(
ims
[
p
].
getSrz
()));
//
//
xzb.setXzxjg(Double.valueOf(ims[p].getSrz()));//
xzb
.
setQyid
(
userBean
.
getOrgCode
());
//
xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper
.
ModifyImportedSalary
(
xzb
);
//
xcglassoxzbmapper.ModifyImportedSalary(xzb);
}
//
}
}
}
}
}
return
new
ResponseResult
().
success
(
"
考勤数据同步
成功"
);
return
new
ResponseResult
().
success
(
"
导入
成功"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/xcgl/PayTermDto.java
View file @
f6830ecb
...
@@ -24,6 +24,8 @@ public class PayTermDto implements Serializable {
...
@@ -24,6 +24,8 @@ public class PayTermDto implements Serializable {
String
xgsgs
;
// 项公式
String
xgsgs
;
// 项公式
Integer
xiscustom
;
//是否自定义项(0:否;1:是)
Integer
xiscustom
;
//是否自定义项(0:否;1:是)
Integer
xrulestate
;
//
/**
/**
* 公式变量值1
* 公式变量值1
*/
*/
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoJsgzzxMapper.xml
View file @
f6830ecb
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
<result
column=
"xdegk"
property=
"xdegk"
/>
<result
column=
"xdegk"
property=
"xdegk"
/>
<result
column=
"xjxgzid"
property=
"xjxgzid"
/>
<result
column=
"xjxgzid"
property=
"xjxgzid"
/>
<result
column=
"xiscustom"
property=
"xiscustom"
/>
<result
column=
"xiscustom"
property=
"xiscustom"
/>
<result
column=
"xrulestate"
property=
"xrulestate"
/>
</resultMap>
</resultMap>
...
@@ -64,7 +65,8 @@
...
@@ -64,7 +65,8 @@
gzzx.gsgs as xgsgs,
gzzx.gsgs as xgsgs,
gzzx.dygk as xdygk,
gzzx.dygk as xdygk,
gzzx.degk as xdegk,
gzzx.degk as xdegk,
gzzx.is_custom as xiscustom
gzzx.is_custom as xiscustom,
gzzx.rulestate as xrulestate
from xcgl_asso_jsgzzx gzzx
from xcgl_asso_jsgzzx gzzx
where gzzx.jxgzid = 0
where gzzx.jxgzid = 0
and gzzx.xzzid = #{xzzid}
and gzzx.xzzid = #{xzzid}
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoJxgzMapper.xml
View file @
f6830ecb
...
@@ -34,6 +34,7 @@
...
@@ -34,6 +34,7 @@
<result
column=
"xjxgzid"
property=
"xjxgzid"
/>
<result
column=
"xjxgzid"
property=
"xjxgzid"
/>
<result
column=
"xoptionid"
property=
"xoptionid"
/>
<result
column=
"xoptionid"
property=
"xoptionid"
/>
<result
column=
"xiscustom"
property=
"xiscustom"
/>
<result
column=
"xiscustom"
property=
"xiscustom"
/>
<result
column=
"xrulestate"
property=
"xrulestate"
/>
</collection>
</collection>
</resultMap>
</resultMap>
...
@@ -188,7 +189,8 @@
...
@@ -188,7 +189,8 @@
gzzx.jxgzid as xjxgzid,
gzzx.jxgzid as xjxgzid,
gzzx.optionid as xoptionid,
gzzx.optionid as xoptionid,
jxgz.xzzid as zxzzid,
jxgz.xzzid as zxzzid,
gzzx.is_custom as xiscustom
gzzx.is_custom as xiscustom,
gzzx.rulestate as xrulestate
from xcgl_asso_jxgz jxgz
from xcgl_asso_jxgz jxgz
LEFT JOIN xcgl_asso_jsgzzx as gzzx on gzzx.jxgzid = jxgz.id
LEFT JOIN xcgl_asso_jsgzzx as gzzx on gzzx.jxgzid = jxgz.id
where jxgz.xzzid = #{xzzid}
where jxgz.xzzid = #{xzzid}
...
...
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