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
423e668b
Commit
423e668b
authored
Aug 19, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14
parents
ddb6ca9b
57044506
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
47 additions
and
12 deletions
+47
-12
TGzEmpInfo.java
...m/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
+4
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+1
-1
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+8
-1
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+4
-4
TGzEmpInfoMapper.xml
...chives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
+8
-6
TEmployeeInsurancePreController.java
...nsurances/controller/TEmployeeInsurancePreController.java
+12
-0
TEmployeeInsurancePreService.java
...ances/service/insurance/TEmployeeInsurancePreService.java
+2
-0
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+8
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
View file @
423e668b
...
...
@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
/**
...
...
@@ -577,4 +578,7 @@ public class TGzEmpInfo extends BaseEntity {
@Schema
(
description
=
"档案状态(0:已提交,1:暂存)"
)
private
String
empStatus
;
@Schema
(
description
=
"档案提交时间"
)
private
LocalDateTime
submitTime
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
423e668b
...
...
@@ -589,7 +589,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
employeeRegistrationPre
.
setInsurancePreList
(
newList
);
}
}
else
{
}
else
if
(
employeeRegistrationPre
.
getInsuranceIsBuy
().
equals
(
CommonConstants
.
ONE_STRING
))
{
if
(
employeeRegistrationPre
.
getInsurancePreList
()
==
null
||
employeeRegistrationPre
.
getInsurancePreList
().
isEmpty
())
{
return
R
.
failed
(
"含商险服务,商险配置不可为空"
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
423e668b
...
...
@@ -263,8 +263,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
detailList
.
add
(
detailInsuranceLog
);
}
//如果服务类型包含商险处理商险明细数据
newInfo
.
setId
(
empPreId
);
if
(
Common
.
isNotNull
(
newInfo
.
getServerItem
())
&&
newInfo
.
getServerItem
().
contains
(
"商险"
))
{
newInfo
.
setId
(
empPreId
);
if
(!
newInfo
.
getExitInsuranceInfoList
().
isEmpty
())
{
newInfo
.
getExitInsuranceInfoList
().
forEach
(
insurancePreVo
->
insurancePreVo
.
setRegisterId
(
empPreId
));
}
...
...
@@ -272,6 +272,13 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
,
"/temployeeinsurancepre/inner/updateInfoSaveInsurancePreInfo"
,
newInfo
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
//如果服务类型不包含商险删除商险明细数据
if
(
Common
.
isNotNull
(
newInfo
.
getServerItem
())
&&
!
newInfo
.
getServerItem
().
contains
(
"商险"
))
{
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/deleteInsurancePreInfo"
,
newInfo
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
if
(
newList
!=
null
&&
!
newList
.
isEmpty
())
{
for
(
TEmployeeInsurancePre
newInsurance
:
newList
)
{
differenceInsuranceKey
=
null
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
423e668b
...
...
@@ -543,10 +543,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
if
(
Common
.
isEmpty
(
gzEmpId
))
{
tGzEmpInfo
.
setCreateBy
(
user
.
getId
());
tGzEmpInfo
.
setCreateName
(
user
.
getNickname
());
tGzEmpInfo
.
set
Create
Time
(
null
);
// 1.7.14: 档案状态是提交,才存
创建时间(提交时间)
tGzEmpInfo
.
set
Submit
Time
(
null
);
// 1.7.14: 档案状态是提交,才存
提交时间
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tGzEmpInfoVo
.
getEmpStatus
())){
tGzEmpInfo
.
set
Create
Time
(
LocalDateTime
.
now
());
tGzEmpInfo
.
set
Submit
Time
(
LocalDateTime
.
now
());
}
this
.
save
(
tGzEmpInfo
);
gzEmpId
=
tGzEmpInfo
.
getId
();
...
...
@@ -555,7 +555,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
tGzEmpInfo
.
setUpdateTime
(
LocalDateTime
.
now
());
// 1.7.14: 档案状态是提交,更新 创建时间(提交时间)
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tGzEmpInfoVo
.
getEmpStatus
())){
tGzEmpInfo
.
set
Create
Time
(
LocalDateTime
.
now
());
tGzEmpInfo
.
set
Submit
Time
(
LocalDateTime
.
now
());
}
this
.
updateById
(
tGzEmpInfo
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
View file @
423e668b
...
...
@@ -103,6 +103,7 @@
<result
property=
"accountProvinceAreaId"
column=
"account_province_area_id"
/>
<result
property=
"accountCityAreaId"
column=
"account_city_area_id"
/>
<result
property=
"empStatus"
column=
"emp_status"
/>
<result
property=
"submitTime"
column=
"submit_time"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id,
...
...
@@ -183,7 +184,8 @@
a.hukou_county_area_id,
a.account_province_area_id,
a.account_city_area_id,
a.emp_status
a.emp_status,
a.submit_time
</sql>
<sql
id=
"tGzEmpInfo_where"
>
<if
test=
"tGzEmpInfo != null"
>
...
...
@@ -216,10 +218,10 @@
</if>
<!--查询提交档案时间-->
<if
test=
"tGzEmpInfo.createTimeStart != null "
>
AND a.
create
_time
>
= #{tGzEmpInfo.createTimeStart}
AND a.
submit
_time
>
= #{tGzEmpInfo.createTimeStart}
</if>
<if
test=
"tGzEmpInfo.createTimeEnd != null "
>
AND a.
create
_time
<
= #{tGzEmpInfo.createTimeEnd}
AND a.
submit
_time
<
= #{tGzEmpInfo.createTimeEnd}
</if>
<if
test=
"tGzEmpInfo.createBy != null and tGzEmpInfo.createBy.trim() != ''"
>
AND a.create_by = #{tGzEmpInfo.createBy}
...
...
@@ -416,7 +418,7 @@
a.del_flag = '0'
<include
refid=
"tGzEmpInfo_where"
/>
</where>
ORDER by a.emp_status,a.
create
_time desc,a.id desc
ORDER by a.emp_status,a.
submit
_time desc,a.id desc
</select>
<!--count-->
...
...
@@ -440,7 +442,7 @@
a.emp_push_status,
a.contract_push_status,
a.contract_atta_push_status,
date_format(a.
create
_time, '%Y-%m-%d %H:%i:%s') create_time,
date_format(a.
submit
_time, '%Y-%m-%d %H:%i:%s') create_time,
a.create_by,
a.create_name,
a.update_by,
...
...
@@ -523,7 +525,7 @@
<include
refid=
"tGzEmpInfo_where"
/>
</where>
group by a.id
ORDER by a.emp_status,a.
create
_time desc,a.id desc
ORDER by a.emp_status,a.
submit
_time desc,a.id desc
<if
test=
"tGzEmpInfo.limitStart != null"
>
limit #{tGzEmpInfo.limitStart},#{tGzEmpInfo.limitEnd}
</if>
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TEmployeeInsurancePreController.java
View file @
423e668b
...
...
@@ -200,6 +200,18 @@ public class TEmployeeInsurancePreController {
return
tEmployeeInsurancePreService
.
updateInfoSaveInsurancePreInfo
(
pre
);
}
/**
* 信息修改入口删除商险已购买明细
* @author huych
* @date 2025-08-14 11:46:16
**/
@Operation
(
description
=
"信息修改入口删除商险已购买明细"
)
@Inner
@PostMapping
(
"/inner/deleteInsurancePreInfo"
)
public
Boolean
deleteInsurancePreInfo
(
@RequestBody
EmployeeRegistrationPre
pre
)
{
return
tEmployeeInsurancePreService
.
deleteInsurancePreInfo
(
pre
);
}
/**
* 商险状态是否正常判断
* @author huych
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TEmployeeInsurancePreService.java
View file @
423e668b
...
...
@@ -76,6 +76,8 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
*/
Boolean
updateInfoSaveInsurancePreInfo
(
EmployeeRegistrationPre
pre
);
Boolean
deleteInsurancePreInfo
(
EmployeeRegistrationPre
pre
);
Boolean
checkExitInsuanceIsProcess
(
EmployeeRegistrationPreVo
preVo
);
TEmployeeInsuranceSelectVo
selectInsurancePreInfoList
(
TEmployeeInsurancePreVo
preVo
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
423e668b
...
...
@@ -644,6 +644,14 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
return
true
;
}
@Override
public
Boolean
deleteInsurancePreInfo
(
EmployeeRegistrationPre
registrationPre
)
{
//删除已存在的入职确认信息对应的商险明细
preDetailService
.
remove
(
Wrappers
.<
TInsurancePreDetail
>
lambdaQuery
()
.
eq
(
TInsurancePreDetail:
:
getRegisterId
,
registrationPre
.
getId
()));
return
true
;
}
@Override
public
Boolean
checkExitInsuanceIsProcess
(
EmployeeRegistrationPreVo
preVo
)
{
//如果状态有变动就会拦截
...
...
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