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
54a026c2
Commit
54a026c2
authored
Mar 07, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.2' into MVP1.5.2
parents
8c5ed63d
43310f3a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
1 deletion
+25
-1
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+3
-0
TEmployeeContractInfoMapper.java
.../v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
+2
-0
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+9
-0
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+11
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
54a026c2
...
...
@@ -397,4 +397,7 @@ public class TEmployeeProject extends BaseEntity {
@TableField
(
exist
=
false
)
private
String
odlDeptId
;
@TableField
(
exist
=
false
)
private
String
oldDeptNo
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
View file @
54a026c2
...
...
@@ -105,4 +105,6 @@ public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContrac
,
@Param
(
"settleDomainIds"
)
List
<
String
>
settleDomainIds
,
@Param
(
"alertMonth"
)
Integer
alertMonth
);
List
<
EmpContractBusinessPageVo
>
getOtherContractBusinessInfo
(
@Param
(
"empId"
)
String
empId
,
@Param
(
"contractId"
)
String
contractId
);
void
updateContractChange
(
@Param
(
"idCard"
)
String
empIdcard
,
@Param
(
"deptNo"
)
String
deptNo
,
@Param
(
"oldDeptNo"
)
String
odlDeptNo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
54a026c2
...
...
@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.pig4cloud.plugin.excel.vo.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmpChangeInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TSettleDomainMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TCustomerInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmpChangeInfoService
;
...
...
@@ -64,6 +65,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
private
final
TEmployeeLogServiceImpl
tEmployeeLogService
;
private
final
TEmployeeContractInfoMapper
contractInfoMapper
;
@Autowired
private
final
SocialDaprUtils
socialDaprUtils
;
...
...
@@ -117,6 +120,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
// 记录变更日志
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
updateTEmployeeProject
.
getId
(),
tEmployeeProjectOld
,
updateTEmployeeProject
);
updateTEmployeeProject
.
setOdlDeptId
(
tEmployeeProjectOld
.
getDeptId
());
updateTEmployeeProject
.
setOldDeptNo
(
tEmployeeProjectOld
.
getDeptNo
());
tEmployeeProjectService
.
updateById
(
updateTEmployeeProject
);
tEmpChangeInfo
.
setProId
(
updateTEmployeeProject
.
getId
());
...
...
@@ -141,6 +145,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateSocialFoundVo
.
setFlag
(
CommonConstants
.
ONE_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updateSocialFoundVo
);
}
// 合同同步划转---只划转在用合同 fxj 2023-03-06
contractInfoMapper
.
updateContractChange
(
updateTEmployeeProject
.
getEmpIdcard
(),
updateTEmployeeProject
.
getDeptNo
(),
updateTEmployeeProject
.
getOldDeptNo
());
}
//保存档案划转记录
...
...
@@ -235,6 +241,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
// 记录变更日志
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
updateTEmployeePro
.
getId
(),
tEmployeeProjectOld
,
updateTEmployeePro
);
updateTEmployeePro
.
setOdlDeptId
(
tEmployeeProjectOld
.
getDeptId
());
updateTEmployeePro
.
setOldDeptNo
(
tEmployeeProjectOld
.
getDeptNo
());
updateList
.
add
(
updateTEmployeePro
);
}
}
else
{
...
...
@@ -272,6 +279,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateSocialFoundVo
.
setFlag
(
CommonConstants
.
ONE_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updateSocialFoundVo
);
}
// 合同同步划转---只划转在用合同 fxj 2023-03-06
contractInfoMapper
.
updateContractChange
(
tEmployeeProject
.
getEmpIdcard
(),
tEmployeeProject
.
getDeptNo
(),
tEmployeeProject
.
getOldDeptNo
());
}
}
return
R
.
ok
();
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
54a026c2
...
...
@@ -779,5 +779,15 @@
</if>
ORDER BY a.CREATE_TIME DESC
</select>
<!-- 根据员工ID更新合同在用状态 -->
<update
id=
"updateContractChange"
>
update t_employee_contract_info a,t_settle_domain b
set a.DEPT_NO=b.DEPART_NO,
a.SETTLE_DOMAIN=b.id,
a.UNIT_NO=b.CUSTOMER_NO,
a.CUSTOMER_ID=b.CUSTOMER_ID,
a.SUBJECT_DEPART=b.DEPART_NAME,
a.SUBJECT_UNIT=b.CUSTOMER_NAME
where a.EMP_IDCARD = #{idCard} and a.DEPT_NO = #{oldDeptNo} and a.IN_USE='0' and b.DEPART_NO= #{deptNo} and b.DELETE_FLAG='0';
</update>
</mapper>
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