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
16596bd1
Commit
16596bd1
authored
Dec 10, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.18-优化导入与更新
parent
2ff62c0c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
130 additions
and
4 deletions
+130
-4
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+29
-0
TEmployeeContractPrePushFascVo.java
...s/v1/yifu/archives/vo/TEmployeeContractPrePushFascVo.java
+36
-0
TEmpContactInfoMapper.java
...d/plus/v1/yifu/archives/mapper/TEmpContactInfoMapper.java
+7
-0
FascServiceImpl.java
...d/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
+21
-4
TEmpContactInfoMapper.xml
...s-biz/src/main/resources/mapper/TEmpContactInfoMapper.xml
+37
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
16596bd1
...
@@ -334,4 +334,33 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -334,4 +334,33 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"任务信息"
)
@Schema
(
description
=
"任务信息"
)
private
String
requestMsg
;
private
String
requestMsg
;
// 电子签推送需要的新字段:——START
@TableField
(
exist
=
false
)
@ExcelAttribute
(
name
=
"户籍所在地"
)
private
String
huArea
;
// contactProvince,contactCity,contactTown,
// contactAddress
@TableField
(
exist
=
false
)
@ExcelAttribute
(
name
=
"通讯地址"
)
private
String
contactArea
;
@TableField
(
exist
=
false
)
@ExcelAttribute
(
name
=
"邮箱"
)
private
String
empEmail
;
// 紧急联系人表
@TableField
(
exist
=
false
)
@ExcelAttribute
(
name
=
"紧急联系人"
)
private
String
contactEmpName
;
@TableField
(
exist
=
false
)
@ExcelAttribute
(
name
=
"紧急联系人电话"
)
private
String
contactTel
;
// relationProvince,relationCity,relationTown
// address
@TableField
(
exist
=
false
)
@ExcelAttribute
(
name
=
"紧急联系人地址"
)
private
String
contactAddress
;
// 电子签推送需要的新字段——END
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPrePushFascVo.java
0 → 100644
View file @
16596bd1
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
lombok.Data
;
/**
* 法大大电子签信推送字段
*/
@Data
public
class
TEmployeeContractPrePushFascVo
{
// idProvince,idCity,idTown
@ExcelAttribute
(
name
=
"户籍所在地"
)
private
String
huArea
;
// contactProvince,contactCity,contactTown,
// contactAddress
@ExcelAttribute
(
name
=
"通讯地址"
)
private
String
contactArea
;
@ExcelAttribute
(
name
=
"邮箱"
)
private
String
empEmail
;
// 紧急联系人表
@ExcelAttribute
(
name
=
"紧急联系人"
)
private
String
contactEmpName
;
@ExcelAttribute
(
name
=
"紧急联系人电话"
)
private
String
contactTel
;
// relationProvince,relationCity,relationTown
// address
@ExcelAttribute
(
name
=
"紧急联系人地址"
)
private
String
contactAddress
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmpContactInfoMapper.java
View file @
16596bd1
...
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
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.TEmpContactInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContactInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPrePushFascVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
@@ -50,4 +51,10 @@ public interface TEmpContactInfoMapper extends BaseMapper<TEmpContactInfo> {
...
@@ -50,4 +51,10 @@ public interface TEmpContactInfoMapper extends BaseMapper<TEmpContactInfo> {
List
<
TEmpContactInfo
>
getContactByDeptId
(
@Param
(
"deptId"
)
String
deptId
);
List
<
TEmpContactInfo
>
getContactByDeptId
(
@Param
(
"deptId"
)
String
deptId
);
List
<
TEmpContactInfo
>
getContactByIdCardList
(
@Param
(
"idCardList"
)
List
<
String
>
idCardList
);
List
<
TEmpContactInfo
>
getContactByIdCardList
(
@Param
(
"idCardList"
)
List
<
String
>
idCardList
);
/* 获取紧急联系人信息,电子签推送法大大需要用紧急联系人相关字段 */
TEmployeeContractPrePushFascVo
getTEmpContactInfoOneByCard
(
@Param
(
"empIdCard"
)
String
empIdCard
);
/* 获取档案信息,电子签推送法大大需要用紧急联系人相关字段 */
TEmployeeContractPrePushFascVo
getTEmpInfoOneByCard
(
@Param
(
"empIdCard"
)
String
empIdCard
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
View file @
16596bd1
...
@@ -21,12 +21,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -21,12 +21,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.fasc.open.api.exception.ApiException
;
import
com.fasc.open.api.exception.ApiException
;
import
com.fasc.open.api.v5_1.res.template.SignTemplateListInfo
;
import
com.fasc.open.api.v5_1.res.template.SignTemplateListInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.FddContractInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TAttaInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractPreMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.FascUtil
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.FascUtil
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPrePushFascVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TFascTemplateSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TFascTemplateSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
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
;
...
@@ -62,6 +60,8 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -62,6 +60,8 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
private
final
TFascTemplateDetailService
tFascTemplateDetailService
;
private
final
TFascTemplateDetailService
tFascTemplateDetailService
;
private
final
TEmployeeContractPreMapper
tEmployeeContractPreMapper
;
private
final
TEmployeeContractPreMapper
tEmployeeContractPreMapper
;
private
final
TEmployeeContractInfoMapper
tEmployeeContractInfoMapper
;
private
final
TEmployeeContractInfoMapper
tEmployeeContractInfoMapper
;
private
final
TEmployeeInfoMapper
tEmployeeInfoMapper
;
private
final
TEmpContactInfoMapper
tEmpContactInfoMapper
;
private
final
TAttaInfoMapper
tAttaInfoMapper
;
private
final
TAttaInfoMapper
tAttaInfoMapper
;
private
final
TFascCompanyService
tFascCompanyService
;
private
final
TFascCompanyService
tFascCompanyService
;
...
@@ -287,11 +287,28 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -287,11 +287,28 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
if
(
Common
.
isEmpty
(
contract
.
getContractId
()))
{
if
(
Common
.
isEmpty
(
contract
.
getContractId
()))
{
return
R
.
failed
(
"未生成合同,请联系管理员"
);
return
R
.
failed
(
"未生成合同,请联系管理员"
);
}
}
String
empIdCard
=
contract
.
getEmpIdcard
();
if
(
Common
.
isEmpty
(
empIdCard
))
{
return
R
.
failed
(
"未找到身份证,请联系管理员"
);
}
TEmployeeContractInfo
empContract
=
tEmployeeContractInfoMapper
.
selectById
(
contract
.
getContractId
());
TEmployeeContractInfo
empContract
=
tEmployeeContractInfoMapper
.
selectById
(
contract
.
getContractId
());
if
(
empContract
==
null
)
{
if
(
empContract
==
null
)
{
return
R
.
failed
(
FASC_NO_EMP_CONTRACT
);
return
R
.
failed
(
FASC_NO_EMP_CONTRACT
);
}
}
TEmployeeContractPrePushFascVo
empContactInfo
=
tEmpContactInfoMapper
.
getTEmpContactInfoOneByCard
(
empIdCard
);
TEmployeeContractPrePushFascVo
empInfo
=
tEmpContactInfoMapper
.
getTEmpInfoOneByCard
(
empIdCard
);
if
(
empContactInfo
!=
null
)
{
contract
.
setContactEmpName
(
empContactInfo
.
getContactEmpName
());
contract
.
setContactTel
(
empContactInfo
.
getContactTel
());
contract
.
setContactAddress
(
empContactInfo
.
getContactAddress
());
}
if
(
empInfo
!=
null
)
{
contract
.
setHuArea
(
empInfo
.
getHuArea
());
contract
.
setContactArea
(
empInfo
.
getContactArea
());
contract
.
setEmpEmail
(
empInfo
.
getEmpEmail
());
}
if
(
Common
.
isEmpty
(
contract
.
getFadadaTemplateId
()))
{
if
(
Common
.
isEmpty
(
contract
.
getFadadaTemplateId
()))
{
return
R
.
failed
(
"未找到合同模板ID,请联系管理员"
);
return
R
.
failed
(
"未找到合同模板ID,请联系管理员"
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContactInfoMapper.xml
View file @
16596bd1
...
@@ -110,6 +110,43 @@
...
@@ -110,6 +110,43 @@
</where>
</where>
</select>
</select>
<!-- 获取紧急联系人信息,电子签推送法大大需要用紧急联系人相关字段 -->
<select
id=
"getTEmpContactInfoOneByCard"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPrePushFascVo"
>
SELECT
a.EMP_NAME contactEmpName,a.tel contactTel,concat(ifnull(sp.AREA_NAME,'')
,ifnull(sc.AREA_NAME,'')
,ifnull(st.AREA_NAME,'')
,ifnull(a.ADDRESS,'')
) contactAddress
from t_emp_contact_info a
left join sys_area sp on sp.id = a.RELATION_PROVINCE
left join sys_area sc on sc.id = a.RELATION_CITY
left join sys_area st on st.id = a.RELATION_TOWN
where a.EMP_IDCARD = #{empIdCard} ORDER BY a.CREATE_TIME desc limit 1
</select>
<!-- 获取档案信息,电子签推送法大大需要用紧急联系人相关字段 -->
<select
id=
"getTEmpInfoOneByCard"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPrePushFascVo"
>
select
concat(ifnull(sp.AREA_NAME,'')
,ifnull(sc.AREA_NAME,'')
,ifnull(st.AREA_NAME,'')
) huArea,
concat(ifnull(sp2.AREA_NAME,'')
,ifnull(sc2.AREA_NAME,'')
,ifnull(st2.AREA_NAME,'')
,ifnull(a.CONTACT_ADDRESS,'')
) contactArea,a.EMP_EMAIL empEmail
from t_employee_info a
left join sys_area sp on sp.id = a.ID_PROVINCE
left join sys_area sc on sc.id = a.ID_CITY
left join sys_area st on st.id = a.ID_TOWN
left join sys_area sp2 on sp2.id = a.CONTACT_PROVINCE
left join sys_area sc2 on sc2.id = a.CONTACT_CITY
left join sys_area st2 on st2.id = a.CONTACT_TOWN
where a.EMP_IDCARD = #{empIdCard} ORDER BY a.CREATE_TIME desc limit 1
</select>
<select
id=
"getContactByDeptId"
resultMap=
"tEmpContactInfoMap"
>
<select
id=
"getContactByDeptId"
resultMap=
"tEmpContactInfoMap"
>
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
...
...
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