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
2f010017
Commit
2f010017
authored
4 years ago
by
mobh
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分代码及 增加保存薪资明细修改接口
parent
815aa215
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
3 deletions
+24
-3
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+0
-0
src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzbMapper.java
+4
-1
src/main/java/cn/timer/api/dto/xcgl/CheckSalaryStaffDto.java
+3
-0
src/main/resources/mapping/xcgl/XcglAssoXzbMapper.xml
+17
-2
No files found.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
2f010017
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzbMapper.java
View file @
2f010017
package
cn
.
timer
.
api
.
dao
.
xcgl
;
package
cn
.
timer
.
api
.
dao
.
xcgl
;
import
java.util.List
;
import
java.util.List
;
import
cn.timer.api.dto.xcgl.CheckSalaryStaffDto
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
...
@@ -20,7 +21,7 @@ public interface XcglAssoXzbMapper extends BaseMapper<XcglAssoXzb> {
...
@@ -20,7 +21,7 @@ public interface XcglAssoXzbMapper extends BaseMapper<XcglAssoXzb> {
int
deleteByuserid
(
int
userid
,
int
xzzid
,
String
xzyf
);
int
deleteByuserid
(
int
userid
,
int
xzzid
,
String
xzyf
);
List
<
CalculationDto
>
CalculationResults
(
int
xzzid
,
int
orgcode
);
List
<
CalculationDto
>
CalculationResults
(
CheckSalaryStaffDto
checksalary
);
int
deleteByAttendance
(
int
userid
,
int
xzzid
,
String
xzyf
);
int
deleteByAttendance
(
int
userid
,
int
xzzid
,
String
xzyf
);
...
@@ -31,4 +32,6 @@ public interface XcglAssoXzbMapper extends BaseMapper<XcglAssoXzb> {
...
@@ -31,4 +32,6 @@ public interface XcglAssoXzbMapper extends BaseMapper<XcglAssoXzb> {
CalculationValueDto
lateearlyDeduction
(
int
empnum
,
int
xzzid
,
String
salaryitem
);
CalculationValueDto
lateearlyDeduction
(
int
empnum
,
int
xzzid
,
String
salaryitem
);
int
ModifyImportedSalary
(
XcglAssoXzb
xcglassoxzb
);
int
ModifyImportedSalary
(
XcglAssoXzb
xcglassoxzb
);
void
updateBatchXzxjg
(
List
<
XcglAssoXzb
>
list
);
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/xcgl/CheckSalaryStaffDto.java
View file @
2f010017
...
@@ -18,6 +18,9 @@ public class CheckSalaryStaffDto extends Page{
...
@@ -18,6 +18,9 @@ public class CheckSalaryStaffDto extends Page{
@ApiModelProperty
(
value
=
"薪资组id "
,
example
=
"薪资组id"
)
@ApiModelProperty
(
value
=
"薪资组id "
,
example
=
"薪资组id"
)
int
paygroupid
;
int
paygroupid
;
@ApiModelProperty
(
value
=
"薪资月份 "
,
example
=
"薪资月份"
)
private
String
xzyf
;
@ApiModelProperty
(
value
=
"企业编号 "
,
example
=
"企业编号"
)
@ApiModelProperty
(
value
=
"企业编号 "
,
example
=
"企业编号"
)
int
orgcode
;
int
orgcode
;
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoXzbMapper.xml
View file @
2f010017
...
@@ -73,8 +73,12 @@
...
@@ -73,8 +73,12 @@
from zzgl_bmgw_m m
from zzgl_bmgw_m m
left join zzgl_bmgw_m um on um.id = m.up_id
left join zzgl_bmgw_m um on um.id = m.up_id
) as bmgw on bmgw.mid = emp.bmgw_id
) as bmgw on bmgw.mid = emp.bmgw_id
where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{xzzid})
where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
and xzbs.xzyf = (select xzz.xzyf from xcgl_admin_xzz xzz where xzz.id = #{xzzid})
and (xzbs.xzyf = #{xzyf} or xzbs.xzyf = '')
and emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
<if
test=
"text != ''"
>
and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
</if>
) as aa
) as aa
where aa.orgcode = #{orgcode}
where aa.orgcode = #{orgcode}
</select>
</select>
...
@@ -192,6 +196,17 @@
...
@@ -192,6 +196,17 @@
and xzyf = #{xzyf}
and xzyf = #{xzyf}
and xzxid = #{xzxid}
and xzxid = #{xzxid}
</update>
</update>
<!-- 批量更新薪资结果 -->
<update
id=
"updateBatchXzxjg"
parameterType=
"java.util.List"
>
<foreach
collection=
"list"
item=
"item"
index=
"index"
open=
""
close=
""
separator=
";"
>
UPDATE xcgl_asso_xzb
<set>
xzxjg=${item.xzxjg}
</set>
where id = ${item.id}
</foreach>
</update>
<!-- <delete id="delete" >
<!-- <delete id="delete" >
DELETE FROM xcgl_asso_xzb
DELETE FROM xcgl_asso_xzb
...
...
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