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
c01b0003
Commit
c01b0003
authored
Mar 13, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入离职登记提交
parent
be7c56a2
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
83 additions
and
11 deletions
+83
-11
TSettleDomainRegistListVo.java
...d/plus/v1/yifu/archives/vo/TSettleDomainRegistListVo.java
+14
-0
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+17
-0
TSettleDomainMapper.java
...oud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java
+2
-3
TSettleDomainService.java
...d/plus/v1/yifu/archives/service/TSettleDomainService.java
+2
-1
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+5
-1
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+8
-0
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+15
-0
EmployeeRegistrationPre.java
...ifu/cloud/plus/v1/csp/entity/EmployeeRegistrationPre.java
+1
-1
EmployeeRegistrationSearchVo.java
...fu/cloud/plus/v1/csp/vo/EmployeeRegistrationSearchVo.java
+1
-1
EmployeeRegistrationPreController.java
.../v1/csp/controller/EmployeeRegistrationPreController.java
+2
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+9
-2
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+7
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainRegistListVo.java
0 → 100644
View file @
c01b0003
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
TSettleDomainRegistListVo
{
/**
* 合同主体项目编码
*/
private
List
<
String
>
deptNos
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
c01b0003
...
...
@@ -483,4 +483,21 @@ public class TSettleDomainController {
List
<
TDomainUpCsVo
>
list
=
JSONObject
.
parseArray
(
jsonStr
,
TDomainUpCsVo
.
class
);
return
tSettleDomainService
.
updateProjectCsInfo
(
list
);
}
/**
* 获取登录用户拥有的项目前端客服数据
*
* @param
* @return
* @Author huych
* @Date 2025-03-13
**/
@Operation
(
description
=
"获取登录用户拥有的项目前端客服数据)"
)
@Inner
@PostMapping
(
"/getAllDeptByCustomerLoginName"
)
public
TSettleDomainRegistListVo
getAllDeptByCustomerLoginName
(
@RequestBody
String
userLoginName
)
{
TSettleDomainRegistListVo
vo
=
new
TSettleDomainRegistListVo
();
vo
.
setDeptNos
(
tSettleDomainService
.
getAllDeptByCustomerLoginName
(
userLoginName
));
return
vo
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java
View file @
c01b0003
...
...
@@ -23,12 +23,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
org.apache.ibatis.annotations.MapKey
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.HashMap
;
import
java.util.List
;
/**
...
...
@@ -115,4 +112,6 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
List
<
TSettleDomain
>
getAllInfoMap
();
List
<
String
>
getAllDeptByCustomerLoginName
(
@Param
(
value
=
"userLoginName"
)
String
userLoginName
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java
View file @
c01b0003
...
...
@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpDisabilityInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -88,6 +87,8 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
List
<
String
>
getSettleDomainIdsByUserId
(
String
id
);
List
<
String
>
getAllDeptByCustomerLoginName
(
String
userLoginName
);
/**
* 获取用户所拥有的项目编码
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
c01b0003
...
...
@@ -17,7 +17,6 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
...
@@ -542,4 +541,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
}
return
R
.
ok
(
Boolean
.
TRUE
,
CommonConstants
.
RESULT_DATA_SUCESS
);
}
@Override
public
List
<
String
>
getAllDeptByCustomerLoginName
(
String
userLoginName
)
{
return
baseMapper
.
getAllDeptByCustomerLoginName
(
userLoginName
);
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
c01b0003
...
...
@@ -638,4 +638,12 @@
t_settle_domain a
where a.DELETE_FLAG = '0'
</select>
<select
id=
"getAllDeptByCustomerLoginName"
resultType=
"java.lang.String"
>
SELECT
distinct(a.DEPART_NO) as DEPART_NO
FROM
t_settle_domain a
where a.DELETE_FLAG = '0' and a.CS_LOGIN_NAME = #{userLoginName}
</select>
</mapper>
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
c01b0003
...
...
@@ -530,4 +530,19 @@ public class ArchivesDaprUtil {
public
R
<
Boolean
>
saveOrDeleteDeptRelation
(
SysCspDeptVo
vo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeeprojectbelongdept/inner/saveOrDeleteDeptRelation"
,
JSON
.
toJSONString
(
vo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
/**
* @Author huych
* @Description 获取登录人所有的项目对应的前端客服权限
* @Date 15:58 2025/3/13
* @Param
* @return
**/
public
R
<
TSettleDomainRegistListVo
>
getAllDeptByCustomerLoginName
(
String
userLoginName
){
R
<
TSettleDomainRegistListVo
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/tsettledomain/getAllDeptByCustomerLoginName"
,
userLoginName
,
TSettleDomainRegistListVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"获取项目信息失败!"
);
}
return
res
;
}
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/entity/EmployeeRegistrationPre.java
View file @
c01b0003
...
...
@@ -44,7 +44,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema
(
description
=
"入职日期"
)
private
Date
joinLeaveDate
;
@Schema
(
description
=
"状态,0短信待发送,1信息待填写,2信息待审核,3拒绝入职"
)
@Schema
(
description
=
"状态,0短信待发送,1信息待填写,2信息待审核,3拒绝入职
,4已完成
"
)
private
String
processStatus
;
@Schema
(
description
=
"前端客服"
)
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationSearchVo.java
View file @
c01b0003
...
...
@@ -81,6 +81,6 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration {
@Schema
(
description
=
"项目权限数组"
)
@TableField
(
exist
=
false
)
private
Set
<
String
>
deptIdSe
t
;
private
List
<
String
>
deptNoLis
t
;
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/controller/EmployeeRegistrationPreController.java
View file @
c01b0003
...
...
@@ -38,7 +38,7 @@ public class EmployeeRegistrationPreController {
@Operation
(
description
=
"简单分页查询"
)
@GetMapping
(
"/page"
)
public
R
<
IPage
<
EmployeeRegistrationPre
>>
getEmployeeRegistrationPrePage
(
Page
<
EmployeeRegistrationPre
>
page
,
EmployeeRegistrationPreSearchVo
employeeRegistrationPre
)
{
return
new
R
<>(
employeeRegistrationPreService
.
getEmployeeRegistrationPrePage
(
page
,
employeeRegistrationPre
));
return
new
R
<>(
employeeRegistrationPreService
.
getEmployeeRegistrationPrePage
(
page
,
employeeRegistrationPre
));
}
/**
* 不分页查询
...
...
@@ -94,6 +94,6 @@ public class EmployeeRegistrationPreController {
@Operation
(
description
=
"导出入职待建档表"
)
@PostMapping
(
"/export"
)
public
void
export
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationPreSearchVo
searchVo
)
{
employeeRegistrationPreService
.
listExport
(
response
,
searchVo
);
employeeRegistrationPreService
.
listExport
(
response
,
searchVo
);
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
c01b0003
...
...
@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainRegistListVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
...
...
@@ -124,8 +125,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
YifuUser
user
=
SecurityUtils
.
getUser
();
long
roleId
=
1839501715787390978L
;
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
if
(
isSsc
)
{
employeeRegistration
.
setCustomerUserLoginname
(
null
);
if
(!
isSsc
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
user
.
getSystemFlag
()))
{
//获取项目信息
R
<
TSettleDomainRegistListVo
>
domainR
=
archivesDaprUtil
.
getAllDeptByCustomerLoginName
(
user
.
getUsername
());
if
(
null
!=
domainR
&&
null
!=
domainR
.
getData
()
&&
null
!=
domainR
.
getData
().
getDeptNos
())
{
employeeRegistration
.
setDeptNoList
(
domainR
.
getData
().
getDeptNos
());
}
else
{
employeeRegistration
.
setId
(
CommonConstants
.
ONE_STRING_NEGATE
);
}
}
return
baseMapper
.
getEmployeeRegistrationPage
(
page
,
employeeRegistration
);
}
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
c01b0003
...
...
@@ -180,6 +180,13 @@
#{idStr}
</foreach>
</if>
<if
test=
"employeeRegistration.deptNoList != null and employeeRegistration.deptNoList.size > 0"
>
AND a.dept_no in
<foreach
item=
"idStr"
index=
"index"
collection=
"employeeRegistration.deptNoList"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
<if
test=
"employeeRegistration.authSql != null and employeeRegistration.authSql.trim() != ''"
>
${employeeRegistration.authSql}
</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