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
75411982
Commit
75411982
authored
Apr 15, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9
parents
916fc711
74c28595
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
TEmployeeInsurancePreVo.java
...d/plus/v1/yifu/insurances/vo/TEmployeeInsurancePreVo.java
+1
-1
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+8
-8
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TEmployeeInsurancePreVo.java
View file @
75411982
...
...
@@ -59,7 +59,7 @@ public class TEmployeeInsurancePreVo implements Serializable {
/**
* 登记时间
*/
@ExcelAttribute
(
name
=
"登记时间"
)
@ExcelAttribute
(
name
=
"登记时间"
,
isDate
=
true
)
@Schema
(
description
=
"登记时间"
)
@ExcelProperty
(
"登记时间"
)
private
Date
registTime
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
75411982
...
...
@@ -2116,11 +2116,11 @@
<if
test=
"param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''"
>
and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
</if>
<if
test=
"param.buyStandardMin != null"
>
AND a.BUY_STANDARD
<![CDATA[ >= ]]>
#{param.buyStandardMin}
<if
test=
"param.buyStandardMin != null
and param.buyStandardMin.trim() != ''
"
>
AND a.BUY_STANDARD
+0
<![CDATA[ >= ]]>
#{param.buyStandardMin}+0
</if>
<if
test=
"param.buyStandardMax != null"
>
AND a.BUY_STANDARD
<![CDATA[ <= ]]>
#{param.buyStandardMax}
<if
test=
"param.buyStandardMax != null
and param.buyStandardMax.trim() != ''
"
>
AND a.BUY_STANDARD
+0
<![CDATA[ <= ]]>
#{param.buyStandardMax}+0
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
...
...
@@ -2154,11 +2154,11 @@
<if
test=
"param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''"
>
and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
</if>
<if
test=
"param.buyStandardMin != null"
>
AND a.BUY_STANDARD
<![CDATA[ >= ]]>
#{param.buyStandardMin}
<if
test=
"param.buyStandardMin != null
and param.buyStandardMin.trim() != ''
"
>
AND a.BUY_STANDARD
+0
<![CDATA[ >= ]]>
#{param.buyStandardMin}+0
</if>
<if
test=
"param.buyStandardMax != null"
>
AND a.BUY_STANDARD
<![CDATA[ <= ]]>
#{param.buyStandardMax}
<if
test=
"param.buyStandardMax != null
and param.buyStandardMax.trim() != ''
"
>
AND a.BUY_STANDARD
+0
<![CDATA[ <= ]]>
#{param.buyStandardMax}+0
</if>
<if
test=
"param.policyEnd != null and param.policyEnd.trim() != ''"
>
AND DATE(a.POLICY_END)
<![CDATA[ >= ]]>
#{param.policyEnd}
...
...
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