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
484a1ffa
Commit
484a1ffa
authored
Aug 03, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
9e845f8e
5b501c2c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
117 additions
and
78 deletions
+117
-78
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+2
-2
ValidityUtil.java
...yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
+9
-0
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+97
-72
TForecastLibrary.java
...fu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java
+2
-2
TForecastLibraryController.java
...v1/yifu/social/controller/TForecastLibraryController.java
+1
-2
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+6
-0
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
484a1ffa
...
...
@@ -362,9 +362,9 @@ public class InsurancesConstants {
*/
public
static
final
String
POLICY_NO_EXIST
=
"保单号不存在或已过期"
;
/**
* 保单号不存
* 保单号不存
在
*/
public
static
final
String
POLICY_NO_NOT_EXIST
=
"保单号不存"
;
public
static
final
String
POLICY_NO_NOT_EXIST
=
"保单号不存
在
"
;
/**
* 保单号信息错误
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
View file @
484a1ffa
...
...
@@ -168,6 +168,15 @@ public class ValidityUtil {
if
(!
money
.
matches
(
ValidityConstants
.
POSITIVE_INTEGER_PATTERN_TWO_FLOAT
)){
return
Boolean
.
FALSE
;
}
BigDecimal
bigDecimalMoney
=
new
BigDecimal
(
money
);
boolean
max
=
bigDecimalMoney
.
compareTo
(
CommonConstants
.
MONEY_MAX
)
>
0
;
if
(
max
){
return
Boolean
.
FALSE
;
}
boolean
min
=
bigDecimalMoney
.
compareTo
(
CommonConstants
.
MONEY_MIN
)
<=
0
;
if
(
min
){
return
Boolean
.
FALSE
;
}
return
Boolean
.
TRUE
;
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
484a1ffa
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java
View file @
484a1ffa
...
...
@@ -140,7 +140,7 @@ public class TForecastLibrary extends BaseEntity {
@ExcelProperty
(
"单位生育费用"
)
private
BigDecimal
unitBirthFee
;
/**
* 单位医疗救助金
* 单位医疗救助金
-单位大病金额
*/
@ExcelAttribute
(
name
=
"单位医疗救助金"
)
@ExcelProperty
(
"单位医疗救助金"
)
...
...
@@ -164,7 +164,7 @@ public class TForecastLibrary extends BaseEntity {
@ExcelProperty
(
"个人失业费用"
)
private
BigDecimal
personalUnemploymentFee
;
/**
* 个人医疗救助金
* 个人医疗救助金
-个人大病金额
*/
@ExcelAttribute
(
name
=
"个人医疗救助金"
)
@ExcelProperty
(
"个人医疗救助金"
)
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TForecastLibraryController.java
View file @
484a1ffa
...
...
@@ -68,9 +68,8 @@ public class TForecastLibraryController {
* @param id id
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询
:hasPermission('social_tforecastlibrary_get')
"
)
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/{id}"
)
@PreAuthorize
(
"@pms.hasPermission('social_tforecastlibrary_get')"
)
public
R
<
TForecastLibrary
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
tForecastLibraryService
.
getById
(
id
));
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
484a1ffa
...
...
@@ -217,6 +217,12 @@
</sql>
<sql
id=
"tDispatchInfo_where"
>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo.idList != null"
>
AND a.ID in
<foreach
item=
"idStr"
index=
"index"
collection=
"tDispatchInfo.idList"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
<if
test=
"tDispatchInfo.id != null and tDispatchInfo.id.trim() != ''"
>
AND a.ID = #{tDispatchInfo.id}
</if>
...
...
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