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
ddefcc07
Commit
ddefcc07
authored
Jan 16, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.5-薪资提交校验
parent
2f98d330
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
5 deletions
+16
-5
TSalaryStandard.java
...ifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
+8
-0
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+5
-4
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+3
-1
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
View file @
ddefcc07
...
...
@@ -506,6 +506,14 @@ public class TSalaryStandard extends BaseEntity {
@ExcelProperty
(
"是否校验商险"
)
private
Integer
isCheckRisk
;
/**
* 校验商险通过的原因
*/
@ExcelAttribute
(
name
=
"校验商险通过的原因"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"校验商险通过的原因"
)
private
String
checkRiskRemark
;
/**
* 工资月份-起
*/
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
ddefcc07
...
...
@@ -1180,19 +1180,19 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
if
(!
updatePerSonSalaryList
.
isEmpty
())
{
tInsuranceUnpurchasePersonSalaryService
.
saveBatch
(
updatePerSonSalaryList
);
}
return
getTrueR
(
s
,
"校验通过"
);
return
getTrueR
(
s
,
"校验
【商险不购买】
通过"
);
}
else
{
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"校验
商险
不通过!"
,
returnList
);
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"校验
【商险不购买】
不通过!"
,
returnList
);
}
}
else
{
return
getTrueR
(
s
,
"均已购买
商险
"
);
return
getTrueR
(
s
,
"均已购买
【商险】
"
);
}
}
}
else
{
return
getTrueR
(
s
,
"没有报账明细,无需拦截"
);
}
}
else
{
return
getTrueR
(
s
,
"项目不含风险
或
无商险"
);
return
getTrueR
(
s
,
"项目不含风险
或
无商险"
);
}
}
else
{
return
R
.
failed
(
"获取项目信息失败,请联管理员!"
);
...
...
@@ -1207,6 +1207,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
**/
private
R
<
List
<
SalaryRiskVo
>>
getTrueR
(
TSalaryStandard
s
,
String
msg
)
{
s
.
setIsCheckRisk
(
CommonConstants
.
ONE_INT
);
s
.
setCheckRiskRemark
(
msg
);
this
.
updateById
(
s
);
return
R
.
ok
(
null
,
msg
);
}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
ddefcc07
...
...
@@ -90,6 +90,7 @@
<result
property=
"newEmpUpdateFlag"
column=
"NEW_EMP_UPDATE_FLAG"
/>
<result
property=
"isFixedColumn"
column=
"IS_FIXED_COLUMN"
/>
<result
property=
"isCheckRisk"
column=
"IS_CHECK_RISK"
/>
<result
property=
"checkRiskRemark"
column=
"CHECK_RISK_REMARK"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -157,7 +158,8 @@
a.ORIGINAL_SET_NAME,
a.NEW_EMP_UPDATE_FLAG,
a.IS_FIXED_COLUMN,
a.IS_CHECK_RISK
a.IS_CHECK_RISK,
a.CHECK_RISK_REMARK
</sql>
<sql
id=
"tSalaryStandard_where"
>
<if
test=
"tSalaryStandard != null"
>
...
...
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