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
44b3b966
Commit
44b3b966
authored
2 years ago
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部门管理初版提交
parent
aa550bd4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
2130 additions
and
14 deletions
+2130
-14
TBusinessEmployeeExtendInfo.java
.../v1/yifu/archives/entity/TBusinessEmployeeExtendInfo.java
+154
-0
BusinessEmployeeExtendByLeave.java
...us/v1/yifu/archives/vo/BusinessEmployeeExtendByLeave.java
+55
-0
BusinessEmployeeExtendVO.java
...ud/plus/v1/yifu/archives/vo/BusinessEmployeeExtendVO.java
+127
-0
UpdateBusinessEmployeeExtendDTO.java
.../v1/yifu/archives/vo/UpdateBusinessEmployeeExtendDTO.java
+145
-0
UpdateEmployeeExtendRedundancyDTO.java
...1/yifu/archives/vo/UpdateEmployeeExtendRedundancyDTO.java
+70
-0
EmployeeBusinessController.java
.../yifu/archives/controller/EmployeeBusinessController.java
+396
-0
TBusinessEmployeeExtendInfoMapper.java
...fu/archives/mapper/TBusinessEmployeeExtendInfoMapper.java
+37
-0
TBusinessEmployeeExtendInfoService.java
.../archives/service/TBusinessEmployeeExtendInfoService.java
+95
-0
TBusinessEmployeeExtendInfoServiceImpl.java
.../service/impl/TBusinessEmployeeExtendInfoServiceImpl.java
+436
-0
TBusinessEmployeeExtendInfoMapper.xml
...in/resources/mapper/TBusinessEmployeeExtendInfoMapper.xml
+147
-0
TBusDeptController.java
...lus/v1/business/controller/system/TBusDeptController.java
+390
-0
TBusDeptMapper.xml
...business-biz/src/main/resources/mapper/TBusDeptMapper.xml
+1
-1
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+9
-0
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+15
-0
daprConfig.properties
...yifu-common-dapr/src/main/resources/daprConfig.properties
+53
-13
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TBusinessEmployeeExtendInfo.java
0 → 100644
View file @
44b3b966
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.copier.CopyOptions
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableLogic
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
lombok.Data
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.ToString
;
import
java.time.LocalDate
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
*
* @TableName t_business_employee_extend_info
*/
@TableName
(
value
=
"t_business_employee_extend_info"
)
@Data
@ToString
public
class
TBusinessEmployeeExtendInfo
extends
Model
<
TBusinessEmployeeExtendInfo
>
{
/**
* 主键
*/
@TableId
private
String
id
;
/**
* 身份证号码
*/
private
String
empIdcard
;
/**
* 姓名
*/
private
String
empName
;
/**
* 部门名称
*/
private
String
departName
;
/**
* 部门id
*/
private
Integer
departId
;
/**
* 部门编码 对应部门实体中的TreeLogo
*/
private
String
departCode
;
/**
* b端岗位
*/
private
String
businessPost
;
/**
* b端员工工号
*/
private
String
businessTelecomNumber
;
/**
* 标签,字典值(英文逗号分割)
*/
private
String
employeeTags
;
/**
* 第一学历和专业
*/
private
String
firstDegreeAndMajor
;
/**
* 第一学历院校
*/
private
String
firstDegreeGraduateSchool
;
/**
* 最高学历和专业
*/
private
String
highestDegreeAndMajor
;
/**
* 最高学历院校
*/
private
String
highestDegreeGraduateSchool
;
/**
* 联系方式
*/
private
String
contactInfo
;
/**
* 档案所在地
*/
private
String
archivesAddr
;
/**
* 0在职 1离职 3 临时
*/
private
String
businessWorkingStatus
;
/**
* B端维护的离职时间
*/
private
LocalDate
businessLeaveDate
;
/**
* B端维护的入职时间
*/
private
LocalDate
businessEnjoinDate
;
/**
* B端维护的离职原因
*/
private
String
businessLeaveReason
;
/**
* 0未删除 1已删除
*/
@TableLogic
private
String
deleteFlag
;
/**
* 证件类型
*/
private
String
documentType
;
/**
* @description: dto转实体
* @param dtoList
* @return: java.util.List<com.yifu.cloud.v1.hrms.api.entity.basic.TBusinessEmployeeExtendInfo>
* @author: wangweiguo
* @date: 2021/8/10
*/
public
static
List
<
TBusinessEmployeeExtendInfo
>
covertDtoListToList
(
Collection
<?>
dtoList
)
{
return
dtoList
.
stream
().
map
(
o
->
{
TBusinessEmployeeExtendInfo
entity
=
new
TBusinessEmployeeExtendInfo
();
BeanUtil
.
copyProperties
(
o
,
entity
,
CopyOptions
.
create
().
setIgnoreNullValue
(
true
));
return
entity
;
}).
collect
(
Collectors
.
toList
());
}
@TableField
(
exist
=
false
)
private
static
final
long
serialVersionUID
=
1L
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/BusinessEmployeeExtendByLeave.java
0 → 100644
View file @
44b3b966
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.ToString
;
import
java.io.Serializable
;
/**
* @Author hgw
* @Date 2021-8-18 16:32:44
**/
@Getter
@Setter
@ToString
public
class
BusinessEmployeeExtendByLeave
implements
Serializable
{
/**
* b端员工工号
*/
private
String
businessTelecomNumber
;
/**
* 员工姓名
*/
private
String
empName
;
/**
* 身份证号码
*/
private
String
empIdcard
;
/**
* 部门名称
*/
private
String
departName
;
/**
* 部门id
*/
private
Integer
departId
;
/**
* b端岗位
*/
private
String
businessPost
;
/**
* 0在职 1离职 3 临时
*/
private
String
businessWorkingStatus
;
// B端部门treelogo
private
String
departCode
;
}
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/BusinessEmployeeExtendVO.java
0 → 100644
View file @
44b3b966
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.baomidou.mybatisplus.annotation.TableLogic
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.ToString
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* @Author wangweiguo
* @Description BusinessEmployeeExtendVO
* @Date 21:15 2021/8/17
**/
@Getter
@Setter
@ToString
public
class
BusinessEmployeeExtendVO
implements
Serializable
{
/**
* 主键
*/
private
String
id
;
/**
* 员工姓名
*/
private
String
empName
;
/**
* 身份证号码
*/
private
String
empIdcard
;
/**
* 部门名称
*/
private
String
departName
;
/**
* 部门id
*/
private
Integer
departId
;
/**
* 部门编码 对应部门实体中的TreeLogo
*/
private
String
departCode
;
/**
* b端岗位
*/
private
String
businessPost
;
/**
* b端员工工号
*/
private
String
businessTelecomNumber
;
/**
* 标签,字典值(英文逗号分割)
*/
private
String
employeeTags
;
/**
* 第一学历和专业
*/
private
String
firstDegreeAndMajor
;
/**
* 第一学历院校
*/
private
String
firstDegreeGraduateSchool
;
/**
* 最高学历和专业
*/
private
String
highestDegreeAndMajor
;
/**
* 最高学历院校
*/
private
String
highestDegreeGraduateSchool
;
/**
* 联系方式
*/
private
String
contactInfo
;
/**
* 档案所在地
*/
private
String
archivesAddr
;
/**
* 0在职 1离职 3 临时
*/
private
String
businessWorkingStatus
;
/**
* B端维护的离职时间
*/
private
LocalDateTime
businessLeaveDate
;
/**
* B端维护的入职时间
*/
private
LocalDateTime
businessEnjoinDate
;
/**
* B端维护的离职原因
*/
private
String
businessLeaveReason
;
/**
* 0未删除 1已删除
*/
@TableLogic
private
String
deleteFlag
;
/**
* 证件类型
*/
private
String
documentType
;
}
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpdateBusinessEmployeeExtendDTO.java
0 → 100644
View file @
44b3b966
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.ToString
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Pattern
;
import
java.io.Serializable
;
import
java.time.LocalDate
;
/**
* @description: 更新人员信息拓展表dto
* @author: wangweiguo
* @date: 2021/8/10
*/
@Getter
@Setter
@ToString
public
class
UpdateBusinessEmployeeExtendDTO
implements
Serializable
{
/**
* 拓展表id
*/
@Schema
(
description
=
"拓展表id"
)
private
String
extendId
;
/**
* 身份证号码
*/
@Schema
(
description
=
"身份证号码"
)
@NotBlank
(
message
=
"身份证号码不能为空"
)
private
String
empIdcard
;
/**
* 姓名
*/
@Schema
(
description
=
"姓名"
)
private
String
empName
;
/**
* 部门名称
*/
@Schema
(
description
=
"部门名称"
)
@NotBlank
(
message
=
"部门名称不能为空"
)
@Length
(
max
=
50
,
message
=
"部门名称长度不超过50字符"
)
private
String
departName
;
/**
* 部门id
*/
@Schema
(
description
=
"部门id"
)
private
Integer
departId
;
/**
* 部门编码
*/
@Schema
(
description
=
"部门编码"
)
private
String
departCode
;
/**
* b端岗位
*/
@Schema
(
description
=
"b端岗位"
)
@Length
(
max
=
50
,
message
=
"岗位长度不超过50字符"
)
private
String
businessPost
;
/**
* b端员工工号
*/
@Schema
(
description
=
"电信工号"
)
@Length
(
max
=
20
,
message
=
"电信工号长度不超过20字符"
)
@NotBlank
(
message
=
"电信工号不能为空"
)
private
String
businessTelecomNumber
;
/**
* 标签,字典值(英文逗号分割)
*/
@Schema
(
description
=
"标签,字典值(英文逗号分割)"
)
private
String
employeeTags
;
/**
* 第一学历和专业
*/
@Schema
(
description
=
"第一学历和专业"
)
@Length
(
max
=
20
,
message
=
"第一学历和专业长度不超过20字符"
)
private
String
firstDegreeAndMajor
;
/**
* 第一学历院校
*/
@Schema
(
description
=
"第一学历院校"
)
@Length
(
max
=
20
,
message
=
"第一学历院校长度不超过20字符"
)
private
String
firstDegreeGraduateSchool
;
/**
* 最高学历和专业
*/
@Schema
(
description
=
"最高学历和专业"
)
@Length
(
max
=
20
,
message
=
"最高学历和专业长度不超过20字符"
)
private
String
highestDegreeAndMajor
;
/**
* 最高学历院校
*/
@Schema
(
description
=
"最高学历院校"
)
@Length
(
max
=
20
,
message
=
"最高学历院校长度不超过20字符"
)
private
String
highestDegreeGraduateSchool
;
/**
* 联系方式
*/
@Schema
(
description
=
"联系方式"
)
@Length
(
max
=
11
,
message
=
"联系方式长度不超过11字符"
)
@Pattern
(
regexp
=
"(?:(?:\\+|00)86)?1\\d{10}"
,
message
=
"联系方式格式错误"
)
@NotBlank
(
message
=
"联系方式不能为空"
)
private
String
contactInfo
;
/**
* 档案托管地
*/
@Schema
(
description
=
"档案托管地"
)
@Length
(
max
=
20
,
message
=
"档案托管地长度不超过20字符"
)
private
String
archivesAddr
;
/**
* B端维护的离职时间
*/
@Schema
(
description
=
"B端维护的离职时间"
)
private
LocalDate
businessLeaveDate
;
/**
* B端维护的入职时间
*/
@Schema
(
description
=
"B端维护的入职时间"
)
@NotNull
(
message
=
"入职时间不能为空"
)
private
LocalDate
businessEnjoinDate
;
@TableField
(
exist
=
false
)
private
static
final
long
serialVersionUID
=
1L
;
}
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpdateEmployeeExtendRedundancyDTO.java
0 → 100644
View file @
44b3b966
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.ToString
;
import
java.io.Serializable
;
import
java.time.LocalDate
;
/**
* @description: 更新人员信息冗余字段DTO
* @author: wangweiguo
* @date: 2021/8/12
*/
@Getter
@Setter
@ToString
public
class
UpdateEmployeeExtendRedundancyDTO
implements
Serializable
{
/**
* 身份证号
*/
private
String
empIdcard
;
/**
* 标签名称,英文逗号分割
*/
private
String
employeeTags
;
/**
* 离职日期
*/
private
LocalDate
businessLeaveDate
;
/**
* 离职原因
*/
private
String
businessLeaveReason
;
/**
* 在职状态 0在职 1离职 3临时
*/
private
String
businessWorkingStatus
;
/**
* 证件类型,英文逗号分割
*/
private
String
documentType
;
/**
* 部门id
*/
private
Integer
departId
;
/**
* 部门名称
*/
private
String
departName
;
/**
* 部门treeLogo
*/
private
String
treeLogo
;
/**
* 部门id真实值
*/
private
Integer
departIdVal
;
}
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/EmployeeBusinessController.java
0 → 100644
View file @
44b3b966
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TBusinessEmployeeExtendInfoMapper.java
0 → 100644
View file @
44b3b966
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendByLeave
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendVO
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
* @description: b端员工信息拓展信息 mapper
* @author: wangweiguo
* @date: 2021/8/6
* @Entity com.yifu.cloud.v1.hrms.api.entity.basic.TBusinessEmployeeExtendInfo
*/
public
interface
TBusinessEmployeeExtendInfoMapper
extends
BaseMapper
<
TBusinessEmployeeExtendInfo
>
{
List
<
BusinessEmployeeExtendVO
>
getNotLeaveExtendList
();
/**
* @param
* @Description: 获取所有扩展信息
* @Author: hgw
* @Date: 2021/8/18 16:41
* @return: java.util.List<com.yifu.cloud.v1.hrms.api.vo.basic.BusinessEmployeeExtendByLeave>
**/
List
<
BusinessEmployeeExtendByLeave
>
getInfoByLeaveList
();
TBusinessEmployeeExtendInfo
getDataByEmpIdcard
(
@Param
(
"empIdcard"
)
String
empIdcard
);
TBusinessEmployeeExtendInfo
getDataById
(
@Param
(
"extendId"
)
String
extendId
);
}
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TBusinessEmployeeExtendInfoService.java
0 → 100644
View file @
44b3b966
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.UpdateEmployeeExtendRedundancyDTO
;
/**
* @description: b端员工信息拓展信息 service
* @author: wangweiguo
* @date: 2021/8/6
*/
public
interface
TBusinessEmployeeExtendInfoService
extends
IService
<
TBusinessEmployeeExtendInfo
>
{
// /**
// * @description: 根据身份证号查询人员拓展表信息
// * @param empIdcard 身份证号
// * @return: com.yifu.cloud.v1.hrms.api.entity.basic.TBusinessEmployeeExtendInfo
// * @author: wangweiguo
// * @date: 2021/8/10
// */
// TBusinessEmployeeExtendInfo getByEmpIdCard(String empIdcard);
//
// /**
// * @param businessTelecomNumber
// * @Description: 根据工号返回附属信息
// * @Author: hgw
// * @Date: 2021/8/18 17:03
// * @return: com.yifu.cloud.v1.hrms.api.entity.basic.TBusinessEmployeeExtendInfo
// **/
// TBusinessEmployeeExtendInfo getByBusinessTelecomNumber(String businessTelecomNumber);
//
// /**
// * 根据jsonStr批量更新人员信息拓展表信息
// * @description:
// * @param jsonStr
// * @param empInfoMap
// * @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
// * @author: wangweiguo
// * @date: 2021/8/10
// */
// R<Boolean> batchUpdateEmployeeExtendByJsonStr(String jsonStr, HashMap<String, TEmployeeInfo> empInfoMap);
/**
* 更新人员信息冗余字段
* @description: 更新人员信息冗余字段
* @param dto
* @return: Boolean
* @author: wangweiguo
* @date: 2021/8/12
*/
Boolean
updateEmployeeExtendRedundancy
(
UpdateEmployeeExtendRedundancyDTO
dto
);
// /**
// * 根据身份证号获取拓展信息列表
// * @description: 根据身份证号获取拓展信息列表
// * @param idcardList
// * @return: com.yifu.cloud.v1.common.core.util.R<List<TBusinessEmployeeExtendInfo>>
// * @author: wangweiguo
// * @date: 2021/8/16
// */
// R<List<TBusinessEmployeeExtendInfo>> getListByIdcartList(List<String> idcardList);
//
// /**
// * 查询-列表:内部服务调用,获取所有非离职员工拓展表信息
// * @description: 查询-列表:内部服务调用,获取所有非离职员工拓展表信息
// * @return: com.yifu.cloud.v1.common.core.util.R<java.util.List<com.yifu.cloud.v1.hrms.api.vo.basic.BusinessEmployeeExtendVO>>
// * @author: wangweiguo
// * @date: 2021/8/17
// */
// R<List<BusinessEmployeeExtendVO>> getNotLeaveExtendList();
//
// /**
// * @param
// * @Description: 获取所有附属信息
// * @Author: hgw
// * @Date: 2021/8/18 16:45
// * @return: com.yifu.cloud.v1.common.core.util.R<java.util.Map < java.lang.String, com.yifu.cloud.v1.hrms.api.vo.basic.BusinessEmployeeExtendByLeave>>
// **/
// R<Map<String, BusinessEmployeeExtendByLeave>> getInfoByLeaveMap();
//
// /**
// * b端人员信息编辑拓展信息
// * @description: b端人员信息编辑拓展信息
// * @param tBusinessEmployeeExtendInfo 实体
// * @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
// * @author: wangweiguo
// * @date: 2021/8/19
// */
// R<Boolean> saveOrUpdateData(TBusinessEmployeeExtendInfo tBusinessEmployeeExtendInfo);
//
// R<String> updateEmpExtendCertInfo(UpdateEmployeeExtendRedundancyDTO dto);
//
// TBusinessEmployeeExtendInfo getDataById(String extendId);
}
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TBusinessEmployeeExtendInfoServiceImpl.java
0 → 100644
View file @
44b3b966
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TBusinessEmployeeExtendInfoMapper.xml
0 → 100644
View file @
44b3b966
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.archives.mapper.TBusinessEmployeeExtendInfoMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendVO"
>
<id
property=
"id"
column=
"ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
jdbcType=
"VARCHAR"
/>
<result
property=
"empName"
column=
"EMP_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"departName"
column=
"DEPART_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"departId"
column=
"DEPART_ID"
jdbcType=
"INTEGER"
/>
<result
property=
"departCode"
column=
"DEPART_CODE"
jdbcType=
"VARCHAR"
/>
<result
property=
"businessPost"
column=
"BUSINESS_POST"
jdbcType=
"VARCHAR"
/>
<result
property=
"businessTelecomNumber"
column=
"BUSINESS_TELECOM_NUMBER"
jdbcType=
"VARCHAR"
/>
<result
property=
"employeeTags"
column=
"EMPLOYEE_TAGS"
jdbcType=
"VARCHAR"
/>
<result
property=
"firstDegreeAndMajor"
column=
"FIRST_DEGREE_AND_MAJOR"
jdbcType=
"VARCHAR"
/>
<result
property=
"firstDegreeGraduateSchool"
column=
"FIRST_DEGREE_GRADUATE_SCHOOL"
jdbcType=
"VARCHAR"
/>
<result
property=
"highestDegreeAndMajor"
column=
"HIGHEST_DEGREE_AND_MAJOR"
jdbcType=
"VARCHAR"
/>
<result
property=
"highestDegreeGraduateSchool"
column=
"HIGHEST_DEGREE_GRADUATE_SCHOOL"
jdbcType=
"VARCHAR"
/>
<result
property=
"contactInfo"
column=
"CONTACT_INFO"
jdbcType=
"VARCHAR"
/>
<result
property=
"archivesAddr"
column=
"ARCHIVES_ADDR"
jdbcType=
"VARCHAR"
/>
<result
property=
"businessWorkingStatus"
column=
"BUSINESS_WORKING_STATUS"
jdbcType=
"CHAR"
/>
<result
property=
"documentType"
column=
"DOCUMENT_TYPE"
jdbcType=
"VARCHAR"
/>
<result
property=
"businessLeaveDate"
column=
"BUSINESS_LEAVE_DATE"
/>
<result
property=
"businessEnjoinDate"
column=
"BUSINESS_ENJOIN_DATE"
/>
<result
property=
"businessLeaveReason"
column=
"BUSINESS_LEAVE_REASON"
jdbcType=
"VARCHAR"
/>
<result
property=
"deleteFlag"
column=
"DELETE_FLAG"
jdbcType=
"CHAR"
/>
</resultMap>
<!-- 离职信息导入获取 -->
<resultMap
id=
"LeaveResultMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendByLeave"
>
<result
property=
"businessTelecomNumber"
column=
"BUSINESS_TELECOM_NUMBER"
jdbcType=
"VARCHAR"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
jdbcType=
"VARCHAR"
/>
<result
property=
"empName"
column=
"EMP_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"departName"
column=
"DEPART_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"departId"
column=
"DEPART_ID"
jdbcType=
"INTEGER"
/>
<result
property=
"businessPost"
column=
"BUSINESS_POST"
jdbcType=
"VARCHAR"
/>
<result
property=
"businessWorkingStatus"
column=
"BUSINESS_WORKING_STATUS"
jdbcType=
"CHAR"
/>
<result
property=
"departCode"
column=
"DEPART_CODE"
jdbcType=
"VARCHAR"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
a.EMP_IDCARD,
a.EMP_NAME,
a.DEPART_NAME,
a.DEPART_ID,
a.BUSINESS_POST,
a.BUSINESS_TELECOM_NUMBER,
a.BUSINESS_ENJOIN_DATE,
a.EMPLOYEE_TAGS,
a.FIRST_DEGREE_AND_MAJOR,
a.FIRST_DEGREE_GRADUATE_SCHOOL,
a.BUSINESS_LEAVE_DATE,
a.BUSINESS_LEAVE_REASON,
a.HIGHEST_DEGREE_AND_MAJOR,
a.HIGHEST_DEGREE_GRADUATE_SCHOOL,
a.CONTACT_INFO,
a.BUSINESS_WORKING_STATUS,
a.DOCUMENT_TYPE,
a.ARCHIVES_ADDR
</sql>
<select
id=
"getNotLeaveExtendList"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from hrms.t_business_employee_extend_info a
<where>
1=1
and a.BUSINESS_WORKING_STATUS
<![CDATA[<>]]>
'1'
and a.DELETE_FLAG = '0'
</where>
</select>
<!-- hgw 2021-8-18 16:41:01 获取所有扩展信息 -->
<select
id=
"getInfoByLeaveList"
resultMap=
"LeaveResultMap"
>
select
a.BUSINESS_TELECOM_NUMBER,
a.EMP_IDCARD,
a.EMP_NAME,
a.DEPART_NAME,
a.DEPART_ID,
a.BUSINESS_POST,
a.BUSINESS_WORKING_STATUS,
a.DEPART_CODE
from t_business_employee_extend_info a
where a.BUSINESS_TELECOM_NUMBER is not null
GROUP BY a.BUSINESS_TELECOM_NUMBER
</select>
<select
id=
"getDataByEmpIdcard"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo"
>
select
a.ID,
a.EMP_IDCARD,
b.EMP_NAME,
a.DEPART_NAME,
a.DEPART_ID,
a.BUSINESS_POST,
a.BUSINESS_TELECOM_NUMBER,
a.BUSINESS_ENJOIN_DATE,
a.EMPLOYEE_TAGS,
a.FIRST_DEGREE_AND_MAJOR,
a.FIRST_DEGREE_GRADUATE_SCHOOL,
a.BUSINESS_LEAVE_DATE,
a.BUSINESS_LEAVE_REASON,
a.HIGHEST_DEGREE_AND_MAJOR,
a.HIGHEST_DEGREE_GRADUATE_SCHOOL,
a.CONTACT_INFO,
a.BUSINESS_WORKING_STATUS,
a.DOCUMENT_TYPE,
a.ARCHIVES_ADDR
from hrms.t_business_employee_extend_info a
left join hrms.t_employee_info b on a.EMP_IDCARD = b.EMP_IDCARD
where 1=1
and a.EMP_IDCARD = #{empIdcard}
and b.DELETE_FLAG = '0'
limit 1
</select>
<select
id=
"getDataById"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo"
>
select
a.ID,
a.EMP_IDCARD,
b.EMP_NAME,
a.DEPART_NAME,
a.DEPART_ID,
a.BUSINESS_POST,
a.BUSINESS_TELECOM_NUMBER,
a.BUSINESS_ENJOIN_DATE,
a.EMPLOYEE_TAGS,
a.FIRST_DEGREE_AND_MAJOR,
a.FIRST_DEGREE_GRADUATE_SCHOOL,
a.BUSINESS_LEAVE_DATE,
a.BUSINESS_LEAVE_REASON,
a.HIGHEST_DEGREE_AND_MAJOR,
a.HIGHEST_DEGREE_GRADUATE_SCHOOL,
a.CONTACT_INFO,
a.BUSINESS_WORKING_STATUS,
a.DOCUMENT_TYPE,
a.ARCHIVES_ADDR
from hrms.t_business_employee_extend_info a
left join hrms.t_employee_info b on a.EMP_IDCARD = b.EMP_IDCARD
where 1=1
and a.ID = #{extendId}
and b.DELETE_FLAG = '0'
limit 1
</select>
</mapper>
This diff is collapsed.
Click to expand it.
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/controller/system/TBusDeptController.java
0 → 100644
View file @
44b3b966
This diff is collapsed.
Click to expand it.
yifu-business/yifu-business-biz/src/main/resources/mapper/TBusDeptMapper.xml
View file @
44b3b966
...
...
@@ -114,7 +114,7 @@
</select>
<!-- 批量更新子集的treeLogo -->
<update
id=
"updateAllTreeLogo"
>
<update
id=
"updateAllTreeLogo"
>
update
t_bus_dept a
set
...
...
This diff is collapsed.
Click to expand it.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
44b3b966
...
...
@@ -304,6 +304,15 @@ public interface CommonConstants {
String
UPDATE_SUCCESS
=
"更新成功!"
;
/**
* update fail
* @Author fxj
* @Date 2020-08-25
**/
String
UPDATE_DATA_FAIL
=
"更新失败!"
;
String
ID_CARD_IS_NULL
=
"身份证号为空"
;
String
PARAM_IS_NOT_EMPTY
=
"参数不可为空"
;
String
DATA_CAN_NOT_EMPTY
=
"数据不可为空"
;
...
...
This diff is collapsed.
Click to expand it.
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
44b3b966
...
...
@@ -299,6 +299,21 @@ public class ArchivesDaprUtil {
return
res
;
}
/**
* @Author fxj
* @Description 校验手机号码重复
* @Date 22:11 2022/8/4
* @Param
* @return
**/
public
R
<
Boolean
>
updateEmployeeExtendRedundancy
(
UpdateEmployeeExtendRedundancyDTO
dto
)
{
R
<
Boolean
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/customerBusiness/temployeeBusiness/inner/updateEmployeeExtendRedundancy"
,
JSON
.
toJSONString
(
dto
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"更新-对应身份证的冗余信息失败!"
);
}
return
res
;
}
/**
* @Author fxj
* @Description 更新项目档案和人员档案的社保公积金状态
...
...
This diff is collapsed.
Click to expand it.
yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties
View file @
44b3b966
#\u6D4B\u8BD5\u73AF\u5883-\u7BA1\u7406\u540E\u53F0
dapr.upms.appUrl
=
http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883
#\u67E5\u8BE2\u5730\u5740\u6559\u7A0B\uFF1A cd home/data/nginx-mvp-image/mvp/
# vim Default.conf
# \u627E\u5230\u5BF9\u5E94\u7684\u670D\u52A1\u5730\u5740
#dapr.upms.appUrl=http://yifu-auth.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730
dapr.upms.appUrl
=
http://localhost:3500/v1.0/invoke/
dapr.upms.appId
=
yifu-upms
dapr.upms.appPort
=
4000
dapr.upms.httpPort
=
3500
dapr.upms.grpcPort
=
52000
dapr.upms.metricsPort
=
9094
#\u6D4B\u8BD5\u73AF\u5883
-\u6821\u9A8C\u670D\u52A1
dapr.check.appUrl
=
http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883
#
dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730
#dapr.check.appUrl=http://localhost:3502
/v1.0/invoke/
dapr.check.appUrl
=
http://localhost:3507
/v1.0/invoke/
dapr.check.appId
=
yifu-check
dapr.check.appPort
=
50022
dapr.check.httpPort
=
3507
dapr.check.grpcPort
=
52008
dapr.check.metricsPort
=
9098
#\u6D4B\u8BD5\u73AF\u5883-\u6863\u6848\u670D\u52A1
dapr.archives.appUrl
=
http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.archives.appUrl
=
http://localhost:3508/v1.0/invoke/
dapr.archives.appId
=
yifu-archives
dapr.archives.appPort
=
5001
dapr.archives.httpPort
=
3508
dapr.archives.grpcPort
=
52009
dapr.archives.metricsPort
=
9099
dapr.insurances.appUrl
=
http://yifu-auth.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.insurances.appId
=
yifu-insurances
dapr.social.appUrl
=
http://localhost:3509/v1.0/invoke/
dapr.social.appId
=
yifu-social
dapr.social.appPort
=
5002
dapr.social.httpPort
=
3509
dapr.social.grpcPort
=
52003
dapr.social.metricsPort
=
9093
#\u6D4B\u8BD5\u73AF\u5883-\u85AA\u8D44\u670D\u52A1
dapr.salary.appUrl
=
http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.salary.appUrl
=
http://localhost:3513/v1.0/invoke/
dapr.salary.appId
=
yifu-salary
dapr.salary.appPort
=
5003
dapr.salary.httpPort
=
3513
dapr.salary.grpcPort
=
52013
dapr.salary.metricsPort
=
9102
dapr.job.appUrl
=
http://localhost:3504/v1.0/invoke/
dapr.job.appId
=
yifu-job
dapr.job.appPort
=
5004
dapr.job.httpPort
=
3506
dapr.job.grpcPort
=
52007
dapr.job.metricsPort
=
9097
dapr.insurances.appUrl
=
http://localhost:3511/v1.0/invoke/
dapr.insurances.appId
=
yifu-insurances
dapr.insurances.appPort
=
5005
dapr.insurances.httpPort
=
3511
dapr.insurances.grpcPort
=
52012
dapr.insurances.metricsPort
=
9101
#\u6D4B\u8BD5\u73AF\u5883-\u85AA\u8D44\u670D\u52A1
#dapr.salary.appUrl=http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#dapr.salary.appId=yifu-salary
#\u6D4B\u8BD5\u73AF\u5883-\u793E\u4FDD\u670D\u52A1
dapr.social.appUrl
=
http://yifu-social.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.social.appId
=
yifu-social
\ No newline at end of file
#dapr.social.appUrl=http://yifu-social.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#
dapr.social.appId
=
yifu-social
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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