Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
b989b140
Commit
b989b140
authored
Mar 03, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.7-花名册
parent
1e1d4727
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
3 deletions
+19
-3
EmployeeProjectScpVO.java
.../cloud/plus/v1/yifu/archives/vo/EmployeeProjectScpVO.java
+2
-2
TEmployeeProjectBelongDeptServiceImpl.java
...s/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
+2
-0
TEmployeeProjectBelongDeptMapper.xml
...ain/resources/mapper/TEmployeeProjectBelongDeptMapper.xml
+15
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectScpVO.java
View file @
b989b140
...
...
@@ -34,7 +34,7 @@ import java.time.LocalDate;
*/
@Data
@ColumnWidth
(
30
)
public
class
EmployeeProjectScpVO
extends
RowIndex
implements
Serializable
{
public
class
EmployeeProjectScpVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -72,7 +72,7 @@ public class EmployeeProjectScpVO extends RowIndex implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"入/离职日期"
)
@ExcelAttribute
(
name
=
"入/离职日期"
)
private
LocalDate
enjoinDateAndLeaveTime
;
private
String
enjoinDateAndLeaveTime
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"合同签订状态"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
View file @
b989b140
...
...
@@ -78,6 +78,8 @@ public class TEmployeeProjectBelongDeptServiceImpl extends ServiceImpl<TEmployee
// 没传项目id,置为-1,不给查询
tEmployeeProjectBelongDept
.
setDeptId
(
"-1"
);
}
// empDeptId == -1,则查项目下所有 所属部门 为空的(逻辑在XML的where里)
// 2025-3-3 11:52:18 倩倩与宇茜沟通后确定的,宇茜说 所属部门树的顶级的数字,是底下加上的,所以没有 包含空的
if
(
Common
.
isNotNull
(
tEmployeeProjectBelongDept
.
getEmpDeptId
())
&&
!
"-1"
.
equals
(
tEmployeeProjectBelongDept
.
getEmpDeptId
()))
{
tEmployeeProjectBelongDept
.
setEmpDeptIdArray
(
tEmployeeProjectBelongDept
.
getEmpDeptId
().
split
(
","
));
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectBelongDeptMapper.xml
View file @
b989b140
...
...
@@ -31,6 +31,13 @@
</resultMap>
<sql
id=
"tEmployeeProjectBelongDept_where"
>
<if
test=
"tEmployeeProjectBelongDept != null"
>
<if
test=
"tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''"
>
AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId}
</if>
<if
test=
"tEmployeeProjectBelongDept.empDeptId != null and tEmployeeProjectBelongDept.empDeptId.trim() != ''
and tEmployeeProjectBelongDept.empDeptId.trim() == '-1'"
>
AND b.id is null
</if>
<if
test=
"tEmployeeProjectBelongDept.empName != null and tEmployeeProjectBelongDept.empName.trim() != ''"
>
AND a.EMP_NAME like concat('%',#{tEmployeeProjectBelongDept.empName},'%')
</if>
...
...
@@ -47,6 +54,13 @@
#{param}
</foreach>
</if>
<if
test=
"tEmployeeProjectBelongDept.empDeptIdArray != null and tEmployeeProjectBelongDept.empDeptIdArray.length > 0"
>
AND b.emp_deptid in
<foreach
item=
"idStr"
index=
"index"
collection=
"tEmployeeProjectBelongDept.empDeptIdArray"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
<if
test=
"tEmployeeProjectBelongDept.contractStatusArray != null and tEmployeeProjectBelongDept.contractStatusArray.length > 0"
>
AND a.CONTRACT_STATUS in
<foreach
item=
"idStr"
index=
"index"
collection=
"tEmployeeProjectBelongDept.contractStatusArray"
open=
"("
...
...
@@ -143,7 +157,7 @@
a.DELETE_FLAG ='0'
<include
refid=
"tEmployeeProjectBelongDept_where"
/>
</where>
<if
test=
"tEmployeeProjectBelongDept
_where
!= null"
>
<if
test=
"tEmployeeProjectBelongDept != null"
>
<if
test=
"tEmployeeProjectBelongDept.limitStart != null"
>
limit #{tEmployeeProjectBelongDept.limitStart},#{tEmployeeProjectBelongDept.limitEnd}
</if>
...
...
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