Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
d79a3d66
You need to sign in or sign up before continuing.
Commit
d79a3d66
authored
Aug 02, 2022
by
查济
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-zhaji' into 'develop'
Feature zhaji See merge request fangxinjiang/yifu!90
parents
9e2bee27
9149ee45
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
14 deletions
+34
-14
ValidityUtil.java
...yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
+15
-0
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+2
-2
TInsuranceDetailService.java
...s/v1/yifu/insurances/service/TInsuranceDetailService.java
+1
-1
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+1
-1
TInsuranceTypeStandardServiceImpl.java
...ances/service/impl/TInsuranceTypeStandardServiceImpl.java
+15
-10
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
View file @
d79a3d66
...
...
@@ -171,6 +171,21 @@ public class ValidityUtil {
return
Boolean
.
TRUE
;
}
/**
* 判断医疗额度和身故残疾额度
* @param money 金额
* @return boolean
*/
public
static
boolean
validateStandard
(
final
String
money
)
{
if
(!
BigDecimalUtils
.
isBigDecimal
(
money
)){
return
Boolean
.
FALSE
;
}
if
(!
money
.
matches
(
ValidityConstants
.
POSITIVE_INTEGER_PATTERN_TWO_FLOAT
)){
return
Boolean
.
FALSE
;
}
return
Boolean
.
TRUE
;
}
/**
* 判断金额是否大于9999999.99
* @param money 金额
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
d79a3d66
...
...
@@ -306,13 +306,13 @@ public class TInsuranceDetailController {
}
/**
* 已减员列表
不分页查询
* 已减员列表
导出
*
* @author zhaji
* @param param 查询条件
* @return {@link R<List< InsuranceRefundListVo >>}
*/
@Operation
(
summary
=
"已减员列表
不分页查询"
,
description
=
"已减员列表不分页查询
"
)
@Operation
(
summary
=
"已减员列表
导出"
,
description
=
"已减员列表导出
"
)
@PostMapping
(
"/getInsuranceRefundList"
)
public
R
<
List
<
InsuranceRefundListVo
>>
getInsuranceRefundList
(
@RequestBody
InsuranceRefundParam
param
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceRefundList
(
param
));
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java
View file @
d79a3d66
...
...
@@ -186,7 +186,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
IPage
<
InsuranceRefundListVo
>
getInsuranceRefundPageList
(
Page
<
InsuranceRefundParam
>
page
,
InsuranceRefundParam
param
);
/**
* 已减员列表
不分页查询
* 已减员列表
导出
*
* @author zhaji
* @param param 查询参数
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
d79a3d66
...
...
@@ -2349,7 +2349,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
/**
* 已减员列表
不分页查询
* 已减员列表
导出
*
* @author zhaji
* @param param 查询参数
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeStandardServiceImpl.java
View file @
d79a3d66
...
...
@@ -19,6 +19,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeStandardService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -128,18 +129,22 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
if
(!
ValidityUtil
.
validateMoneyMax
(
buyStandard
)){
return
R
.
failed
(
InsurancesConstants
.
INSURANCE_TYPE_STANDARD_MAX_ERROR
);
}
if
(!
ValidityUtil
.
validateMoney
(
medicalQuota
)){
return
R
.
failed
(
"医疗额度格式不正确"
);
if
(
StringUtils
.
isNotBlank
(
medicalQuota
)){
if
(!
ValidityUtil
.
validateStandard
(
medicalQuota
)){
return
R
.
failed
(
"请输入大于等于0的数字最多两位小数"
);
}
if
(!
ValidityUtil
.
validateMoneyMax
(
medicalQuota
)){
return
R
.
failed
(
InsurancesConstants
.
MEDICAL_QUOTA_MAX_ERROR
);
}
if
(!
ValidityUtil
.
validateMoney
(
dieDisableQuota
)){
return
R
.
failed
(
"身故或残疾额度格式不正确"
);
}
if
(
StringUtils
.
isNotBlank
(
dieDisableQuota
)){
if
(!
ValidityUtil
.
validateStandard
(
dieDisableQuota
)){
return
R
.
failed
(
"请输入大于等于0的数字最多两位小数"
);
}
if
(!
ValidityUtil
.
validateMoneyMax
(
dieDisableQuota
)){
return
R
.
failed
(
InsurancesConstants
.
DIE_DISABLE_QUOTA_MAX_ERROR
);
}
}
LambdaQueryWrapper
<
TInsuranceTypeStandard
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
eq
(
TInsuranceTypeStandard:
:
getInsuranceTypeId
,
insuranceTypeStandard
.
getInsuranceTypeId
())
.
eq
(
TInsuranceTypeStandard:
:
getBuyStandard
,
insuranceTypeStandard
.
getBuyStandard
())
...
...
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