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
b79cc16f
Commit
b79cc16f
authored
4 years ago
by
leialin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into 'develop'
提交 See merge request 8timerv2/8timerapiv200!497
parents
412052f3
967334fb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
19 deletions
+6
-19
src/main/java/cn/timer/api/dto/spmk/MySummaryQueryDto.java
+2
-2
src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
+4
-17
No files found.
src/main/java/cn/timer/api/dto/spmk/MySummaryQueryDto.java
View file @
b79cc16f
...
@@ -27,7 +27,7 @@ public class MySummaryQueryDto extends Page{
...
@@ -27,7 +27,7 @@ public class MySummaryQueryDto extends Page{
@ApiModelProperty
(
value
=
"关键字 标题/审批人名称/审批总汇id"
,
example
=
""
)
@ApiModelProperty
(
value
=
"关键字 标题/审批人名称/审批总汇id"
,
example
=
""
)
private
String
query
;
private
String
query
;
@ApiModelProperty
(
value
=
"状态 0审批中 1审批撤销 2审批通过/审批完成 3审批拒绝"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"状态 0审批中 1审批撤销 2审批通过/审批完成 3审批拒绝
4 已审批 5全部
"
,
example
=
"0"
)
private
Integer
sts
;
private
Integer
sts
;
@ApiModelProperty
(
value
=
"开始时间 "
,
example
=
""
)
@ApiModelProperty
(
value
=
"开始时间 "
,
example
=
""
)
...
@@ -39,7 +39,7 @@ public class MySummaryQueryDto extends Page{
...
@@ -39,7 +39,7 @@ public class MySummaryQueryDto extends Page{
@NotNull
(
message
=
ValidationMsg
.
NOTNULL
)
@NotNull
(
message
=
ValidationMsg
.
NOTNULL
)
@DecimalMax
(
value
=
"3"
,
message
=
ValidationMsg
.
DECIMALMAX
+
" 只能为 0我发起的 1抄送我的 2我审批的 3全部"
)
@DecimalMax
(
value
=
"3"
,
message
=
ValidationMsg
.
DECIMALMAX
+
" 只能为 0我发起的 1抄送我的 2我审批的 3全部"
)
@DecimalMin
(
value
=
"0"
,
message
=
ValidationMsg
.
DECIMALMIN
+
" 只能为 0我发起的 1抄送我的 2我审批的 3全部"
)
@DecimalMin
(
value
=
"0"
,
message
=
ValidationMsg
.
DECIMALMIN
+
" 只能为 0我发起的 1抄送我的 2我审批的 3全部"
)
@ApiModelProperty
(
value
=
"0我发起的 1抄送我的 2我审批的"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"0我发起的 1抄送我的 2我审批的
3全部
"
,
example
=
"0"
)
private
Integer
type
;
private
Integer
type
;
}
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
View file @
b79cc16f
...
@@ -71,21 +71,6 @@
...
@@ -71,21 +71,6 @@
</sql>
</sql>
<select
id=
"selectPageByQueryLeaveBalance"
resultMap=
"LeaveBalanceMap"
>
<select
id=
"selectPageByQueryLeaveBalance"
resultMap=
"LeaveBalanceMap"
>
<!-- SELECT emp.emp_num as empnum,
emp.`name` as empname,
IFNULL(c.name,'') as department,
IFNULL(emp.rz_time,'') as rztime,
yz.leave_rules_id as leaverulesid,
yz.balancedays
from yggl_main_emp emp
LEFT JOIN zzgl_bmgw_m as gw on gw.id = emp.bmgw_id
LEFT JOIN zzgl_bmgw_m as c ON c.id = gw.up_id
LEFT JOIN (select bal.leave_rules_id,bal.userid,SUM(bal.balance_days) as balancedays
from kqgl_asso_leave_balance bal
where bal.org_code = #{param.orgCode}
GROUP BY bal.userid,bal.leave_rules_id) as yz on yz.userid = emp.emp_num
where emp.org_code = #{param.orgCode} -->
SELECT emp.emp_num as empnum,
SELECT emp.emp_num as empnum,
emp.`name` as empname,
emp.`name` as empname,
emp.org_code as orgcode,
emp.org_code as orgcode,
...
@@ -102,9 +87,11 @@
...
@@ -102,9 +87,11 @@
c.name like CONCAT('%',#{param.query},'%'))
c.name like CONCAT('%',#{param.query},'%'))
</if>
</if>
<if
test=
"param.deptid != null and param.deptid != ''"
>
<if
test=
"param.deptid != null and param.deptid != ''"
>
and c.id
= #{param.deptid}
and c.id
in (select m.id from zzgl_bmgw_m m where m.up_id = #{param.deptid}) or (c.id =#{param.deptid})
</if>
</if>
<!-- ORDER BY emp.emp_num DESC
<!--and c.id = #{param.deptid}
ORDER BY emp.emp_num DESC
LEFT JOIN kqgl_asso_leave_employee_balance as yz on yz.userid = emp.emp_num
LEFT JOIN kqgl_asso_leave_employee_balance as yz on yz.userid = emp.emp_num
yz.leave_rules_id as leaverulesid,
yz.leave_rules_id as leaverulesid,
yz.balance_days as balancedays-->
yz.balance_days as balancedays-->
...
...
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