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
227d40fc
Commit
227d40fc
authored
Mar 17, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 入离职改造
parent
f8b6d731
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
151 additions
and
7 deletions
+151
-7
SysAutoDictItemVo.java
...ifu/cloud/plus/v1/yifu/archives/vo/SysAutoDictItemVo.java
+4
-0
SysAutoDictItemController.java
...1/yifu/archives/controller/SysAutoDictItemController.java
+36
-1
SysAutoDictItemService.java
...plus/v1/yifu/archives/service/SysAutoDictItemService.java
+8
-0
SysAutoDictItemServiceImpl.java
...ifu/archives/service/impl/SysAutoDictItemServiceImpl.java
+21
-0
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+18
-0
EmployeeRegistrationController.java
...lus/v1/csp/controller/EmployeeRegistrationController.java
+5
-2
EmployeeRegistrationService.java
...loud/plus/v1/csp/service/EmployeeRegistrationService.java
+1
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+58
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/SysAutoDictItemVo.java
View file @
227d40fc
...
@@ -20,6 +20,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
...
@@ -20,6 +20,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
@@ -30,6 +31,7 @@ import org.hibernate.validator.constraints.Length;
...
@@ -30,6 +31,7 @@ import org.hibernate.validator.constraints.Length;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.List
;
/**
/**
* 字典项
* 字典项
...
@@ -156,4 +158,6 @@ public class SysAutoDictItemVo extends RowIndex implements Serializable {
...
@@ -156,4 +158,6 @@ public class SysAutoDictItemVo extends RowIndex implements Serializable {
@ExcelProperty
(
"项目编码,标识此字典项为那个项目所有"
)
@ExcelProperty
(
"项目编码,标识此字典项为那个项目所有"
)
private
String
deptNo
;
private
String
deptNo
;
private
List
<
SysAutoDictItem
>
sysAutoDictItemList
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/SysAutoDictItemController.java
View file @
227d40fc
...
@@ -17,14 +17,21 @@
...
@@ -17,14 +17,21 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
controller
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
controller
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.SysAutoDictItemService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.SysAutoDictItemService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SysAutoDictItemSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SysAutoDictItemSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SysAutoDictItemVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -51,7 +58,7 @@ public class SysAutoDictItemController {
...
@@ -51,7 +58,7 @@ public class SysAutoDictItemController {
private
final
SysAutoDictItemService
sysAutoDictItemService
;
private
final
SysAutoDictItemService
sysAutoDictItemService
;
/**
/**
* 简单分页查询
* 简单分页查询
* @param page 分页对象
* @param page 分页对象
...
@@ -152,4 +159,32 @@ public class SysAutoDictItemController {
...
@@ -152,4 +159,32 @@ public class SysAutoDictItemController {
public
void
export
(
HttpServletResponse
response
,
@RequestBody
SysAutoDictItemSearchVo
searchVo
)
{
public
void
export
(
HttpServletResponse
response
,
@RequestBody
SysAutoDictItemSearchVo
searchVo
)
{
sysAutoDictItemService
.
listExport
(
response
,
searchVo
);
sysAutoDictItemService
.
listExport
(
response
,
searchVo
);
}
}
/**
* 获取项目配置下的字典列表
* @param sysAutoDictItem 字典项
* @return R<List<SysAutoDictItem>>
* @author chenyuxi
*/
@Operation
(
summary
=
"获取项目配置下的字典列表"
)
@GetMapping
(
"/selectByDeptNo"
)
public
R
<
List
<
SysAutoDictItem
>>
selectByDeptNo
(
SysAutoDictItemSearchVo
sysAutoDictItem
)
{
if
(
Common
.
isEmpty
(
sysAutoDictItem
.
getDeptNo
())){
return
R
.
failed
(
"项目编号不能为空"
);
}
return
R
.
ok
(
sysAutoDictItemService
.
selectByDeptNo
(
sysAutoDictItem
));
}
@Inner
@PostMapping
(
"/getSettleDomainSelectVoById"
)
public
SysAutoDictItemVo
getInnerSettleDomainSelectVoByUserId
(
@RequestBody
SysAutoDictItemVo
dictItemVo
)
{
SysAutoDictItemVo
settleDomainSelectVo
=
new
SysAutoDictItemVo
();
LambdaQueryWrapper
<
SysAutoDictItem
>
dictQuery
=
Wrappers
.<
SysAutoDictItem
>
lambdaQuery
()
.
eq
(
SysAutoDictItem:
:
getDeptNo
,
dictItemVo
.
getDeptNo
())
.
eq
(
SysAutoDictItem:
:
getDelFlag
,
CommonConstants
.
NOT_DELETE_FLAG
);
List
<
SysAutoDictItem
>
list
=
sysAutoDictItemService
.
list
(
dictQuery
);
settleDomainSelectVo
.
setSysAutoDictItemList
(
list
);
return
settleDomainSelectVo
;
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/SysAutoDictItemService.java
View file @
227d40fc
...
@@ -48,4 +48,12 @@ public interface SysAutoDictItemService extends IService<SysAutoDictItem> {
...
@@ -48,4 +48,12 @@ public interface SysAutoDictItemService extends IService<SysAutoDictItem> {
void
listExport
(
HttpServletResponse
response
,
SysAutoDictItemSearchVo
searchVo
);
void
listExport
(
HttpServletResponse
response
,
SysAutoDictItemSearchVo
searchVo
);
List
<
SysAutoDictItem
>
noPageDiy
(
SysAutoDictItemSearchVo
searchVo
);
List
<
SysAutoDictItem
>
noPageDiy
(
SysAutoDictItemSearchVo
searchVo
);
/**
* 获取项目配置下的字典列表
* @param searchVo 字典项
* @return R<List<SysAutoDictItem>>
* @author chenyuxi
*/
List
<
SysAutoDictItem
>
selectByDeptNo
(
SysAutoDictItemSearchVo
searchVo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/SysAutoDictItemServiceImpl.java
View file @
227d40fc
...
@@ -249,4 +249,25 @@ public class SysAutoDictItemServiceImpl extends ServiceImpl<SysAutoDictItemMappe
...
@@ -249,4 +249,25 @@ public class SysAutoDictItemServiceImpl extends ServiceImpl<SysAutoDictItemMappe
BeanUtil
.
copyProperties
(
excel
,
insert
);
BeanUtil
.
copyProperties
(
excel
,
insert
);
this
.
save
(
insert
);
this
.
save
(
insert
);
}
}
/**
* 获取项目配置下的字典列表
*
* @param searchVo 字典项
* @return R<List < SysAutoDictItem>>
* @author chenyuxi
*/
@Override
public
List
<
SysAutoDictItem
>
selectByDeptNo
(
SysAutoDictItemSearchVo
searchVo
)
{
LambdaQueryWrapper
<
SysAutoDictItem
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
eq
(
SysAutoDictItem:
:
getDelFlag
,
CommonConstants
.
NOT_DELETE_FLAG
);
if
(
Common
.
isNotNull
(
searchVo
.
getDeptNo
())){
wrapper
.
eq
(
SysAutoDictItem:
:
getDeptNo
,
searchVo
.
getDeptNo
());
}
if
(
Common
.
isNotNull
(
searchVo
.
getType
())){
wrapper
.
eq
(
SysAutoDictItem:
:
getType
,
searchVo
.
getType
());
}
wrapper
.
orderByAsc
(
BaseEntity:
:
getCreateTime
);
return
baseMapper
.
selectList
(
wrapper
);
}
}
}
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
227d40fc
...
@@ -556,4 +556,22 @@ public class ArchivesDaprUtil {
...
@@ -556,4 +556,22 @@ public class ArchivesDaprUtil {
public
R
<
Boolean
>
saveRegistPreInfo
(
EmployeeRegistrationPreVo
preVo
)
{
public
R
<
Boolean
>
saveRegistPreInfo
(
EmployeeRegistrationPreVo
preVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/employeeregistrationpre/inner/saveRegistPreInfo"
,
JSON
.
toJSONString
(
preVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/employeeregistrationpre/inner/saveRegistPreInfo"
,
JSON
.
toJSONString
(
preVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
/**
* 获取项目字典项
* @param
* @author chenyuxi
* @since 1.9.8
* @Param
* @return
**/
public
R
<
SysAutoDictItemVo
>
getDictListByDeptNo
(
String
deptNo
){
SysAutoDictItemVo
dictItemVo
=
new
SysAutoDictItemVo
();
dictItemVo
.
setDeptNo
(
deptNo
);
R
<
SysAutoDictItemVo
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/tsettledomain/getSettleDomainSelectVoById"
,
dictItemVo
,
SysAutoDictItemVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"获取派单校验需要的档案信息失败!"
);
}
return
res
;
}
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/controller/EmployeeRegistrationController.java
View file @
227d40fc
...
@@ -10,6 +10,7 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo;
...
@@ -10,6 +10,7 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
@@ -56,6 +57,8 @@ public class EmployeeRegistrationController {
...
@@ -56,6 +57,8 @@ public class EmployeeRegistrationController {
@Operation
(
description
=
"简单分页查询"
)
@Operation
(
description
=
"简单分页查询"
)
@GetMapping
(
"/page"
)
@GetMapping
(
"/page"
)
public
R
<
IPage
<
EmployeeRegistration
>>
getEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
EmployeeRegistrationSearchVo
employeeRegistration
)
{
public
R
<
IPage
<
EmployeeRegistration
>>
getEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
EmployeeRegistrationSearchVo
employeeRegistration
)
{
// 1.9.8:客户服务平台仅展示来源是“客户端”的数据
employeeRegistration
.
setDataSource
(
CommonConstants
.
ONE_STRING
);
return
new
R
<>(
employeeRegistrationService
.
getEmployeeRegistrationPage
(
page
,
employeeRegistration
));
return
new
R
<>(
employeeRegistrationService
.
getEmployeeRegistrationPage
(
page
,
employeeRegistration
));
}
}
...
@@ -149,8 +152,8 @@ public class EmployeeRegistrationController {
...
@@ -149,8 +152,8 @@ public class EmployeeRegistrationController {
@Operation
(
description
=
"批量新增入离职登记表"
)
@Operation
(
description
=
"批量新增入离职登记表"
)
@SysLog
(
"批量新增入离职登记表"
)
@SysLog
(
"批量新增入离职登记表"
)
@PostMapping
(
"/importListAdd"
)
@PostMapping
(
"/importListAdd"
)
public
R
<
List
<
ErrorMessage
>>
importListAdd
(
@RequestBody
MultipartFile
file
,
String
deptId
)
{
public
R
<
List
<
ErrorMessage
>>
importListAdd
(
@RequestBody
MultipartFile
file
,
String
deptId
,
String
dataSource
)
{
return
employeeRegistrationService
.
importDiy
(
file
.
getInputStream
(),
deptId
);
return
employeeRegistrationService
.
importDiy
(
file
.
getInputStream
(),
deptId
,
dataSource
);
}
}
/**
/**
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/EmployeeRegistrationService.java
View file @
227d40fc
...
@@ -50,7 +50,7 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati
...
@@ -50,7 +50,7 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati
* @param inputStream 文件流
* @param inputStream 文件流
* @return
* @return
*/
*/
R
<
List
<
ErrorMessage
>>
importDiy
(
InputStream
inputStream
,
String
deptId
);
R
<
List
<
ErrorMessage
>>
importDiy
(
InputStream
inputStream
,
String
deptId
,
String
dataSource
);
/**
/**
* 入离职登记新增
* 入离职登记新增
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
227d40fc
...
@@ -22,6 +22,7 @@ import com.yifu.cloud.plus.v1.csp.service.TOperationLogService;
...
@@ -22,6 +22,7 @@ import com.yifu.cloud.plus.v1.csp.service.TOperationLogService;
import
com.yifu.cloud.plus.v1.csp.vo.*
;
import
com.yifu.cloud.plus.v1.csp.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants
;
...
@@ -108,6 +109,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -108,6 +109,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
isSsc
)
{
if
(
isSsc
)
{
employeeRegistration
.
setCustomerUserLoginname
(
null
);
employeeRegistration
.
setCustomerUserLoginname
(
null
);
}
}
// 前端客服的所有项目权限赋值
employeeRegistration
.
setType
(
CommonConstants
.
TWO_STRING
);
initSearchVo
(
employeeRegistration
);
return
baseMapper
.
getEmployeeRegistrationPage
(
page
,
employeeRegistration
);
return
baseMapper
.
getEmployeeRegistrationPage
(
page
,
employeeRegistration
);
}
}
...
@@ -185,6 +189,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -185,6 +189,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
*/
*/
@Override
@Override
public
void
listHrExport
(
HttpServletResponse
response
,
EmployeeRegistrationSearchVo
searchVo
)
{
public
void
listHrExport
(
HttpServletResponse
response
,
EmployeeRegistrationSearchVo
searchVo
)
{
// 1.9.8: 前端客服去掉指定人查询
YifuUser
user
=
SecurityUtils
.
getUser
();
long
roleId
=
1839501715787390978L
;
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
if
(
isSsc
)
{
searchVo
.
setCustomerUserLoginname
(
null
);
}
searchVo
.
setType
(
CommonConstants
.
TWO_STRING
);
// 1.9.8: 前端客服的所有项目权限赋值
initSearchVo
(
searchVo
);
String
fileName
=
"入离职待办任务表批量导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
String
fileName
=
"入离职待办任务表批量导出"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
//获取要导出的列表
//获取要导出的列表
List
<
EmployeeRegistrationHrExportVo
>
list
=
new
ArrayList
<>();
List
<
EmployeeRegistrationHrExportVo
>
list
=
new
ArrayList
<>();
...
@@ -281,7 +296,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -281,7 +296,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
@Override
@Override
public
R
<
List
<
ErrorMessage
>>
importDiy
(
InputStream
inputStream
,
String
deptId
)
{
public
R
<
List
<
ErrorMessage
>>
importDiy
(
InputStream
inputStream
,
String
deptId
,
String
dataSource
)
{
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
ExcelUtil
<
EmployeeRegistrationVo
>
util1
=
new
ExcelUtil
<>(
EmployeeRegistrationVo
.
class
);
ExcelUtil
<
EmployeeRegistrationVo
>
util1
=
new
ExcelUtil
<>(
EmployeeRegistrationVo
.
class
);
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
...
@@ -293,6 +309,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -293,6 +309,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return
R
.
ok
(
errorMessageList
);
return
R
.
ok
(
errorMessageList
);
}
}
TSettleDomainSelectVo
selectVo
=
domainR
.
getData
();
TSettleDomainSelectVo
selectVo
=
domainR
.
getData
();
// 1.9.8:获取项目配置的字典值
List
<
String
>
postConfigList
=
new
ArrayList
<>();
R
<
SysAutoDictItemVo
>
domainDictR
=
archivesDaprUtil
.
getDictListByDeptNo
(
selectVo
.
getDepartNo
());
if
(
Common
.
isNotNull
(
domainDictR
)
&&
Common
.
isNotNull
(
domainDictR
.
getData
())
&&
Common
.
isNotNull
(
domainDictR
.
getData
().
getSysAutoDictItemList
()))
{
List
<
SysAutoDictItem
>
dictItemList
=
domainDictR
.
getData
().
getSysAutoDictItemList
();
for
(
SysAutoDictItem
sysAutoDictItem
:
dictItemList
){
if
(
"post_type"
.
equals
(
sysAutoDictItem
.
getType
())){
postConfigList
.
add
(
sysAutoDictItem
.
getLabel
());
}
}
}
// 写法2:
// 写法2:
// 匿名内部类 不用额外写一个DemoDataListener
// 匿名内部类 不用额外写一个DemoDataListener
// 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭
// 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭
...
@@ -336,7 +365,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -336,7 +365,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
*/
*/
private
void
saveData
()
{
private
void
saveData
()
{
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
importEmployeeRegistration
(
cachedDataList
,
errorMessageList
,
user
,
selectVo
);
importEmployeeRegistration
(
cachedDataList
,
errorMessageList
,
user
,
selectVo
,
postConfigList
,
dataSource
);
log
.
info
(
"存储数据库成功!"
);
log
.
info
(
"存储数据库成功!"
);
}
}
}).
sheet
().
doRead
();
}).
sheet
().
doRead
();
...
@@ -348,7 +377,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -348,7 +377,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
private
void
importEmployeeRegistration
(
List
<
EmployeeRegistrationVo
>
excelVOList
,
private
void
importEmployeeRegistration
(
List
<
EmployeeRegistrationVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
YifuUser
user
,
TSettleDomainSelectVo
selectVo
)
{
List
<
ErrorMessage
>
errorMessageList
,
YifuUser
user
,
TSettleDomainSelectVo
selectVo
,
List
<
String
>
postConfigList
,
String
dataSource
)
{
// 1.9.8新增来源区分
// 没有来源默认是:1客户端
if
(
Common
.
isEmpty
(
dataSource
)){
dataSource
=
CommonConstants
.
ONE_STRING
;
}
Map
<
String
,
String
>
exitMap
=
new
HashMap
<>();
Map
<
String
,
String
>
exitMap
=
new
HashMap
<>();
EmployeeRegistrationVo
excel
;
EmployeeRegistrationVo
excel
;
...
@@ -375,11 +410,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -375,11 +410,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
continue
;
continue
;
}
}
insert
.
setDeptNo
(
selectVo
.
getDepartNo
());
insert
.
setDeptNo
(
selectVo
.
getDepartNo
());
// 1.9.8:新增校验
if
(
CommonConstants
.
TWO_STRING
.
equals
(
dataSource
)
&&
Common
.
isNotNull
(
postConfigList
)
&&
!
postConfigList
.
contains
(
insert
.
getPosition
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"岗位不在项目配置的岗位配置项里"
,
excel
));
continue
;
}
String
error
=
registCheck
(
insert
);
String
error
=
registCheck
(
insert
);
if
(
null
!=
error
)
{
if
(
null
!=
error
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
error
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
error
,
excel
));
continue
;
continue
;
}
}
// 1.9.8:新增赋值
insert
.
setDataSource
(
dataSource
);
initRegistInfo
(
insert
,
user
,
selectVo
);
initRegistInfo
(
insert
,
user
,
selectVo
);
insertList
.
add
(
insert
);
insertList
.
add
(
insert
);
//新增记录,新增操作记录
//新增记录,新增操作记录
...
@@ -499,6 +542,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -499,6 +542,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return
R
.
ok
();
return
R
.
ok
();
}
}
@Override
public
R
registAdd
(
EmployeeRegistration
registration
)
{
public
R
registAdd
(
EmployeeRegistration
registration
)
{
//提交校验内容:
//提交校验内容:
//1、身份证号位数、手机号码位数及格式,就职岗位下拉选择“内勤、揽投员、其他”
//1、身份证号位数、手机号码位数及格式,就职岗位下拉选择“内勤、揽投员、其他”
...
@@ -507,6 +551,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -507,6 +551,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
null
!=
errorInfo
)
{
if
(
null
!=
errorInfo
)
{
return
R
.
failed
(
errorInfo
);
return
R
.
failed
(
errorInfo
);
}
else
{
}
else
{
// 1.9.8: 没有来源默认是:1客户端
if
(
Common
.
isEmpty
(
registration
.
getDataSource
())){
registration
.
setDataSource
(
CommonConstants
.
ONE_STRING
);
}
// 1.9.8: 赋值【最新的客服名称】
registration
.
setCustomerUsernameNew
(
registration
.
getCustomerUsername
());
baseMapper
.
insert
(
registration
);
baseMapper
.
insert
(
registration
);
}
}
//企业微信消息提醒
//企业微信消息提醒
...
@@ -517,6 +567,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -517,6 +567,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return
R
.
ok
();
return
R
.
ok
();
}
}
@Override
public
R
confirmSubmit
(
EmployeeRegistration
registration
)
{
public
R
confirmSubmit
(
EmployeeRegistration
registration
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
EmployeeRegistration
registrationNow
=
baseMapper
.
selectById
(
registration
.
getId
());
EmployeeRegistration
registrationNow
=
baseMapper
.
selectById
(
registration
.
getId
());
...
@@ -544,6 +595,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -544,6 +595,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return
R
.
ok
();
return
R
.
ok
();
}
}
@Override
public
R
updateRegist
(
EmployeeRegistration
registration
)
{
public
R
updateRegist
(
EmployeeRegistration
registration
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
EmployeeRegistration
registrationNow
=
baseMapper
.
selectById
(
registration
.
getId
());
EmployeeRegistration
registrationNow
=
baseMapper
.
selectById
(
registration
.
getId
());
...
@@ -696,6 +748,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -696,6 +748,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insert
.
setCustomerUserLoginname
(
selectVo
.
getCsLoginName
());
insert
.
setCustomerUserLoginname
(
selectVo
.
getCsLoginName
());
insert
.
setDeptName
(
selectVo
.
getDepartName
());
insert
.
setDeptName
(
selectVo
.
getDepartName
());
insert
.
setDeptId
(
selectVo
.
getId
());
insert
.
setDeptId
(
selectVo
.
getId
());
// 1.9.8: 新增字段
insert
.
setCustomerUsernameNew
(
selectVo
.
getCsName
());
}
}
//发送企业微信待办
//发送企业微信待办
...
...
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