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
95888fe3
Commit
95888fe3
authored
Dec 03, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17
parents
aaa23a06
e36cf812
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
7 deletions
+19
-7
EmployeeRegistrationLeaveSearchVo.java
...oud/plus/v1/csp/vo/EmployeeRegistrationLeaveSearchVo.java
+4
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+4
-7
EmployeeRegistrationLeaveMapper.xml
...main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
+11
-0
No files found.
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationLeaveSearchVo.java
View file @
95888fe3
...
@@ -66,6 +66,10 @@ public class EmployeeRegistrationLeaveSearchVo extends EmployeeRegistrationLeave
...
@@ -66,6 +66,10 @@ public class EmployeeRegistrationLeaveSearchVo extends EmployeeRegistrationLeave
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
[]
processStatusArray
;
private
String
[]
processStatusArray
;
@Schema
(
description
=
"是否批量发起派单,若为1,则过滤6大事项的状态,其他传空"
)
@TableField
(
exist
=
false
)
private
String
isDispatch
;
/**
/**
* @Author fxj
* @Author fxj
* 查询数据起
* 查询数据起
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
95888fe3
...
@@ -16,10 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -16,10 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.yifu.cloud.plus.v1.csp.config.WxConfig
;
import
com.yifu.cloud.plus.v1.csp.config.WxConfig
;
import
com.yifu.cloud.plus.v1.csp.constants.RegistConstants
;
import
com.yifu.cloud.plus.v1.csp.constants.RegistConstants
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistrationLeave
;
import
com.yifu.cloud.plus.v1.csp.entity.TCspAttaInfo
;
import
com.yifu.cloud.plus.v1.csp.entity.TCspAttaInfo
;
import
com.yifu.cloud.plus.v1.csp.entity.TOperationLog
;
import
com.yifu.cloud.plus.v1.csp.entity.TOperationLog
;
import
com.yifu.cloud.plus.v1.csp.mapper.EmployeeRegistrationLeaveMapper
;
import
com.yifu.cloud.plus.v1.csp.mapper.EmployeeRegistrationMapper
;
import
com.yifu.cloud.plus.v1.csp.mapper.EmployeeRegistrationMapper
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationLeaveService
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationLeaveService
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService
;
...
@@ -36,7 +34,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
...
@@ -36,7 +34,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
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.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.UserPermissionVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.UserPermissionVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties
;
...
@@ -44,9 +41,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.*;
...
@@ -44,9 +41,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.*;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.HolidayListVO
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo
;
...
@@ -1095,6 +1090,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1095,6 +1090,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
exitCheckVo
.
setDeptName
(
registration
.
getDeptName
());
exitCheckVo
.
setDeptName
(
registration
.
getDeptName
());
exitCheckVo
.
setDeptNo
(
registration
.
getDeptNo
());
exitCheckVo
.
setDeptNo
(
registration
.
getDeptNo
());
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//批量的商险是否已购买默认为否
if
(
Common
.
isEmpty
(
preVo
.
getInsuranceIsBuy
()))
{
preVo
.
setInsuranceIsBuy
(
CommonConstants
.
ONE_STRING
);
}
TEmployeeInsurancePreVo
insurancePreVo
=
preVo
.
getEmployeeInsurancePreVos
().
get
(
0
);
TEmployeeInsurancePreVo
insurancePreVo
=
preVo
.
getEmployeeInsurancePreVos
().
get
(
0
);
insurancePreVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
insurancePreVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
insurancePreVo
.
setDeptNo
(
registration
.
getDeptNo
());
insurancePreVo
.
setDeptNo
(
registration
.
getDeptNo
());
...
@@ -1248,8 +1247,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1248,8 +1247,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//生成商险待购买的数据
//生成商险待购买的数据
TEmployeeInsurancePreVo
insurancePreVo
=
preVo
.
getEmployeeInsurancePreVos
().
get
(
0
);
TEmployeeInsurancePreVo
insurancePreVo
=
preVo
.
getEmployeeInsurancePreVos
().
get
(
0
);
//批量的商险是否已购买默认为否
preVo
.
setInsuranceIsBuy
(
CommonConstants
.
ONE_STRING
);
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
}
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
View file @
95888fe3
...
@@ -470,6 +470,17 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
...
@@ -470,6 +470,17 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
#{statusStr}
#{statusStr}
</foreach>
</foreach>
</if>
</if>
<if
test=
'employeeRegistrationLeave.isDispatch != null and employeeRegistrationLeave.isDispatch.trim() != ""
and employeeRegistrationLeave.isDispatch.trim() == "1" '
>
and (
(a.do_status_social is not null and a.do_status_social in ('2','3','6','9','10')) or
(a.do_status_fund is not null and a.do_status_fund in ('2','3','9','10')) or
(a.do_status_insurance is not null and a.do_status_insurance in ('2','3','9')) or
(a.do_status_contract is not null and a.do_status_contract in ('2','3','10')) or
(a.do_status_project is not null and a.do_status_project in ('2','9')) or
(a.do_status_emp is not null and a.do_status_emp in ('2','9'))
)
</if>
</if>
</if>
</where>
</where>
ORDER BY b.create_time desc,b.id asc
ORDER BY b.create_time desc,b.id asc
...
...
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