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
9a4bb444
Commit
9a4bb444
authored
Mar 05, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
cd979acb
337cc190
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
82 additions
and
28 deletions
+82
-28
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+13
-0
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+2
-0
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+14
-0
RegistConstants.java
...com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
+5
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+33
-14
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+5
-7
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+0
-1
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-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
9a4bb444
...
@@ -393,6 +393,19 @@ public class TEmployeeProjectController {
...
@@ -393,6 +393,19 @@ public class TEmployeeProjectController {
return
tEmployeeProjectService
.
getEmpProjectStatus
(
vo
);
return
tEmployeeProjectService
.
getEmpProjectStatus
(
vo
);
}
}
/**
* @param vo 人员信息
* @Description: 获取人员项目档案信息
* @Author: huyc
* @Date: 2025/2/27 15:18
* @return:
**/
@Inner
@PostMapping
(
"/inner/getOutEmpProjectStatus"
)
public
EmpProjectStatusVo
getOutEmpProjectStatus
(
@RequestBody
EmpProjectStatusVo
vo
)
{
return
tEmployeeProjectService
.
getOutEmpProjectStatus
(
vo
);
}
/**
/**
* 通过项目编码查询项目信息
* 通过项目编码查询项目信息
* @param tEmployeeProject
* @param tEmployeeProject
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
9a4bb444
...
@@ -46,6 +46,8 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
...
@@ -46,6 +46,8 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
List
<
TSalaryStandardUnprojectVo
>
voList
);
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
List
<
TSalaryStandardUnprojectVo
>
voList
);
EmpProjectStatusVo
getEmpProjectStatus
(
EmpProjectStatusVo
vo
);
EmpProjectStatusVo
getEmpProjectStatus
(
EmpProjectStatusVo
vo
);
EmpProjectStatusVo
getOutEmpProjectStatus
(
EmpProjectStatusVo
vo
);
/**
/**
* @param tEmployeeProject
* @param tEmployeeProject
* @Description: 新增项目档案校验
* @Description: 新增项目档案校验
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
9a4bb444
...
@@ -160,6 +160,20 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -160,6 +160,20 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
null
;
return
null
;
}
}
@Override
public
EmpProjectStatusVo
getOutEmpProjectStatus
(
EmpProjectStatusVo
vo
)
{
TEmployeeProject
employeeProject
=
this
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
vo
.
getEmpIdcard
())
.
eq
(
TEmployeeProject:
:
getDeptNo
,
vo
.
getDeptNo
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ONE_INT
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
employeeProject
))
{
vo
.
setProjectTime
(
employeeProject
.
getLeaveTime
());
return
vo
;
}
return
null
;
}
@Override
@Override
public
R
addCheck
(
TEmployeeProject
tEmployeeProject
)
{
public
R
addCheck
(
TEmployeeProject
tEmployeeProject
)
{
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
View file @
9a4bb444
...
@@ -21,8 +21,12 @@ public class RegistConstants {
...
@@ -21,8 +21,12 @@ public class RegistConstants {
public
static
final
String
CONFIRM_SUBMIT
=
"确认接收"
;
public
static
final
String
CONFIRM_SUBMIT
=
"确认接收"
;
public
static
final
String
BEFORE_IN_PROJECT
=
"先于登记入项"
;
public
static
final
String
BEFORE_IN_PROJECT
=
"入职登记前已增员"
;
public
static
final
String
BEFORE_OUT_PROJECT
=
"离职登记前已减员"
;
public
static
final
String
MESSAGE_REGIST
=
"信息登记"
;
public
static
final
String
MESSAGE_REGIST
=
"信息登记"
;
public
static
final
String
MESSAGE_FINISH
=
"已处理"
;
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
9a4bb444
...
@@ -162,7 +162,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -162,7 +162,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
*/
*/
@Override
@Override
public
void
listHrExport
(
HttpServletResponse
response
,
EmployeeRegistrationSearchVo
searchVo
)
{
public
void
listHrExport
(
HttpServletResponse
response
,
EmployeeRegistrationSearchVo
searchVo
)
{
String
fileName
=
"入离职
登记
表批量导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
String
fileName
=
"入离职
待办任务
表批量导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
//获取要导出的列表
//获取要导出的列表
List
<
EmployeeRegistrationHrExportVo
>
list
=
new
ArrayList
<>();
List
<
EmployeeRegistrationHrExportVo
>
list
=
new
ArrayList
<>();
long
count
=
baseMapper
.
selectExportCount
(
searchVo
);
long
count
=
baseMapper
.
selectExportCount
(
searchVo
);
...
@@ -180,7 +180,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -180,7 +180,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
list
=
baseMapper
.
selectHrExportList
(
searchVo
);
list
=
baseMapper
.
selectHrExportList
(
searchVo
);
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"入离职
登记
表"
+
index
).
build
();
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"入离职
待办任务
表"
+
index
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
excelWriter
.
write
(
list
,
writeSheet
);
index
++;
index
++;
}
}
...
@@ -189,7 +189,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -189,7 +189,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
}
}
}
else
{
}
else
{
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"入离职
登记
表"
+
index
).
build
();
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"入离职
待办任务
表"
+
index
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
excelWriter
.
write
(
list
,
writeSheet
);
}
}
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
...
@@ -347,15 +347,18 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -347,15 +347,18 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
//状态将更新成“已处理”;处理记录中,针对此情况,记录真实的进项时间,备注:先于登记入项
//状态将更新成“已处理”;处理记录中,针对此情况,记录真实的进项时间,备注:先于登记入项
if
(
CommonConstants
.
ONE_STRING
.
equals
(
registrationNow
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
registrationNow
.
getEmpIdcard
());
vo
.
setEmpIdcard
(
registrationNow
.
getEmpIdcard
());
vo
.
setDeptNo
(
registrationNow
.
getDeptNo
());
vo
.
setDeptNo
(
registrationNow
.
getDeptNo
());
EmpProjectStatusVo
exit
=
getEmpProjectStatus
(
vo
);
EmpProjectStatusVo
exit
;
if
(
CommonConstants
.
ONE_STRING
.
equals
(
registrationNow
.
getFeedbackType
()))
{
exit
=
getEmpProjectStatus
(
vo
);
}
else
{
exit
=
getOutEmpProjectStatus
(
vo
);
}
if
(
Common
.
isNotNull
(
exit
))
{
if
(
Common
.
isNotNull
(
exit
))
{
return
R
.
ok
(
exit
.
getProjectTime
());
return
R
.
ok
(
exit
.
getProjectTime
());
}
}
}
registrationNow
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
registrationNow
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
baseMapper
.
updateById
(
registrationNow
);
baseMapper
.
updateById
(
registrationNow
);
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
CONFIRM_SUBMIT
,
LocalDateTime
.
now
(),
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
CONFIRM_SUBMIT
,
LocalDateTime
.
now
(),
...
@@ -368,9 +371,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -368,9 +371,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
Common
.
isEmpty
(
registrationNow
)
||
!
CommonConstants
.
ONE_STRING
.
equals
(
registrationNow
.
getProcessStatus
()))
{
if
(
Common
.
isEmpty
(
registrationNow
)
||
!
CommonConstants
.
ONE_STRING
.
equals
(
registrationNow
.
getProcessStatus
()))
{
return
R
.
failed
(
RegistConstants
.
NO_DATA_TO_HANDLE
);
return
R
.
failed
(
RegistConstants
.
NO_DATA_TO_HANDLE
);
}
}
registrationNow
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
registrationNow
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
CONFIRM_SUBMIT
,
registration
.
getProjectCreateTime
(),
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
CONFIRM_SUBMIT
,
LocalDateTime
.
now
(),
registrationNow
.
getRegistorUsername
(),
RegistConstants
.
BEFORE_IN_PROJECT
);
registrationNow
.
getRegistorUsername
(),
null
);
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
MESSAGE_FINISH
,
registration
.
getProjectCreateTime
(),
registrationNow
.
getRegistorUsername
(),
CommonConstants
.
ONE_STRING
.
equals
(
registrationNow
.
getFeedbackType
())
?
RegistConstants
.
BEFORE_IN_PROJECT
:
RegistConstants
.
BEFORE_OUT_PROJECT
);
baseMapper
.
updateById
(
registrationNow
);
baseMapper
.
updateById
(
registrationNow
);
return
R
.
ok
();
return
R
.
ok
();
}
}
...
@@ -422,6 +428,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -422,6 +428,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
}
}
//获取减项人员档案信息
private
EmpProjectStatusVo
getOutEmpProjectStatus
(
EmpProjectStatusVo
vo
)
{
//找到不在项人员的身份证信息
R
<
EmpProjectStatusVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
,
"/temployeeproject/inner/getOutEmpProjectStatus"
,
vo
,
EmpProjectStatusVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
vo
=
sdr
.
getData
();
return
vo
;
}
else
{
return
null
;
}
}
//数据初始化
//数据初始化
private
void
initRegistInfo
(
EmployeeRegistration
insert
,
YifuUser
user
,
TSettleDomainSelectVo
selectVo
)
{
private
void
initRegistInfo
(
EmployeeRegistration
insert
,
YifuUser
user
,
TSettleDomainSelectVo
selectVo
)
{
insert
.
setRegistorDeptname
(
user
.
getDeptName
());
insert
.
setRegistorDeptname
(
user
.
getDeptName
());
...
@@ -463,7 +482,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -463,7 +482,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
StringBuilder
description
=
new
StringBuilder
();
StringBuilder
description
=
new
StringBuilder
();
String
title
=
""
;
String
title
=
""
;
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
)
||
CommonConstants
.
TWO_STRING
.
equals
(
type
))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
)
||
CommonConstants
.
TWO_STRING
.
equals
(
type
))
{
title
=
"人员入职提醒
"
;
title
=
CommonConstants
.
ONE_STRING
.
equals
(
type
)
?
"人员入职提醒:"
:
"人员离职提醒:
"
;
description
.
append
(
CommonConstants
.
ONE_STRING
.
equals
(
type
)
?
"入职日期:"
:
"离职日期:"
)
description
.
append
(
CommonConstants
.
ONE_STRING
.
equals
(
type
)
?
"入职日期:"
:
"离职日期:"
)
.
append
(
DateUtil
.
dateToString
(
registration
.
getJoinLeaveDate
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)).
append
(
"<br>"
);
.
append
(
DateUtil
.
dateToString
(
registration
.
getJoinLeaveDate
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)).
append
(
"<br>"
);
description
.
append
(
"项目名称:"
).
append
(
registration
.
getDeptName
()).
append
(
"<br>"
);
description
.
append
(
"项目名称:"
).
append
(
registration
.
getDeptName
()).
append
(
"<br>"
);
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
9a4bb444
...
@@ -71,11 +71,9 @@
...
@@ -71,11 +71,9 @@
a.registor_username,
a.registor_username,
a.registor_deptname,
a.registor_deptname,
a.registor_deptid,
a.registor_deptid,
a.registor_deptno,
a.registor_phone,
a.registor_phone,
a.emp_deptname,
a.emp_deptname,
a.emp_deptid,
a.emp_deptid,
a.emp_deptno,
a.create_by,
a.create_by,
a.create_name,
a.create_name,
a.create_time,
a.create_time,
...
@@ -94,13 +92,13 @@
...
@@ -94,13 +92,13 @@
AND a.id = #{employeeRegistration.id}
AND a.id = #{employeeRegistration.id}
</if>
</if>
<if
test=
"employeeRegistration.employeeName != null and employeeRegistration.employeeName.trim() != ''"
>
<if
test=
"employeeRegistration.employeeName != null and employeeRegistration.employeeName.trim() != ''"
>
AND a.employee_name like CONCAT(#{employeeRegistration.employeeName},'%')
AND a.employee_name like CONCAT(
'%',
#{employeeRegistration.employeeName},'%')
</if>
</if>
<if
test=
"employeeRegistration.empIdcard != null and employeeRegistration.empIdcard.trim() != ''"
>
<if
test=
"employeeRegistration.empIdcard != null and employeeRegistration.empIdcard.trim() != ''"
>
AND a.emp_idcard like CONCAT(#{employeeRegistration.empIdcard},'%')
AND a.emp_idcard like CONCAT(
'%',
#{employeeRegistration.empIdcard},'%')
</if>
</if>
<if
test=
"employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''"
>
<if
test=
"employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''"
>
AND a.emp_phone like CONCAT(#{employeeRegistration.empPhone},'%')
AND a.emp_phone like CONCAT(
'%',
#{employeeRegistration.empPhone},'%')
</if>
</if>
<if
test=
"employeeRegistration.postList != null and employeeRegistration.postList.size() > 0 "
>
<if
test=
"employeeRegistration.postList != null and employeeRegistration.postList.size() > 0 "
>
AND a.position in
AND a.position in
...
@@ -138,8 +136,8 @@
...
@@ -138,8 +136,8 @@
<if
test=
"employeeRegistration.registorUsername != null and employeeRegistration.registorUsername.trim() != ''"
>
<if
test=
"employeeRegistration.registorUsername != null and employeeRegistration.registorUsername.trim() != ''"
>
AND a.registor_username = #{employeeRegistration.registorUsername}
AND a.registor_username = #{employeeRegistration.registorUsername}
</if>
</if>
<if
test=
"employeeRegistration.
registorDeptname != null and employeeRegistration.registorDeptn
ame.trim() != ''"
>
<if
test=
"employeeRegistration.
deptName != null and employeeRegistration.deptN
ame.trim() != ''"
>
AND a.
registor_deptname like CONCAT(#{employeeRegistration.registorDeptn
ame},'%')
AND a.
dept_name like CONCAT('%',#{employeeRegistration.deptN
ame},'%')
</if>
</if>
<if
test=
"employeeRegistration.registorDeptid != null and employeeRegistration.registorDeptid.trim() != ''"
>
<if
test=
"employeeRegistration.registorDeptid != null and employeeRegistration.registorDeptid.trim() != ''"
>
AND a.registor_deptid = #{employeeRegistration.registorDeptid}
AND a.registor_deptid = #{employeeRegistration.registorDeptid}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
9a4bb444
...
@@ -593,7 +593,6 @@
...
@@ -593,7 +593,6 @@
acc.DEPT_NO,
acc.DEPT_NO,
acc.EMP_NAME,
acc.EMP_NAME,
acc.EMP_IDCARD,
acc.EMP_IDCARD,
acc.EMP_NAME,
acc.RELAY_SALARY,
acc.RELAY_SALARY,
acc.ACTUAL_SALARY,
acc.ACTUAL_SALARY,
lll.APPLY_NO,
lll.APPLY_NO,
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
View file @
9a4bb444
...
@@ -352,6 +352,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
...
@@ -352,6 +352,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
// 先存当前部门ID
// 先存当前部门ID
allDepartIdSet
.
add
(
deptVo
.
getDeptId
().
toString
());
allDepartIdSet
.
add
(
deptVo
.
getDeptId
().
toString
());
String
ancestors
=
deptVo
.
getAncestors
();
String
ancestors
=
deptVo
.
getAncestors
();
if
(
Common
.
isNotNull
(
ancestors
)){
String
[]
ancestorArr
=
ancestors
.
split
(
CommonConstants
.
COMMA_STRING
);
String
[]
ancestorArr
=
ancestors
.
split
(
CommonConstants
.
COMMA_STRING
);
Set
<
String
>
ancestorDeptIdSet
=
Arrays
.
stream
(
ancestorArr
).
collect
(
Collectors
.
toSet
());
Set
<
String
>
ancestorDeptIdSet
=
Arrays
.
stream
(
ancestorArr
).
collect
(
Collectors
.
toSet
());
if
(
Common
.
isNotNull
(
ancestorDeptIdSet
)){
if
(
Common
.
isNotNull
(
ancestorDeptIdSet
)){
...
@@ -359,6 +360,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
...
@@ -359,6 +360,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
}
}
}
}
}
}
}
sysDeptList
=
baseMapper
.
cspDeptListByDeptIdSet
(
dept
,
allDepartIdSet
);
sysDeptList
=
baseMapper
.
cspDeptListByDeptIdSet
(
dept
,
allDepartIdSet
);
}
}
...
@@ -534,6 +536,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
...
@@ -534,6 +536,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
if
(
Common
.
isEmpty
(
findInfo
))
{
if
(
Common
.
isEmpty
(
findInfo
))
{
return
R
.
failed
(
"部门未找到"
);
return
R
.
failed
(
"部门未找到"
);
}
}
if
(
findInfo
.
getName
().
equals
(
dept
.
getName
())){
return
R
.
failed
(
"名称未发生变化,未做更新"
);
}
SysDept
nameInfo
=
baseMapper
.
checkDeptNameUnique
(
findInfo
.
getProjectNo
(),
dept
.
getName
(),
findInfo
.
getParentId
());
SysDept
nameInfo
=
baseMapper
.
checkDeptNameUnique
(
findInfo
.
getProjectNo
(),
dept
.
getName
(),
findInfo
.
getParentId
());
if
(
Common
.
isNotNull
(
nameInfo
)
&&
nameInfo
.
getDeptId
().
longValue
()
!=
dept
.
getDeptId
().
longValue
())
{
if
(
Common
.
isNotNull
(
nameInfo
)
&&
nameInfo
.
getDeptId
().
longValue
()
!=
dept
.
getDeptId
().
longValue
())
{
return
R
.
failed
(
"已存在同级同名部门"
);
return
R
.
failed
(
"已存在同级同名部门"
);
...
...
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
View file @
9a4bb444
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDeptMapper"
>
<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"
>
<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=
"name"
property=
"name"
/>
<result
column=
"parent_id"
property=
"parentId"
/>
<result
column=
"parent_id"
property=
"parentId"
/>
<result
column=
"dept_dn"
property=
"deptDn"
/>
<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