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
c25b01fd
Commit
c25b01fd
authored
Apr 09, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'MVP1.7.9-fxj' into MVP1.7.9
parents
09c8efcc
c6bcb2d5
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
193 additions
and
22 deletions
+193
-22
TSettleDomain.java
...ifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java
+13
-0
TSettleDomainEkpVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TSettleDomainEkpVo.java
+6
-0
TSettleDomainUpServerTeamVo.java
...plus/v1/yifu/archives/vo/TSettleDomainUpServerTeamVo.java
+6
-0
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+1
-1
TSettleDomainService.java
...d/plus/v1/yifu/archives/service/TSettleDomainService.java
+2
-0
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+44
-1
application.yml
...ives/yifu-archives-biz/src/main/resources/application.yml
+1
-1
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+9
-2
ErrorCodes.java
.../cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
+2
-0
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+2
-0
InsuranceExportListOneVO.java
.../plus/v1/yifu/insurances/vo/InsuranceExportListOneVO.java
+6
-0
InsuranceRefundListVo.java
...oud/plus/v1/yifu/insurances/vo/InsuranceRefundListVo.java
+11
-0
InsuranceReplaceParam.java
...oud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java
+7
-0
InsuredListVo.java
.../yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.java
+17
-7
RefundExportListVo.java
.../cloud/plus/v1/yifu/insurances/vo/RefundExportListVo.java
+4
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+4
-2
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+7
-7
SysUserPermissionMapper.xml
...biz/src/main/resources/mapper/SysUserPermissionMapper.xml
+10
-0
TSalaryStandardController.java
.../v1/yifu/salary/controller/TSalaryStandardController.java
+8
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+33
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java
View file @
c25b01fd
...
...
@@ -567,4 +567,17 @@ public class TSettleDomain extends BaseEntity {
@Schema
(
description
=
"登录账号"
)
private
String
csLoginName
;
/**
* 项目负责人
*/
@Schema
(
description
=
"项目负责人"
,
name
=
"projectManager"
)
private
String
projectManager
;
/**
* 项目负责人
*/
@TableField
(
exist
=
false
)
@Schema
(
description
=
"项目负责人姓名"
)
private
String
projectManagerName
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainEkpVo.java
View file @
c25b01fd
...
...
@@ -463,4 +463,10 @@ public class TSettleDomainEkpVo implements Serializable {
*/
@Schema
(
description
=
"事业部"
,
name
=
"division"
)
private
String
division
;
/**
* 项目负责人
*/
@Schema
(
description
=
"项目负责人"
,
name
=
"projectManager"
)
private
String
projectManager
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainUpServerTeamVo.java
View file @
c25b01fd
...
...
@@ -25,4 +25,10 @@ public class TSettleDomainUpServerTeamVo implements Serializable {
*/
@Schema
(
description
=
"EKP的服务团队"
,
name
=
"serviceTeam"
)
private
String
serviceTeam
;
/**
* 项目负责人
*/
@Schema
(
description
=
"项目负责人"
,
name
=
"projectManager"
)
private
String
projectManager
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
c25b01fd
...
...
@@ -132,7 +132,7 @@ public class TSettleDomainController {
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/{id}"
)
public
R
<
TSettleDomain
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
tSettleDomainService
.
getById
(
id
)
);
return
tSettleDomainService
.
getByIdAsso
(
id
);
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java
View file @
c25b01fd
...
...
@@ -140,4 +140,6 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
R
<
Boolean
>
changeIssueStatus
(
ChangeIssueStatusVo
changeIssueStatusVo
);
R
<
Boolean
>
updateProjectCsInfo
(
List
<
TDomainUpCsVo
>
list
);
R
<
TSettleDomain
>
getByIdAsso
(
String
id
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
c25b01fd
...
...
@@ -522,9 +522,23 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
return
R
.
ok
(
Boolean
.
TRUE
,
CommonConstants
.
RESULT_DATA_SUCESS
);
}
/**
* @Author fxj
* @Description 同步 项目人员权限(服务团队、项目负责人)
* @Date 18:07 2025/3/31
**/
private
void
initServerTeamPermission
(
TSettleDomain
domain
)
{
R
<
SysUserListVo
>
res
;
if
(
Common
.
isNotNull
(
domain
.
getServiceTeam
())){
R
<
SysUserListVo
>
res
=
upmsDaprUtils
.
getUserIdsByUserNames
(
domain
.
getServiceTeam
());
res
=
upmsDaprUtils
.
getUserIdsByUserNames
(
domain
.
getServiceTeam
());
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
())
&&
Common
.
isNotNull
(
res
.
getData
().
getUserList
())){
// 先清理缓存
this
.
removeSettleCache
(
null
,
res
.
getData
().
getUserIds
());
saveForEkp
(
res
.
getData
().
getUserList
(),
domain
);
}
}
if
(
Common
.
isNotNull
(
domain
.
getProjectManager
())){
res
=
upmsDaprUtils
.
getUserIdsByUserNames
(
domain
.
getProjectManager
());
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
())
&&
Common
.
isNotNull
(
res
.
getData
().
getUserList
())){
// 先清理缓存
this
.
removeSettleCache
(
null
,
res
.
getData
().
getUserIds
());
...
...
@@ -571,6 +585,35 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
return
R
.
ok
(
Boolean
.
TRUE
,
CommonConstants
.
RESULT_DATA_SUCESS
);
}
/**
* @Author fxj
* @Description 获取项目基本信息,含项目负责人
* @Date 18:05 2025/3/31
**/
@Override
public
R
<
TSettleDomain
>
getByIdAsso
(
String
id
)
{
TSettleDomain
domain
=
baseMapper
.
selectById
(
id
);
if
(
Common
.
isNotNull
(
domain
)
&&
Common
.
isNotNull
(
domain
.
getProjectManager
())){
if
(
Common
.
isNotNull
(
domain
.
getProjectManager
())){
R
<
SysUserListVo
>
res
=
upmsDaprUtils
.
getUserIdsByUserNames
(
domain
.
getProjectManager
());
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
())
&&
Common
.
isNotNull
(
res
.
getData
().
getUserList
())){
StringBuilder
manager
=
new
StringBuilder
();
res
.
getData
().
getUserList
().
forEach
(
user
->{
if
(
Common
.
isNotNull
(
user
.
getUserId
())){
if
(
Common
.
isEmpty
(
manager
.
toString
())){
manager
.
append
(
user
.
getNickname
());
}
else
if
(
Common
.
isNotNull
(
user
.
getNickname
())){
manager
.
append
(
","
).
append
(
user
.
getNickname
());
}
}
});
domain
.
setProjectManager
(
manager
.
toString
());
}
}
}
return
R
.
ok
(
domain
);
}
@Override
public
List
<
String
>
getAllDeptByCustomerLoginName
(
String
userLoginName
)
{
return
baseMapper
.
getAllDeptByCustomerLoginName
(
userLoginName
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/application.yml
View file @
c25b01fd
...
...
@@ -26,7 +26,7 @@ mybatis-plus:
logic-not-delete-value
:
0
configuration
:
map-underscore-to-camel-case
:
true
#
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
log-impl
:
org.apache.ibatis.logging.stdout.StdOutImpl
# spring security 配置
security
:
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
c25b01fd
...
...
@@ -105,6 +105,9 @@
<result
property=
"csName"
column=
"cs_name"
/>
<result
property=
"csPhone"
column=
"cs_phone"
/>
<result
property=
"csLoginName"
column=
"cs_login_name"
/>
<!-- 2025-03-31 FXJ V1.7.9 -->
<result
property=
"projectManager"
column=
"PROJECT_MANAGER"
/>
</resultMap>
<resultMap
id=
"tSettleDomainTwoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.SecondBelongVo"
>
...
...
@@ -194,7 +197,8 @@
a.DIVISION,
a.cs_name,
a.cs_phone,
a.cs_login_name
a.cs_login_name,
a.PROJECT_MANAGER
</sql>
<resultMap
id=
"tSettleDomainSelectVoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"
>
...
...
@@ -234,6 +238,9 @@
<result
property=
"csName"
column=
"cs_name"
/>
<result
property=
"csPhone"
column=
"cs_phone"
/>
<result
property=
"csLoginName"
column=
"cs_login_name"
/>
<!-- 2025-03-31 FXJ V1.7.9 -->
<result
property=
"projectManager"
column=
"PROJECT_MANAGER"
/>
</resultMap>
<select
id=
"getPage"
resultMap=
"tSettleDomainMap"
>
...
...
@@ -434,7 +441,7 @@
a.DIVISION,
a.cs_name,
a.cs_phone,
a.cs_login_name
a.cs_login_name
,a.PROJECT_MANAGER
FROM
t_settle_domain a
<if
test=
"userId != null and userId.trim() != '-999'"
>
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
View file @
c25b01fd
...
...
@@ -622,6 +622,8 @@ public interface ErrorCodes {
* 学历不可为空
*/
String
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
=
"dispatch.emp.education.not.empty"
;
// 学历为大专及以上,学校必填
String
EMP_DISPATCH_EMP_SCHOOL_NOT_EMPTY
=
"dispatch.emp.school.not.empty"
;
/**
* 户口性质不可为空
*/
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
c25b01fd
...
...
@@ -240,6 +240,8 @@ emp.work.job.not.empty=\u5DE5\u4F5C\u5C97\u4F4D\u4E0D\u53EF\u4E3A\u7A7A
dispatch.emp.education.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u
5B66
\u5386\u
4E3A
\u
7A7A
\u6216\u
65E0
\u6863\u6848\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u
5B66
\u5386\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u
5B66
\u5386
dispatch.emp.school.not.empty
=
\u
5B66
\u5386\u
4E3A
\u5927\u
4E13
\u
53CA
\u
4EE5
\u
4E0A
\u
FF0C
\u
5B66
\u6821\u
5FC5
\u
586B
dispatch.emp.registype.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u6237\u
53E3
\u6027\u
8D28
\u
4E3A
\u
7A7A
\u6216\u
65E0
\u6863\u6848\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u6237\u
53E3
\u6027\u
8D28
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u6237\u
53E3
\u6027\u
8D28
dispatch.emp.tryperiod.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u
8BD5
\u7528\u
671F
\u
4E3A
\u
7A7A
\u6216\u
65E0
\u6863\u6848\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u
8BD5
\u7528\u
671F
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u
8BD5
\u7528\u
671F
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceExportListOneVO.java
View file @
c25b01fd
...
...
@@ -29,6 +29,12 @@ public class InsuranceExportListOneVO implements Serializable {
@Schema
(
description
=
"项目名称"
)
private
String
projectName
;
/**
* 客户名称
*/
@Schema
(
description
=
"客户名称"
)
private
String
unitName
;
/**
* 项目编码
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundListVo.java
View file @
c25b01fd
...
...
@@ -221,4 +221,15 @@ public class InsuranceRefundListVo implements Serializable {
*/
@Schema
(
description
=
"是否地市自购"
)
private
String
isAdress
;
/**
* 备注
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"备注"
)
@Schema
(
description
=
"备注"
)
private
String
remark
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java
View file @
c25b01fd
...
...
@@ -139,4 +139,11 @@ public class InsuranceReplaceParam implements Serializable {
@Schema
(
description
=
"是否地市自购"
)
private
String
isAdress
;
/**
* 备注
*/
@Schema
(
description
=
"备注"
)
private
String
remark
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.java
View file @
c25b01fd
...
...
@@ -82,6 +82,15 @@ public class InsuredListVo implements Serializable {
@ExcelProperty
(
value
=
"项目"
)
private
String
projectName
;
/**
* 项目编码
*/
@Schema
(
description
=
"项目编码"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目编码"
)
private
String
deptNo
;
/**
* 投保岗位
*/
...
...
@@ -200,13 +209,6 @@ public class InsuredListVo implements Serializable {
@ExcelIgnore
private
Integer
reduceHandleStatus
;
/**
* 项目编码
*/
@Schema
(
description
=
"项目编码"
)
@ExcelIgnore
private
String
deptNo
;
/**
* 商险购买地省code
*/
...
...
@@ -410,4 +412,12 @@ public class InsuredListVo implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"是否地市自购"
)
private
String
isAdress
;
/**
* 备注
*/
@Schema
(
description
=
"备注"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"备注"
)
private
String
remark
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/RefundExportListVo.java
View file @
c25b01fd
...
...
@@ -228,4 +228,8 @@ public class RefundExportListVo implements Serializable {
*/
@Schema
(
description
=
"是否地市自购"
)
private
String
isAdress
;
@Schema
(
description
=
"客户名称"
)
private
String
unitName
;
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
c25b01fd
...
...
@@ -531,8 +531,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
newDetail
.
setCreateName
(
user
.
getNickname
());
//替换不参与结算
newDetail
.
setDefaultSettleId
(
null
);
//替换不继承备注
newDetail
.
setRemark
(
null
);
//替换不继承备注
20250331 fxj 替换模板新增备注字段不用清空
//
newDetail.setRemark(null);
//替换不继承保单生效日期
newDetail
.
setPolicyEffect
(
null
);
//保费都默认是0
...
...
@@ -3718,6 +3718,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//所有校验通过后设置查到的结果
//直接用excel里面的备注覆盖既有备注
detail
.
setRemark
(
param
.
getRemark
());
param
.
setDetail
(
detail
);
listSuccess
.
add
(
param
);
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
c25b01fd
...
...
@@ -506,7 +506,7 @@
a.CREATE_NAME as createName,
a.POLICY_NO as policyNo,
a.REMARK as remark,
a.IS_ADRESS as isAdress
a.IS_ADRESS as isAdress
,a.UNIT_NAME as unitName
from t_insurance_detail a
where a.DELETE_FLAG = 0 and a.id in
<foreach
collection=
"idList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
...
...
@@ -539,7 +539,7 @@
a.CREATE_NAME as createName,
a.POLICY_NO as policyNo,
a.REMARK as remark,
a.IS_ADRESS as isAdress
a.IS_ADRESS as isAdress
,a.UNIT_NAME as unitName
from t_insurance_detail a
where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
<if
test=
"param.empName != null and param.empName.trim() != ''"
>
...
...
@@ -729,7 +729,7 @@
a.CREATE_NAME as createName,
a.UNIT_NAME as unitName,
a.UNIT_NO as unitNo,
if(a.IS_ADRESS = '0','是',if(ifnull(a.IS_ADRESS,3) = 3,'','否')) as isAdress
if(a.IS_ADRESS = '0','是',if(ifnull(a.IS_ADRESS,3) = 3,'','否')) as isAdress
,a.remark
from
t_insurance_detail a
where
...
...
@@ -1005,7 +1005,7 @@
a.CREATE_NAME as createName,
refund.CREATE_TIME as refundCreateTime,
a.IS_EFFECT as isEffect,
a.IS_ADRESS as isAdress
a.IS_ADRESS as isAdress
,refund.remark as remark
from
t_insurance_detail a,
t_insurance_refund refund
...
...
@@ -1212,7 +1212,7 @@
refund.CREATE_NAME as createName,
a.REDUCE_HANDLE_STATUS as reduceHandleStatus,
refund.REMARK as remark,
a.IS_ADRESS as isAdress
a.IS_ADRESS as isAdress
,a.UNIT_NAME as unitName
from
t_insurance_detail a,
t_insurance_refund refund
...
...
@@ -1250,7 +1250,7 @@
refund.CREATE_NAME as createName,
a.POLICY_NO as policyNo,
refund.REMARK as remark,
a.IS_ADRESS as isAdress
a.IS_ADRESS as isAdress
,a.UNIT_NAME as unitName
from
t_insurance_detail a,
t_insurance_refund refund
...
...
@@ -1478,7 +1478,7 @@
FROM t_insurance_detail d
where DELETE_FLAG = 0
and (d.BUY_HANDLE_STATUS in (1,2) or (d.BUY_HANDLE_STATUS = 3 and d.IS_EFFECT = 0
and d.POLICY_EFFECT
<![CDATA[ <= ]]>
NOW(
) and d.POLICY_END >= NOW()
and d.POLICY_EFFECT
<![CDATA[ <= ]]>
DATE_ADD(NOW(),INTERVAL 1 DAY
) and d.POLICY_END >= NOW()
))
<if
test=
"idCardList != null and idCardList.size > 0"
>
...
...
yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysUserPermissionMapper.xml
View file @
c25b01fd
...
...
@@ -407,6 +407,16 @@
LEFT JOIN sys_org_element e on e.fd_id = d.fd_3ae55447e30d62
JOIN sys_org_person p on e.fd_id=p.fd_id
where d.fd_id = #{fdId}
union ALL
select
e.fd_name EMP_NAME,p.fd_login_name EMP_LOGIN_NAME,SUBSTRING_INDEX(SUBSTRING_INDEX(e.fd_ldap_dn,',ou', 2),',ou=', -1) EMP_DEPT
,'5' PERMISSION_TYPE,d.fd_3a829ae9bab760 NAME,d.fd_3a829aea0b84a4 CODE,0 SOURCE_TYPE
,'1' IS_CONTAINS,'0' PERMISSION_STATUS,'1' DELETE_FLAG,e.fd_id USER_ID,d.fd_id DOMAIN_ID
from ekp_fb3b8d0c8f148639b8e2 d
LEFT JOIN sys_org_element e on e.fd_id = d.fd_dept_manager
JOIN sys_org_person p on e.fd_id=p.fd_id
where d.fd_id = #{fdId}
) a GROUP BY a.USER_ID
</select>
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java
View file @
c25b01fd
...
...
@@ -197,6 +197,12 @@ public class TSalaryStandardController {
if
(
Common
.
isNotNull
(
s
.
getIsCheckRisk
())
&&
CommonConstants
.
ONE_INT
==
s
.
getIsCheckRisk
())
{
return
R
.
ok
();
}
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
s
.
getFormType
()))
{
s
.
setIsCheckRisk
(
CommonConstants
.
ONE_INT
);
s
.
setCheckRiskRemark
(
"非工资类型,放开限制"
);
this
.
updateById
(
s
);
return
R
.
ok
();
}
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
!=
null
)
{
// 2025-1-14 10:59:37 提交前拦截:
...
...
@@ -225,7 +231,8 @@ public class TSalaryStandardController {
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
5
]
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
6
]
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
7
])
{
if
(
Common
.
isEmpty
(
s
.
getIsCheckRisk
())
||
CommonConstants
.
ZERO_INT
==
s
.
getIsCheckRisk
())
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
s
.
getFormType
())
&&
(
Common
.
isEmpty
(
s
.
getIsCheckRisk
())
||
CommonConstants
.
ZERO_INT
==
s
.
getIsCheckRisk
()))
{
return
R
.
failed
(
"请先校验商险信息!"
);
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
c25b01fd
...
...
@@ -81,6 +81,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.cache.Cache
;
import
org.springframework.cache.CacheManager
;
import
org.springframework.cache.support.SimpleValueWrapper
;
import
org.springframework.security.core.parameters.P
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -2341,6 +2342,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SETTLEDOMAIN_STOP
)));
return
true
;
}
String
educationName
;
if
(
Common
.
isEmpty
(
empVo
)){
if
(
Common
.
isEmpty
(
excel
.
getFileProvince
())
||
Common
.
isEmpty
(
excel
.
getFileCity
())
...
...
@@ -2363,7 +2365,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isEmpty
(
excel
.
getEducationName
())
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
)));
return
true
;
}
else
if
(
Common
.
isEmpty
(
excel
.
getSchoolName
()))
{
educationName
=
excel
.
getEducationName
();
if
((
educationName
.
contains
(
"大专"
)
||
educationName
.
contains
(
"本科"
)
||
educationName
.
contains
(
"硕士"
)
||
educationName
.
contains
(
"博士"
)))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_SCHOOL_NOT_EMPTY
)));
return
true
;
}
}
if
(
Common
.
isNotNull
(
excel
.
getContractName
())
&&
validContractInfo
(
errorMessageList
,
excel
)){
return
true
;
}
...
...
@@ -2406,6 +2418,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isEmpty
(
empVo
.
getHignEducation
())
&&
Common
.
isEmpty
(
excel
.
getEducationName
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
)));
return
true
;
}
else
if
(
Common
.
isEmpty
(
excel
.
getSchoolName
())
&&
Common
.
isEmpty
(
empVo
.
getSchool
()))
{
educationName
=
excel
.
getEducationName
();
if
(
Common
.
isEmpty
(
educationName
))
{
educationName
=
empVo
.
getHignEducation
();
// 这里不判断null,因为上面判断过了empVo与excel的学历不都为空
if
((
educationName
.
equals
(
"5"
)
||
educationName
.
equals
(
"6"
)
||
educationName
.
equals
(
"7"
)
||
educationName
.
equals
(
"8"
)))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_SCHOOL_NOT_EMPTY
)));
return
true
;
}
}
else
{
if
((
educationName
.
contains
(
"大专"
)
||
educationName
.
contains
(
"本科"
)
||
educationName
.
contains
(
"硕士"
)
||
educationName
.
contains
(
"博士"
)))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_SCHOOL_NOT_EMPTY
)));
return
true
;
}
}
}
if
(
Common
.
isEmpty
(
empVo
.
getEmpRegisType
())
&&
Common
.
isEmpty
(
excel
.
getEmpRegisType
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_REGISTYPE_NOT_EMPTY
)));
...
...
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