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
e3d3fcdb
Commit
e3d3fcdb
authored
Dec 09, 2022
by
zhangyun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:减员办理相关列表增加购买标准区间筛选条件
parent
4db1c6e4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
18 deletions
+28
-18
InsuranceRefundHandlingParam.java
...s/v1/yifu/insurances/vo/InsuranceRefundHandlingParam.java
+6
-7
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+1
-1
TInsuranceRefundController.java
...ifu/insurances/controller/TInsuranceRefundController.java
+0
-1
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+1
-1
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+20
-8
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundHandlingParam.java
View file @
e3d3fcdb
...
...
@@ -109,16 +109,15 @@ public class InsuranceRefundHandlingParam extends BaseEntity implements Serializ
private
String
endDate
;
/**
* 购买标准
开始
* 购买标准
区间最小值
*/
@Schema
(
description
=
"购买标准
开始
"
)
private
String
buyStandard
Start
;
@Schema
(
description
=
"购买标准
区间最小值
"
)
private
String
buyStandard
Min
;
/**
* 购买标准
结束
* 购买标准
区间最大值
*/
@Schema
(
description
=
"购买标准结束"
)
private
String
buyStandardEnd
;
@Schema
(
description
=
"购买标准区间最大值"
)
private
String
buyStandardMax
;
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
e3d3fcdb
...
...
@@ -459,7 +459,7 @@ public class TInsuranceDetailController {
*
* @author zhaji
* @param param 查询条件
* @return {@link R<List<
RefundExportListVo
>>}
* @return {@link R<List<
RefundExportListVo
>>}
*/
@Operation
(
summary
=
"导出减员列表"
,
description
=
"导出减员列表"
)
@PostMapping
(
"/getInsuranceRefundHandlingList"
)
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceRefundController.java
View file @
e3d3fcdb
...
...
@@ -7,7 +7,6 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.jmx.export.annotation.ManagedOperationParameter
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
e3d3fcdb
...
...
@@ -4138,7 +4138,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
*
* @author zhaji
* @param param 查询参数
* @return {@link List<
RefundExportListVo
>}
* @return {@link List<
RefundExportListVo
>}
*/
@Override
@Transactional
(
value
=
"insurancesTransactionManager"
,
rollbackFor
=
{
Exception
.
class
})
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
e3d3fcdb
...
...
@@ -893,11 +893,11 @@
<if
test=
"param.endDate != null and param.endDate.trim() != ''"
>
AND refund.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
</if>
<if
test=
"param.buyStandard
Start != null and param.buyStandardStart
.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ >= ]]>
#{param.buyStandard
Start
}
<if
test=
"param.buyStandard
Min != null and param.buyStandardMin
.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ >= ]]>
#{param.buyStandard
Min
}
</if>
<if
test=
"param.buyStandard
End != null and param.buyStandardEnd
.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ <= ]]>
#{param.buyStandard
End
}
<if
test=
"param.buyStandard
Max != null and param.buyStandardMax
.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ <= ]]>
#{param.buyStandard
Max
}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
...
...
@@ -1026,11 +1026,11 @@
<if
test=
"param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"
>
and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
</if>
<if
test=
"param.buyStandard
Start != null and param.buyStandardStart
.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ >= ]]>
#{param.buyStandard
Start
}
<if
test=
"param.buyStandard
Min != null and param.buyStandardMin
.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ >= ]]>
#{param.buyStandard
Min
}
</if>
<if
test=
"param.buyStandard
End != null and param.buyStandardEnd
.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ <= ]]>
#{param.buyStandard
End
}
<if
test=
"param.buyStandard
Max != null and param.buyStandardMax
.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ <= ]]>
#{param.buyStandard
Max
}
</if>
<if
test=
"param.updateBy != null and param.updateBy.trim() != ''"
>
and refund.UPDATE_BY = #{param.updateBy}
...
...
@@ -1306,6 +1306,12 @@
<if
test=
"param.endDate != null and param.endDate.trim() != ''"
>
AND refund.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
</if>
<if
test=
"param.buyStandardMin != null and param.buyStandardMin.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ >= ]]>
#{param.buyStandardMin}
</if>
<if
test=
"param.buyStandardMax != null and param.buyStandardMax.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ <= ]]>
#{param.buyStandardMax}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
</if>
...
...
@@ -1381,6 +1387,12 @@
<if
test=
"param.endDate != null and param.endDate.trim() != ''"
>
AND refund.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
</if>
<if
test=
"param.buyStandardMin != null and param.buyStandardMin.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ >= ]]>
#{param.buyStandardMin}
</if>
<if
test=
"param.buyStandardMax != null and param.buyStandardMax.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ <= ]]>
#{param.buyStandardMax}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
</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