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
45d11f1a
Commit
45d11f1a
authored
Dec 01, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop'
parents
7cdbe5c5
4bcc9a12
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
670 additions
and
38 deletions
+670
-38
HcmArchiveBasicVo.java
...ifu/cloud/plus/v1/yifu/archives/vo/HcmArchiveBasicVo.java
+72
-0
HcmArchiveCertificateVo.java
...oud/plus/v1/yifu/archives/vo/HcmArchiveCertificateVo.java
+55
-0
HcmArchiveEducationVo.java
...cloud/plus/v1/yifu/archives/vo/HcmArchiveEducationVo.java
+58
-0
HcmArchiveFamilyVo.java
...fu/cloud/plus/v1/yifu/archives/vo/HcmArchiveFamilyVo.java
+56
-0
HcmArchiveJobVo.java
.../yifu/cloud/plus/v1/yifu/archives/vo/HcmArchiveJobVo.java
+55
-0
HcmContractVo.java
...om/yifu/cloud/plus/v1/yifu/archives/vo/HcmContractVo.java
+67
-0
HcmEmployeeInfoVO.java
...ifu/cloud/plus/v1/yifu/archives/vo/HcmEmployeeInfoVO.java
+52
-0
pom.xml
yifu-archives/yifu-archives-biz/pom.xml
+1
-0
TEmployeeInfoController.java
.../v1/yifu/archives/controller/TEmployeeInfoController.java
+28
-0
TEmployeeInfoMapper.java
...oud/plus/v1/yifu/archives/mapper/TEmployeeInfoMapper.java
+12
-0
TEmployeeInfoService.java
...d/plus/v1/yifu/archives/service/TEmployeeInfoService.java
+19
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+36
-0
application.yml
...ives/yifu-archives-biz/src/main/resources/application.yml
+2
-0
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+105
-0
daprConfig.properties
...yifu-common-dapr/src/main/resources/daprConfig.properties
+20
-20
EkpInsuranceUtil.java
...om/yifu/cloud/plus/v1/yifu/ekp/util/EkpInsuranceUtil.java
+6
-0
EKPInsurancePushParam.java
...yifu/cloud/plus/v1/yifu/ekp/vo/EKPInsurancePushParam.java
+4
-0
ekpFundConfig.properties
...fu-common-ekp/src/main/resources/ekpFundConfig.properties
+2
-1
ekpIncomeConfig.properties
...-common-ekp/src/main/resources/ekpIncomeConfig.properties
+2
-2
ekpInsuranceConfig.properties
...mmon-ekp/src/main/resources/ekpInsuranceConfig.properties
+2
-2
ekpOrderConfig.properties
...u-common-ekp/src/main/resources/ekpOrderConfig.properties
+2
-2
ekpSalaryConfig.properties
...-common-ekp/src/main/resources/ekpSalaryConfig.properties
+2
-2
ekpSocialConfig.properties
...-common-ekp/src/main/resources/ekpSocialConfig.properties
+2
-2
seata-config.yml
...mon/yifu-common-seata/src/main/resources/seata-config.yml
+1
-1
EkpInteractiveParam.java
...cloud/plus/v1/yifu/insurances/vo/EkpInteractiveParam.java
+6
-0
MsgInfoMapper.java
...java/com/yifu/cloud/plus/v1/msg/mapper/MsgInfoMapper.java
+1
-0
logback-spring.xml
yifu-msg/yifu-msg-biz/src/main/resources/logback-spring.xml
+1
-1
logback-spring.xml
...rder/yifu-order-biz/src/main/resources/logback-spring.xml
+1
-1
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+0
-4
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/HcmArchiveBasicVo.java
0 → 100644
View file @
45d11f1a
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* HCM档案子Vo
* @author hgw
* @date 2023-11-23 12:02:03
*/
@Data
@ColumnWidth
(
30
)
public
class
HcmArchiveBasicVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
@Schema
(
description
=
"员工姓名"
)
private
String
empName
;
@Schema
(
description
=
"身份证号"
)
private
String
empIdCard
;
@Schema
(
description
=
"邮箱"
)
private
String
email
;
@Schema
(
description
=
"出生日期"
)
private
String
bornDate
;
@Schema
(
description
=
"性别"
)
private
String
sex
;
@Schema
(
description
=
"最高学历"
)
private
String
education
;
// 户口性质
@Schema
(
description
=
"户口类型"
)
private
String
residentType
;
@Schema
(
description
=
"婚姻状况"
)
private
String
maritalStatus
;
@Schema
(
description
=
"民族"
)
private
String
nation
;
// 户籍所在地
@Schema
(
description
=
"籍贯"
)
private
String
nativePlace
;
@Schema
(
description
=
"政治面貌"
)
private
String
political
;
// 通讯地址
@Schema
(
description
=
"联系地址"
)
private
String
contactAddress
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/HcmArchiveCertificateVo.java
0 → 100644
View file @
45d11f1a
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* HCM档案子Vo
*
* @author hgw
* @date 2023-11-23 12:02:03
*/
@Data
@ColumnWidth
(
30
)
public
class
HcmArchiveCertificateVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
// 资格类型
@Schema
(
description
=
"证照名称"
)
private
String
certificateName
;
// 证书编号
@Schema
(
description
=
"证照编号"
)
private
String
certificateNo
;
// 评定机构
@Schema
(
description
=
"发证机构"
)
private
String
certificateOrg
;
// 无
@Schema
(
description
=
"发证日期"
)
private
String
certificateDate
;
// 无
@Schema
(
description
=
"到期时间"
)
private
String
certificateExpireDate
;
// 附件
@Schema
(
description
=
"证照附件"
)
private
String
annex
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/HcmArchiveEducationVo.java
0 → 100644
View file @
45d11f1a
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* HCM档案子Vo
*
* @author hgw
* @date 2023-11-23 12:02:03
*/
@Data
@ColumnWidth
(
30
)
public
class
HcmArchiveEducationVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
// 学校
@Schema
(
description
=
"学校名称"
)
private
String
schoolName
;
// 工作部门
@Schema
(
description
=
"专业"
)
private
String
major
;
// 工作岗位
@Schema
(
description
=
"学历"
)
private
String
education
;
// 入学时间
@Schema
(
description
=
"入校日期"
)
private
String
joinDate
;
// 毕业时间
@Schema
(
description
=
"毕业日期"
)
private
String
leaveDate
;
// 学制类型
@Schema
(
description
=
"是否全日制"
)
private
String
isFullTime
;
// 附件
@Schema
(
description
=
"学历附件"
)
private
String
annex
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/HcmArchiveFamilyVo.java
0 → 100644
View file @
45d11f1a
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* HCM档案子Vo
*
* @author hgw
* @date 2023-11-23 12:02:03
*/
@Data
@ColumnWidth
(
30
)
public
class
HcmArchiveFamilyVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
// 与本人关系
@Schema
(
description
=
"称谓"
)
private
String
relationName
;
// 成员姓名
@Schema
(
description
=
"姓名"
)
private
String
trueName
;
// 出生日期
@Schema
(
description
=
"出生年月"
)
private
String
bornTime
;
// 无
@Schema
(
description
=
"政治面貌"
)
private
String
political
;
// 工作单位
@Schema
(
description
=
"工作/学习单位"
)
private
String
company
;
// 无
@Schema
(
description
=
"职位/职务"
)
private
String
jobName
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/HcmArchiveJobVo.java
0 → 100644
View file @
45d11f1a
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* HCM档案子Vo
*
* @author hgw
* @date 2023-11-23 12:02:03
*/
@Data
@ColumnWidth
(
30
)
public
class
HcmArchiveJobVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
// 工作单位
@Schema
(
description
=
"公司名称"
)
private
String
companyName
;
// 工作部门
@Schema
(
description
=
"部门"
)
private
String
deptName
;
// 工作岗位
@Schema
(
description
=
"职位"
)
private
String
jobName
;
// 开始工作日期
@Schema
(
description
=
"开始日期"
)
private
String
joinDate
;
// 结束工作日期
@Schema
(
description
=
"结束日期"
)
private
String
leaveDate
;
// 无
@Schema
(
description
=
"职位描述"
)
private
String
remark
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/HcmContractVo.java
0 → 100644
View file @
45d11f1a
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* HCM档案子Vo
*
* @author hgw
* @date 2023-11-23 12:02:03
*/
@Data
@ColumnWidth
(
30
)
public
class
HcmContractVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
@Schema
(
description
=
"合同类型"
)
private
String
contractType
;
// 签订期限
@Schema
(
description
=
"期限类型"
)
private
String
termType
;
// 无
@Schema
(
description
=
"合同签订日期"
)
private
String
contractDate
;
// 合同甲方
@Schema
(
description
=
"合同公司"
)
private
String
contractCompany
;
// 合同编码
@Schema
(
description
=
"合同编号"
)
private
String
contractCode
;
// 合同起始日期
@Schema
(
description
=
"合同开始日期"
)
private
String
startDate
;
// 合同截止日期
@Schema
(
description
=
"合同结束日期"
)
private
String
endDate
;
@Schema
(
description
=
"合同状态"
)
private
String
contractStatus
;
// 附件
@Schema
(
description
=
"合同附件"
)
private
String
annexArray
;
// 无
@Schema
(
description
=
"合同负责人"
)
private
String
contractOwner
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/HcmEmployeeInfoVO.java
0 → 100644
View file @
45d11f1a
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* 项目档案表excel对应的实体
*
* @author huyc
* @date 2022-06-20 17:54:40
*/
@Data
@ColumnWidth
(
30
)
public
class
HcmEmployeeInfoVO
extends
RowIndex
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
// 基本信息
private
HcmArchiveBasicVo
archiveBasic
;
// 工作经历
private
List
<
HcmArchiveJobVo
>
archiveJob
;
// 教育经历-含附件
private
List
<
HcmArchiveEducationVo
>
archiveEducation
;
// 资格证书-含附件
private
List
<
HcmArchiveCertificateVo
>
archiveCertificate
;
// 家庭成员
private
List
<
HcmArchiveFamilyVo
>
archiveFamily
;
// 合同信息-含附件
private
List
<
HcmContractVo
>
contract
;
}
yifu-archives/yifu-archives-biz/pom.xml
View file @
45d11f1a
...
...
@@ -8,6 +8,7 @@
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu
</artifactId>
<version>
1.0.0
</version>
<relativePath/>
</parent>
<artifactId>
yifu-archives-biz
</artifactId>
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @
45d11f1a
...
...
@@ -477,4 +477,32 @@ public class TEmployeeInfoController {
tEmployeeInfoService
.
everyDayUpdateEmployeeContractStatus
();
}
/**
* @param idCard
* @Description: HCM获取人员信息
* @Author: hgw
* @Date: 2023/11/23 11:42
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.HcmEmployeeInfoVO>
**/
@Operation
(
description
=
"HCM获取人员信息"
)
@SysLog
(
"HCM获取人员信息--HCM调用接口"
)
@GetMapping
(
"/getHcmEmpInfo"
)
public
R
<
HcmEmployeeInfoVO
>
getHcmEmpInfo
(
@RequestParam
String
idCard
)
{
return
tEmployeeInfoService
.
getHcmEmpInfo
(
idCard
);
}
/**
* @param idCardList
* @Description: HCM获取人员信息列表
* @Author: hgw
* @Date: 2023/11/23 11:43
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.archives.vo.HcmEmployeeInfoVO>>
**/
@Operation
(
description
=
"HCM获取人员信息列表"
)
@SysLog
(
"HCM获取人员信息列表--HCM调用接口"
)
@PostMapping
(
"/getHcmEmpInfoList"
)
public
R
<
List
<
HcmEmployeeInfoVO
>>
getHcmEmpInfoList
(
@RequestBody
List
<
String
>
idCardList
)
{
return
tEmployeeInfoService
.
getHcmEmpInfoList
(
idCardList
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeInfoMapper.java
View file @
45d11f1a
...
...
@@ -122,4 +122,16 @@ public interface TEmployeeInfoMapper extends BaseMapper<TEmployeeInfo> {
int
everyDayUpdateEmployeeInfoContractStatus
();
void
updateContractStatus
(
@Param
(
"empId"
)
String
empId
,
@Param
(
"status"
)
int
status
);
// hgw 2023-11-23 11:38:00 HCM获取人员信息
HcmArchiveBasicVo
getHcmArchiveBasicVo
(
@Param
(
"idCard"
)
String
idCard
);
List
<
HcmArchiveJobVo
>
getHcmArchiveJobVo
(
@Param
(
"idCard"
)
String
idCard
);
List
<
HcmArchiveEducationVo
>
getHcmArchiveEducationVo
(
@Param
(
"idCard"
)
String
idCard
);
List
<
HcmArchiveCertificateVo
>
getHcmArchiveCertificateVo
(
@Param
(
"idCard"
)
String
idCard
);
List
<
HcmArchiveFamilyVo
>
getHcmArchiveFamilyVo
(
@Param
(
"idCard"
)
String
idCard
);
List
<
HcmContractVo
>
getHcmContractVo
(
@Param
(
"idCard"
)
String
idCard
);
// hgw 2023-11-23 11:38:00 HCM获取人员信息列表
List
<
HcmEmployeeInfoVO
>
getHcmEmpInfoList
(
@Param
(
"idCardList"
)
List
<
String
>
idCardList
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeInfoService.java
View file @
45d11f1a
...
...
@@ -222,4 +222,23 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
void
everyDayUpdateEmployeeContractStatus
();
void
updateContractStatus
(
String
empId
,
int
status
);
/**
* @param idCard
* @Description: HCM获取人员信息
* @Author: hgw
* @Date: 2023/11/23 11:35
* @return: com.yifu.cloud.plus.v1.yifu.archives.vo.HcmEmployeeInfoVO
**/
R
<
HcmEmployeeInfoVO
>
getHcmEmpInfo
(
String
idCard
);
/**
* @param idCardList
* @Description: HCM获取人员信息列表
* @Author: hgw
* @Date: 2023/11/23 11:35
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.archives.vo.HcmEmployeeInfoVO>
**/
R
<
List
<
HcmEmployeeInfoVO
>>
getHcmEmpInfoList
(
List
<
String
>
idCardList
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
45d11f1a
...
...
@@ -2533,4 +2533,40 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
public
void
updateContractStatus
(
String
empId
,
int
status
)
{
baseMapper
.
updateContractStatus
(
empId
,
status
);
}
@Override
public
R
<
HcmEmployeeInfoVO
>
getHcmEmpInfo
(
String
idCard
)
{
HcmEmployeeInfoVO
a
=
this
.
getHcmEmployeeInfoVoByIdCard
(
idCard
);
return
R
.
ok
(
a
);
}
@Override
public
R
<
List
<
HcmEmployeeInfoVO
>>
getHcmEmpInfoList
(
List
<
String
>
idCardList
)
{
List
<
HcmEmployeeInfoVO
>
list
=
new
ArrayList
<>();
HcmEmployeeInfoVO
vo
;
for
(
String
idCard
:
idCardList
)
{
vo
=
this
.
getHcmEmployeeInfoVoByIdCard
(
idCard
);
list
.
add
(
vo
);
}
return
R
.
ok
(
list
);
}
/**
* @param idCard
* @Description: 组装vo
* @Author: hgw
* @Date: 2023/11/23 15:24
* @return: com.yifu.cloud.plus.v1.yifu.archives.vo.HcmEmployeeInfoVO
**/
private
HcmEmployeeInfoVO
getHcmEmployeeInfoVoByIdCard
(
String
idCard
)
{
HcmEmployeeInfoVO
vo
=
new
HcmEmployeeInfoVO
();
// 基础信息
vo
.
setArchiveBasic
(
baseMapper
.
getHcmArchiveBasicVo
(
idCard
));
vo
.
setArchiveJob
(
baseMapper
.
getHcmArchiveJobVo
(
idCard
));
vo
.
setArchiveEducation
(
baseMapper
.
getHcmArchiveEducationVo
(
idCard
));
vo
.
setArchiveCertificate
(
baseMapper
.
getHcmArchiveCertificateVo
(
idCard
));
vo
.
setArchiveFamily
(
baseMapper
.
getHcmArchiveFamilyVo
(
idCard
));
vo
.
setContract
(
baseMapper
.
getHcmContractVo
(
idCard
));
return
vo
;
}
}
yifu-archives/yifu-archives-biz/src/main/resources/application.yml
View file @
45d11f1a
...
...
@@ -44,6 +44,8 @@ security:
-
/actuator/**
-
/swagger-ui/**
-
/fdd/*
-
/temployeeinfo/getHcmEmpInfo
-
/temployeeinfo/getHcmEmpInfoList
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
45d11f1a
...
...
@@ -1191,4 +1191,109 @@
set CONTRACT_STATUS = #{status}
WHERE a.id=#{empId}
</update>
<!-- hgw 根据身份证查询-基础信息 -->
<select
id=
"getHcmArchiveBasicVo"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.HcmArchiveBasicVo"
>
select
a.EMP_NAME empName
,a.EMP_IDCARD empIdCard
,a.EMP_EMAIL email
,a.EMP_EMAIL email
,a.EMP_BIRTHDAY bornDate
,if(a.EMP_SEX='2','女',if(a.EMP_SEX='1','男','-')) sex
,education.label education
,registype.label residentType
,married.label maritalStatus
,nation.label nation
,concat(ifnull(p.AREA_NAME,''),ifnull(c.AREA_NAME,''),ifnull(t.AREA_NAME,'')) nativePlace
,politicalStatus.label political
,a.contact_Address contactAddress
from t_employee_info a
left join sys_area p on p.id=a.ID_PROVINCE
left join sys_area c on c.id=a.ID_CITY
left join sys_area t on t.id=a.ID_TOWN
left join view_sys_dict_item nation on nation.value=a.EMP_NATIONAL and nation.type='emp_national'
left join view_sys_dict_item education on education.value=a.HIGN_EDUCATION and education.type='education'
left join view_sys_dict_item registype on registype.value=a.EMP_REGIS_TYPE and registype.type='emp_registype'
left join view_sys_dict_item married on married.value=a.EMP_MARRI_STATUS and married.type='emp_married'
left join view_sys_dict_item politicalStatus on politicalStatus.value=a.POLITICAL_STATUS and politicalStatus.type='emp_political'
where a.DELETE_FLAG = '0' and a.EMP_IDCARD = #{idCard} limit 1
</select>
<select
id=
"getHcmArchiveJobVo"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.HcmArchiveJobVo"
>
select
a.WORK_UNIT companyName
,a.WORK_DEPART deptName
,a.WORK_JOB jobName
,a.START_DATE joinDate
,a.END_DATE leaveDate
,a.REMARK remark
from t_emp_work_recording a
where a.EMP_IDCARD = #{idCard}
</select>
<select
id=
"getHcmArchiveEducationVo"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.HcmArchiveEducationVo"
>
select
a.SCHOOL schoolName
,a.MAJOR major
,education.label education
,a.ENTRY_DATE joinDate
,a.GRADUTION_DATE leaveDate
,educationType.label isFullTime
,'' annex
from t_emp_education a
left join view_sys_dict_item education on education.value=a.EDUCATION_NAME and education.type='education'
left join view_sys_dict_item educationType on educationType.value=a.type and educationType.type='education_type'
where a.EMP_IDCARD = #{idCard}
</select>
<select
id=
"getHcmArchiveCertificateVo"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.HcmArchiveCertificateVo"
>
select
qualification.label certificateName
,a.CERTIFICATION_NO certificateNo
,a.ASSESSMENT_UNIT certificateOrg
,'' certificateDate
,'' certificateExpireDate
,'' annex
from t_emp_professional_qualification a
left join view_sys_dict_item qualification on qualification.value=a.QUALIFICATION_TYPE and qualification.type='qualification_type'
where a.EMP_IDCARD = #{idCard}
</select>
<select
id=
"getHcmArchiveFamilyVo"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.HcmArchiveFamilyVo"
>
select
relation.label relationName
,a.FAMILY_NAME trueName
,a.BIRTHDAY bornTime
,'' political
,a.WORK_UNIT company
,'' jobName
from t_emp_family a
left join view_sys_dict_item relation on relation.value=a.RELATIONSHIP_SELF and relation.type='family_relation'
where a.EMP_IDCARD = #{idCard}
</select>
<select
id=
"getHcmContractVo"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.HcmContractVo"
>
select
a.CONTRACT_NAME contractType
,contractType.label termType
,'' contractDate
,a.CONTRACT_PARTY contractCompany
,a.CONTRACT_NO contractCode
,a.CONTRACT_START startDate
,a.CONTRACT_END endDate
,if(a.IN_USE='0','可用','不可用') contractStatus
,'' annexArray
,'' contractOwner
from t_employee_contract_info a
left join view_sys_dict_item contractType on contractType.value=a.CONTRACT_TYPE and contractType.type='employee_contract_type'
where a.EMP_IDCARD = #{idCard}
</select>
<!-- hgw 根据身份证查询 -->
<select
id=
"getHcmEmpInfoList"
resultMap=
"tEmployeeInfoMap"
>
select
<include
refid=
"baseParam"
/>
from t_employee_info a
where a.DELETE_FLAG = '0' and a.EMP_IDCARD in
<foreach
item=
"item"
index=
"index"
collection=
"idCardList"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</select>
</mapper>
yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties
View file @
45d11f1a
dapr.upms.appUrl
=
http://
127.0.0.1
:3500/v1.0/invoke/
dapr.upms.appUrl
=
http://
yifu-upms.qas-mvp.svc.cluster.local
:3500/v1.0/invoke/
dapr.upms.appId
=
yifu-upms
dapr.check.appUrl
=
http://127.0.0.1:3500/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883
#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/
dapr.check.appId
=
yifu-check
#\u751F\u4EA7
dapr.archives.appUrl
=
http://127.0.0.1:3500/v1.0/invoke/
dapr.archives.appId
=
yifu-archives
#\u
751F\u4EA7
dapr.
social.appUrl
=
http://127.0.0.1
:3500/v1.0/invoke/
dapr.
social.appId
=
yifu-social
#\u
6D4B\u8BD5\u73AF\u5883
dapr.
archives.appUrl
=
http://yifu-archives.qas-mvp.svc.cluster.local
:3500/v1.0/invoke/
dapr.
archives.appId
=
yifu-archives
#\u
751F\u4EA7
dapr.salary.appUrl
=
http://
127.0.0.1
:3500/v1.0/invoke/
#\u
6D4B\u8BD5\u73AF\u5883
dapr.salary.appUrl
=
http://
yifu-salary.qas-mvp.svc.cluster.local
:3500/v1.0/invoke/
dapr.salary.appId
=
yifu-salary
#\u6D4B\u8BD5\u73AF\u5883
dapr.social.appUrl
=
http://yifu-social.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.social.appId
=
yifu-social
#\u751F\u4EA7
dapr.insurances.appUrl
=
http://127.0.0.1:3500/v1.0/invoke/
dapr.insurances.appId
=
yifu-insurances
#\u751F\u4EA7
dapr.business.appUrl
=
http://127.0.0.1:3500/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883-B\u7AEF\u670D\u52A1
dapr.business.appUrl
=
http://yifu-business.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.business.appId
=
yifu-business
#\u
751F\u4EA7
dapr.msg.appUrl
=
http://
127.0.0.1
:3500/v1.0/invoke/
#\u
6D4B\u8BD5\u73AF\u5883-\u6D88\u606F\u63D0\u9192\u670D\u52A1
dapr.msg.appUrl
=
http://
yifu-msg.qas-mvp.svc.cluster.local
:3500/v1.0/invoke/
dapr.msg.appId
=
yifu-msg
#\u
751F\u4EA7
dapr.permission.appUrl
=
http://
127.0.0.1
:3500/v1.0/invoke/
#\u
6D4B\u8BD5\u73AF\u5883-EKP\u6743\u9650
dapr.permission.appUrl
=
http://
yifu-permission.qas-mvp.svc.cluster.local
:3500/v1.0/invoke/
dapr.permission.appId
=
yifu-permission
\ No newline at end of file
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/util/EkpInsuranceUtil.java
View file @
45d11f1a
...
...
@@ -279,6 +279,12 @@ public class EkpInsuranceUtil {
}
else
{
pushParam
.
setFd_3b178f8ba1a91c
(
CommonConstants
.
EMPTY_STRING
);
}
//派单客服姓名
if
(
null
!=
param
.
getCreateName
()){
pushParam
.
setFd_3c6f0118af2ba6
(
param
.
getCreateName
());
}
else
{
pushParam
.
setFd_3c6f0118af2ba6
(
CommonConstants
.
EMPTY_STRING
);
}
return
pushParam
;
}
...
...
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EKPInsurancePushParam.java
View file @
45d11f1a
...
...
@@ -130,6 +130,10 @@ public class EKPInsurancePushParam {
*/
private
String
fd_3b178f8ba1a91c
;
/**
* 派单客服姓名
*/
private
String
fd_3c6f0118af2ba6
;
...
...
yifu-common/yifu-common-ekp/src/main/resources/ekpFundConfig.properties
View file @
45d11f1a
ekpfund.url
=
http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
#ekpfund.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
ekpfund.url
=
http://36.7.147.29:27007/api/sys-modeling/appModelRestService/addModel
ekpfund.fdModelId
=
181d741547a691aa68b16149a40de901
ekpfund.fdFlowId
=
18290af372be55308327273487abf72a
ekpfund.docStatus
=
20
...
...
yifu-common/yifu-common-ekp/src/main/resources/ekpIncomeConfig.properties
View file @
45d11f1a
income.url
=
http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
#income.url=http://36.7.147.19:28080
/api/sys-modeling/appModelRestService/addModel
#
income.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
income.url
=
http://36.7.147.29:27007
/api/sys-modeling/appModelRestService/addModel
income.fdModelIdManage
=
181d76db26e419a88dba97b0c406689e
income.fdFlowIdManage
=
182d3b6e522b2690119e70d4ff082136
income.fdModelIdRisk
=
181d76db26e4112e14b9bb4274d06ba1
...
...
yifu-common/yifu-common-ekp/src/main/resources/ekpInsuranceConfig.properties
View file @
45d11f1a
insurance.insuranceUrl
=
http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
#insurance.insuranceUrl=http://36.7.147.19:28080
/api/sys-modeling/appModelRestService/addModel
#
insurance.insuranceUrl=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
insurance.insuranceUrl
=
http://36.7.147.29:27007
/api/sys-modeling/appModelRestService/addModel
insurance.insuranceFdModelId
=
181d73279372e5a55438a47d7436ab7e
insurance.insuranceFdFlowId
=
18267f206233f29cbd3c5ee425c9408a
insurance.insuranceDocStatus
=
20
...
...
yifu-common/yifu-common-ekp/src/main/resources/ekpOrderConfig.properties
View file @
45d11f1a
ekporder.url
=
http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
#ekporder.url=http://36.7.147.19:28080
/api/sys-modeling/appModelRestService/addModel
#
ekporder.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
ekporder.url
=
http://36.7.147.29:27007
/api/sys-modeling/appModelRestService/addModel
ekporder.orderFdModelId
=
182f1b7ffe2e96f975564e44e559847d
ekporder.orderFdFlowId
=
182f1c098ce991ca96bc927408792beb
ekporder.replyFdModelId
=
182f1bb35bb2156fb9a02904bc88dd8a
...
...
yifu-common/yifu-common-ekp/src/main/resources/ekpSalaryConfig.properties
View file @
45d11f1a
ekp.url
=
http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
#ekp.url=http://36.7.147.19:28080
/api/sys-modeling/appModelRestService/addModel
#
ekp.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
ekp.url
=
http://36.7.147.29:27007
/api/sys-modeling/appModelRestService/addModel
ekp.fdModelId
=
181d7633ff8bc797276d0d3a54e80ad6
ekp.fdFlowId
=
182b40249c1bc940d7226b941c7a4183
ekp.docStatus
=
20
...
...
yifu-common/yifu-common-ekp/src/main/resources/ekpSocialConfig.properties
View file @
45d11f1a
#ekpsocial.url=http://36.7.147.19:28080
/api/sys-modeling/appModelRestService/addModel
ekpsocial.url
=
http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
ekpsocial.url
=
http://36.7.147.29:27007
/api/sys-modeling/appModelRestService/addModel
#
ekpsocial.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
ekpsocial.fdModelId
=
181d741547a69ba9dbc12377948e98fd
ekpsocial.fdFlowId
=
18233028fe91511376b00f74b3a8f3a7
ekpsocial.docStatus
=
20
...
...
yifu-common/yifu-common-seata/src/main/resources/seata-config.yml
View file @
45d11f1a
...
...
@@ -28,7 +28,7 @@ seata:
enable-degrade
:
false
# 降级开关
disable-global-transaction
:
false
# 禁用全局事务(默认false)
grouplist
:
default
:
192.168.
0.153
:33091
default
:
192.168.
1.65
:33091
transport
:
shutdown
:
wait
:
3
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EkpInteractiveParam.java
View file @
45d11f1a
...
...
@@ -178,6 +178,12 @@ public class EkpInteractiveParam implements Serializable {
@Schema
(
description
=
"状态:有,无"
)
private
String
estimateStatus
;
/**
* 客服姓名
*/
@Schema
(
description
=
"客服姓名"
)
private
String
createName
;
/**
* EKP的 是否BPO: 是 否
*/
...
...
yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/mapper/MsgInfoMapper.java
View file @
45d11f1a
...
...
@@ -56,4 +56,5 @@ public interface MsgInfoMapper extends BaseMapper<MsgInfo> {
List
<
String
>
getOrderNos
();
int
insertMsg
(
@Param
(
"vo"
)
EkpInsertMsgVo
vo
);
}
yifu-msg/yifu-msg-biz/src/main/resources/logback-spring.xml
View file @
45d11f1a
...
...
@@ -49,7 +49,7 @@
</appender>
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root
level=
"
INFO
"
>
<root
level=
"
error
"
>
<appender-ref
ref=
"console"
/>
<appender-ref
ref=
"debug"
/>
<appender-ref
ref=
"error"
/>
...
...
yifu-order/yifu-order-biz/src/main/resources/logback-spring.xml
View file @
45d11f1a
...
...
@@ -50,7 +50,7 @@
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root
level=
"
INFO
"
>
<root
level=
"
debug
"
>
<appender-ref
ref=
"console"
/>
<appender-ref
ref=
"debug"
/>
<appender-ref
ref=
"error"
/>
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
45d11f1a
...
...
@@ -26,19 +26,16 @@ import com.alibaba.excel.read.listener.ReadListener;
import
com.alibaba.excel.read.metadata.holder.ReadRowHolder
;
import
com.alibaba.excel.util.ListUtils
;
import
com.alibaba.excel.write.metadata.WriteSheet
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
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.service.impl.ServiceImpl
;
import
com.esotericsoftware.minlog.Log
;
import
com.yifu.cloud.plus.v1.check.entity.TCheckBankNo
;
import
com.yifu.cloud.plus.v1.check.entity.TCheckIdCard
;
import
com.yifu.cloud.plus.v1.check.entity.TCheckMobile
;
import
com.yifu.cloud.plus.v1.check.vo.CheckBankNoVo
;
import
com.yifu.cloud.plus.v1.check.vo.CheckBatchVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
...
...
@@ -59,7 +56,6 @@ import com.yifu.cloud.plus.v1.yifu.salary.vo.*;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
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