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
3cf73a2c
Commit
3cf73a2c
authored
Dec 13, 2022
by
李灿灿
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-licancan' into 'feature/insurance-1.3.0'
Feature licancan See merge request
!299
parents
608bddbf
e5fdcf23
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+4
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+2
-2
TInsurancePolicyMapper.xml
...in/resources/mapper/insurances/TInsurancePolicyMapper.xml
+4
-4
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
3cf73a2c
...
@@ -112,6 +112,10 @@ public class InsurancesConstants {
...
@@ -112,6 +112,10 @@ public class InsurancesConstants {
* 未找到符合条件的参保记录
* 未找到符合条件的参保记录
*/
*/
public
static
final
String
NOT_FOUND_INSURANCE_RECORD
=
"未找到符合条件的参保记录"
;
public
static
final
String
NOT_FOUND_INSURANCE_RECORD
=
"未找到符合条件的参保记录"
;
/**
* 未找到符合条件的新增或批增投保数据
*/
public
static
final
String
NOT_FOUND_INSERT_OR_BATCH_RECORD
=
"未找到符合条件的新增或批增投保数据"
;
/**
/**
* 当前投保状态无法变更投保记录
* 当前投保状态无法变更投保记录
*/
*/
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
3cf73a2c
...
@@ -3418,7 +3418,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3418,7 +3418,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
);
);
if
(!
Optional
.
ofNullable
(
detail
).
isPresent
()){
if
(!
Optional
.
ofNullable
(
detail
).
isPresent
()){
param
.
setErrorMessage
(
InsurancesConstants
.
DATA_IS_NOT_EXIST
);
param
.
setErrorMessage
(
InsurancesConstants
.
NOT_FOUND_INSERT_OR_BATCH_RECORD
);
continue
;
continue
;
}
else
{
}
else
{
LambdaQueryWrapper
<
TInsuranceEkp
>
ekpLambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
TInsuranceEkp
>
ekpLambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
...
@@ -3636,7 +3636,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3636,7 +3636,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
);
);
if
(!
Optional
.
ofNullable
(
detail
).
isPresent
()){
if
(!
Optional
.
ofNullable
(
detail
).
isPresent
()){
param
.
setErrorMessage
(
InsurancesConstants
.
NOT_FOUND_INS
URANCE
_RECORD
);
param
.
setErrorMessage
(
InsurancesConstants
.
NOT_FOUND_INS
ERT_OR_BATCH
_RECORD
);
continue
;
continue
;
}
else
{
}
else
{
if
(
detail
.
getBuyHandleStatus
()
!=
CommonConstants
.
THREE_INT
&&
detail
.
getBuyHandleStatus
()
!=
CommonConstants
.
FIVE_INT
){
if
(
detail
.
getBuyHandleStatus
()
!=
CommonConstants
.
THREE_INT
&&
detail
.
getBuyHandleStatus
()
!=
CommonConstants
.
FIVE_INT
){
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsurancePolicyMapper.xml
View file @
3cf73a2c
...
@@ -36,10 +36,10 @@
...
@@ -36,10 +36,10 @@
and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
</if>
</if>
<if
test=
"param.policyStart != null and param.policyStart.trim() != ''"
>
<if
test=
"param.policyStart != null and param.policyStart.trim() != ''"
>
AND
POLICY_START
<![CDATA[ >= ]]>
concat(#{param.policyStart},'')
AND
DATE(POLICY_START)
<![CDATA[ >= ]]>
#{param.policyStart}
</if>
</if>
<if
test=
"param.policyEnd != null and param.policyEnd.trim() != ''"
>
<if
test=
"param.policyEnd != null and param.policyEnd.trim() != ''"
>
AND
POLICY_END
<![CDATA[ <= ]]>
concat(#{param.policyEnd},'')
AND
DATE(POLICY_END)
<![CDATA[ <= ]]>
#{param.policyEnd}
</if>
</if>
<if
test=
"param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"
>
<if
test=
"param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"
>
and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
...
@@ -62,10 +62,10 @@
...
@@ -62,10 +62,10 @@
and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
</if>
</if>
<if
test=
"param.policyStart != null and param.policyStart.trim() != ''"
>
<if
test=
"param.policyStart != null and param.policyStart.trim() != ''"
>
AND
POLICY_START
<![CDATA[ >= ]]>
concat(#{param.policyStart},'')
AND
DATE(POLICY_START)
<![CDATA[ >= ]]>
#{param.policyStart}
</if>
</if>
<if
test=
"param.policyEnd != null and param.policyEnd.trim() != ''"
>
<if
test=
"param.policyEnd != null and param.policyEnd.trim() != ''"
>
AND
POLICY_END
<![CDATA[ <= ]]>
concat(#{param.policyEnd},'')
AND
DATE(POLICY_END)
<![CDATA[ <= ]]>
#{param.policyEnd}
</if>
</if>
<if
test=
"param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"
>
<if
test=
"param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"
>
and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
...
...
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