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
6fd5e6bb
Commit
6fd5e6bb
authored
Jan 15, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.5-薪资提交校验
parent
93c30ba3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
8 deletions
+7
-8
TSalaryStandardController.java
.../v1/yifu/salary/controller/TSalaryStandardController.java
+1
-1
TSalaryStandardService.java
...d/plus/v1/yifu/salary/service/TSalaryStandardService.java
+1
-1
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+5
-6
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java
View file @
6fd5e6bb
...
@@ -198,7 +198,7 @@ public class TSalaryStandardController {
...
@@ -198,7 +198,7 @@ public class TSalaryStandardController {
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
!=
null
)
{
if
(
user
!=
null
)
{
// 2025-1-14 10:59:37 提交前拦截:
// 2025-1-14 10:59:37 提交前拦截:
return
tSalaryStandardService
.
jud
eg
Risk
(
s
,
user
);
return
tSalaryStandardService
.
jud
ge
Risk
(
s
,
user
);
}
else
{
}
else
{
return
R
.
failed
(
"请登录!"
);
return
R
.
failed
(
"请登录!"
);
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryStandardService.java
View file @
6fd5e6bb
...
@@ -152,6 +152,6 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
...
@@ -152,6 +152,6 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
* @Date: 2025/1/14 11:01
* @Date: 2025/1/14 11:01
* @return: java.lang.String
* @return: java.lang.String
**/
**/
R
<
List
<
SalaryRiskVo
>>
jud
eg
Risk
(
TSalaryStandard
s
,
YifuUser
user
);
R
<
List
<
SalaryRiskVo
>>
jud
ge
Risk
(
TSalaryStandard
s
,
YifuUser
user
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
6fd5e6bb
...
@@ -1099,7 +1099,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -1099,7 +1099,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskVo>>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskVo>>
**/
**/
@Override
@Override
public
R
<
List
<
SalaryRiskVo
>>
jud
eg
Risk
(
TSalaryStandard
s
,
YifuUser
user
)
{
public
R
<
List
<
SalaryRiskVo
>>
jud
ge
Risk
(
TSalaryStandard
s
,
YifuUser
user
)
{
// 1 判断项目信息:是否含风险、含商险服务项
// 1 判断项目信息:是否含风险、含商险服务项
R
<
TSettleDomainSelectVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
R
<
TSettleDomainSelectVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
...
@@ -1119,7 +1119,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -1119,7 +1119,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
,
"/insuranceDetail/inner/getRiskByIdCard"
,
accountList
,
"/insuranceDetail/inner/getRiskByIdCard"
,
accountList
,
SalaryRiskListVo
.
class
,
SecurityConstants
.
FROM_IN
);
,
SalaryRiskListVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
riskListVoR
==
null
||
riskListVoR
.
getCode
()
==
CommonConstants
.
FAIL
)
{
if
(
riskListVoR
==
null
||
riskListVoR
.
getCode
()
==
CommonConstants
.
FAIL
)
{
return
R
.
failed
(
"校验商险返回
未空,
请联系管理员"
);
return
R
.
failed
(
"校验商险返回
为空,请稍后重试,多次失败
请联系管理员"
);
}
else
{
}
else
{
SalaryRiskListVo
vo
=
riskListVoR
.
getData
();
SalaryRiskListVo
vo
=
riskListVoR
.
getData
();
// 未购买商险列表
// 未购买商险列表
...
@@ -1184,15 +1184,14 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -1184,15 +1184,14 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"校验商险不通过!"
,
returnList
);
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"校验商险不通过!"
,
returnList
);
}
}
}
else
{
}
else
{
return
R
.
ok
();
return
R
.
ok
(
null
,
"均已购买商险"
);
}
}
}
}
}
else
{
}
else
{
return
R
.
ok
();
return
R
.
ok
(
null
,
"没有报账明细,无需拦截"
);
}
}
}
else
{
}
else
{
return
R
.
ok
();
return
R
.
ok
(
null
,
"项目不含风险 或 无商险"
);
}
}
}
else
{
}
else
{
return
R
.
failed
(
"获取项目信息失败,请联管理员!"
);
return
R
.
failed
(
"获取项目信息失败,请联管理员!"
);
...
...
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