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
7e3566c6
Commit
7e3566c6
authored
Mar 05, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
e6c9c25f
9a4bb444
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
11 deletions
+14
-11
TEmployeeProjectBelongDept.java
...s/v1/yifu/archives/entity/TEmployeeProjectBelongDept.java
+2
-0
TEmployeeProjectBelongDeptSearchVo.java
.../yifu/archives/vo/TEmployeeProjectBelongDeptSearchVo.java
+0
-2
TEmployeeProjectBelongDeptService.java
...u/archives/service/TEmployeeProjectBelongDeptService.java
+2
-2
TEmployeeProjectBelongDeptServiceImpl.java
...s/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
+0
-2
SysDeptServiceImpl.java
...d/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
+9
-4
SysDeptMapper.xml
...yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProjectBelongDept.java
View file @
7e3566c6
...
...
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -65,6 +66,7 @@ public class TEmployeeProjectBelongDept {
private
String
empDeptid
;
// 日志确认接收时间,与项目档案日期比较
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@TableField
(
exist
=
false
)
private
LocalDateTime
logCreateTime
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeProjectBelongDeptSearchVo.java
View file @
7e3566c6
...
...
@@ -16,8 +16,6 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectBelongDeptService.java
View file @
7e3566c6
...
...
@@ -64,9 +64,9 @@ public interface TEmployeeProjectBelongDeptService extends IService<TEmployeePro
* 根据权限获取对应部门ID下的花名册总数Map
*
* @param tEmployeeProjectBelongDept 花名册查询
* @return Map<String,Integer> 对应部门ID下的花名册总数Map
* @return Map<String,
Integer> 对应部门ID下的花名册总数Map
*/
Map
<
String
,
Integer
>
getDeptCountMap
(
TEmployeeProjectBelongDeptSearchVo
tEmployeeProjectBelongDept
,
UserPermissionVo
authority
);
Map
<
String
,
Integer
>
getDeptCountMap
(
TEmployeeProjectBelongDeptSearchVo
tEmployeeProjectBelongDept
,
UserPermissionVo
authority
);
/**
* 没有关联部门的花名册总数
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
View file @
7e3566c6
...
...
@@ -22,7 +22,6 @@ import com.alibaba.excel.write.metadata.WriteSheet;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectBelongDeptMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectBelongDeptService
;
...
...
@@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse;
import
java.io.IOException
;
import
java.net.URLEncoder
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
* 项目档案所属部门表
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
View file @
7e3566c6
...
...
@@ -352,10 +352,12 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
// 先存当前部门ID
allDepartIdSet
.
add
(
deptVo
.
getDeptId
().
toString
());
String
ancestors
=
deptVo
.
getAncestors
();
String
[]
ancestorArr
=
ancestors
.
split
(
CommonConstants
.
COMMA_STRING
);
Set
<
String
>
ancestorDeptIdSet
=
Arrays
.
stream
(
ancestorArr
).
collect
(
Collectors
.
toSet
());
if
(
Common
.
isNotNull
(
ancestorDeptIdSet
)){
allDepartIdSet
.
addAll
(
ancestorDeptIdSet
);
if
(
Common
.
isNotNull
(
ancestors
)){
String
[]
ancestorArr
=
ancestors
.
split
(
CommonConstants
.
COMMA_STRING
);
Set
<
String
>
ancestorDeptIdSet
=
Arrays
.
stream
(
ancestorArr
).
collect
(
Collectors
.
toSet
());
if
(
Common
.
isNotNull
(
ancestorDeptIdSet
)){
allDepartIdSet
.
addAll
(
ancestorDeptIdSet
);
}
}
}
}
...
...
@@ -534,6 +536,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
if
(
Common
.
isEmpty
(
findInfo
))
{
return
R
.
failed
(
"部门未找到"
);
}
if
(
findInfo
.
getName
().
equals
(
dept
.
getName
())){
return
R
.
failed
(
"名称未发生变化,未做更新"
);
}
SysDept
nameInfo
=
baseMapper
.
checkDeptNameUnique
(
findInfo
.
getProjectNo
(),
dept
.
getName
(),
findInfo
.
getParentId
());
if
(
Common
.
isNotNull
(
nameInfo
)
&&
nameInfo
.
getDeptId
().
longValue
()
!=
dept
.
getDeptId
().
longValue
())
{
return
R
.
failed
(
"已存在同级同名部门"
);
...
...
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
View file @
7e3566c6
...
...
@@ -19,7 +19,7 @@
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDeptMapper"
>
<!-- 通用查询映射结果 -->
<resultMap
id=
"BaseResultMap"
type=
"com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept"
>
<id
column=
"dept
I
d"
property=
"deptId"
/>
<id
column=
"dept
_i
d"
property=
"deptId"
/>
<result
column=
"name"
property=
"name"
/>
<result
column=
"parent_id"
property=
"parentId"
/>
<result
column=
"dept_dn"
property=
"deptDn"
/>
...
...
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