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
26a26ddb
You need to sign in or sign up before continuing.
Commit
26a26ddb
authored
Oct 31, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-商险产品-险种-新增/编辑处增加“是否地市自购”标签
parent
a6c2e484
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
81 additions
and
0 deletions
+81
-0
InsuranceExportListParam.java
.../plus/v1/yifu/insurances/vo/InsuranceExportListParam.java
+6
-0
InsuranceRefundParam.java
...loud/plus/v1/yifu/insurances/vo/InsuranceRefundParam.java
+6
-0
InsuredListVo.java
.../yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.java
+2
-0
InsuredParam.java
...m/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredParam.java
+8
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+17
-0
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+36
-0
TInsuranceTypeMapper.xml
...main/resources/mapper/insurances/TInsuranceTypeMapper.xml
+6
-0
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceExportListParam.java
View file @
26a26ddb
...
@@ -92,4 +92,10 @@ public class InsuranceExportListParam extends BaseEntity implements Serializable
...
@@ -92,4 +92,10 @@ public class InsuranceExportListParam extends BaseEntity implements Serializable
*/
*/
@Schema
(
description
=
"购买标准结束"
)
@Schema
(
description
=
"购买标准结束"
)
private
Integer
buyStandardMax
;
private
Integer
buyStandardMax
;
/**
* 是否地市自购0是 1 否
*/
@Schema
(
description
=
"是否地市自购"
)
private
String
isAdress
;
}
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundParam.java
View file @
26a26ddb
...
@@ -103,4 +103,10 @@ public class InsuranceRefundParam extends BaseEntity implements Serializable {
...
@@ -103,4 +103,10 @@ public class InsuranceRefundParam extends BaseEntity implements Serializable {
*/
*/
@Schema
(
description
=
"是否有效 0有效 1无效"
)
@Schema
(
description
=
"是否有效 0有效 1无效"
)
private
Integer
isEffect
;
private
Integer
isEffect
;
/**
* 是否地市自购0是 1 否
*/
@Schema
(
description
=
"是否地市自购"
)
private
String
isAdress
;
}
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.java
View file @
26a26ddb
...
@@ -15,6 +15,8 @@ import java.io.Serializable;
...
@@ -15,6 +15,8 @@ import java.io.Serializable;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.time.LocalDate
;
/**
/**
* @author zhaji
* @author zhaji
* @description 已投保查询返回类
* @description 已投保查询返回类
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredParam.java
View file @
26a26ddb
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
...
@@ -148,4 +150,10 @@ public class InsuredParam extends BaseEntity implements Serializable {
...
@@ -148,4 +150,10 @@ public class InsuredParam extends BaseEntity implements Serializable {
@Schema
(
description
=
"客户编码"
)
@Schema
(
description
=
"客户编码"
)
private
String
unitNo
;
private
String
unitNo
;
/**
* 是否地市自购0是 1 否
*/
@Schema
(
description
=
"是否地市自购"
)
private
String
isAdress
;
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
26a26ddb
...
@@ -1393,7 +1393,24 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1393,7 +1393,24 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TInsuranceSettle
settle
;
TInsuranceSettle
settle
;
SettleVo
settleVo
;
SettleVo
settleVo
;
R
<
TIncomeDetailReturnVo
>
incomeDetailList
;
R
<
TIncomeDetailReturnVo
>
incomeDetailList
;
TInsuranceCompany
insuranceCompany
;
TInsuranceType
insuranceType
;
for
(
TInsuranceDetail
detail
:
successList
)
{
for
(
TInsuranceDetail
detail
:
successList
)
{
// 是否地市自购
insuranceCompany
=
tInsuranceCompanyService
.
getOne
(
Wrappers
.<
TInsuranceCompany
>
query
().
lambda
()
.
eq
(
TInsuranceCompany:
:
getCompanyName
,
detail
.
getInsuranceCompanyName
())
.
eq
(
TInsuranceCompany:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Optional
.
ofNullable
(
insuranceCompany
).
isPresent
())
{
insuranceType
=
tInsuranceTypeService
.
getOne
(
Wrappers
.<
TInsuranceType
>
query
().
lambda
()
.
eq
(
TInsuranceType:
:
getName
,
detail
.
getInsuranceTypeName
())
.
eq
(
TInsuranceType:
:
getInsuranceCompanyId
,
insuranceCompany
.
getId
())
.
eq
(
TInsuranceType:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
);
detail
.
setIsAdress
(
insuranceType
.
getIsAdress
());
}
if
(
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
())){
if
(
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
())){
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
26a26ddb
...
@@ -170,6 +170,9 @@
...
@@ -170,6 +170,9 @@
<if
test=
"param.reduceHandleStatus != null"
>
<if
test=
"param.reduceHandleStatus != null"
>
and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -240,6 +243,9 @@
...
@@ -240,6 +243,9 @@
<if
test=
"param.reduceHandleStatus != null"
>
<if
test=
"param.reduceHandleStatus != null"
>
and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -303,6 +309,9 @@
...
@@ -303,6 +309,9 @@
<if
test=
"param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''"
>
<if
test=
"param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''"
>
and a.CREATE_TIME
<![CDATA[ >= ]]>
concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
and a.CREATE_TIME
<![CDATA[ >= ]]>
concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -457,6 +466,9 @@
...
@@ -457,6 +466,9 @@
<if
test=
"param.updateBy != null and param.updateBy.trim() != ''"
>
<if
test=
"param.updateBy != null and param.updateBy.trim() != ''"
>
and a.HANDLED_BY = #{param.updateBy}
and a.HANDLED_BY = #{param.updateBy}
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -554,6 +566,9 @@
...
@@ -554,6 +566,9 @@
<if
test=
"param.updateBy != null and param.updateBy.trim() != ''"
>
<if
test=
"param.updateBy != null and param.updateBy.trim() != ''"
>
and a.HANDLED_BY = #{param.updateBy}
and a.HANDLED_BY = #{param.updateBy}
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -673,6 +688,9 @@
...
@@ -673,6 +688,9 @@
<if
test=
"param.createEndTime != null and param.createEndTime.trim() != ''"
>
<if
test=
"param.createEndTime != null and param.createEndTime.trim() != ''"
>
AND a.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.createEndTime}, ' 23:59:59')
AND a.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.createEndTime}, ' 23:59:59')
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -785,6 +803,9 @@
...
@@ -785,6 +803,9 @@
<if
test=
"param.isOverdue != null "
>
<if
test=
"param.isOverdue != null "
>
and a.IS_OVERDUE = #{param.isOverdue}
and a.IS_OVERDUE = #{param.isOverdue}
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -865,6 +886,9 @@
...
@@ -865,6 +886,9 @@
<if
test=
"param.isOverdue != null "
>
<if
test=
"param.isOverdue != null "
>
and a.IS_OVERDUE = #{param.isOverdue}
and a.IS_OVERDUE = #{param.isOverdue}
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -947,6 +971,9 @@
...
@@ -947,6 +971,9 @@
<if
test=
"param.endDate != null and param.endDate.trim() != ''"
>
<if
test=
"param.endDate != null and param.endDate.trim() != ''"
>
AND a.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
AND a.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -1034,6 +1061,9 @@
...
@@ -1034,6 +1061,9 @@
<if
test=
"param.endDate != null and param.endDate.trim() != ''"
>
<if
test=
"param.endDate != null and param.endDate.trim() != ''"
>
AND a.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
AND a.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -1106,6 +1136,9 @@
...
@@ -1106,6 +1136,9 @@
<if
test=
"param.buyStandardMax != null and param.buyStandardMax.trim() != ''"
>
<if
test=
"param.buyStandardMax != null and param.buyStandardMax.trim() != ''"
>
AND a.BUY_STANDARD
<![CDATA[ <= ]]>
#{param.buyStandardMax}
AND a.BUY_STANDARD
<![CDATA[ <= ]]>
#{param.buyStandardMax}
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
@@ -1248,6 +1281,9 @@
...
@@ -1248,6 +1281,9 @@
<if
test=
"param.updateBy != null and param.updateBy.trim() != ''"
>
<if
test=
"param.updateBy != null and param.updateBy.trim() != ''"
>
and refund.UPDATE_BY = #{param.updateBy}
and refund.UPDATE_BY = #{param.updateBy}
</if>
</if>
<if
test=
"param.isAdress != null and param.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{param.isAdress}
</if>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
<if
test=
"param.authSql != null and param.authSql.trim() != ''"
>
${param.authSql}
${param.authSql}
</if>
</if>
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceTypeMapper.xml
View file @
26a26ddb
...
@@ -80,6 +80,9 @@
...
@@ -80,6 +80,9 @@
<if
test=
"insuranceType.name != null and insuranceType.name.trim() != ''"
>
<if
test=
"insuranceType.name != null and insuranceType.name.trim() != ''"
>
and a.NAME like concat('%',replace(replace(#{insuranceType.name},'_','\_'),'%','\%'),'%')
and a.NAME like concat('%',replace(replace(#{insuranceType.name},'_','\_'),'%','\%'),'%')
</if>
</if>
<if
test=
"insuranceType.isAdress != null and insuranceType.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{insuranceType.isAdress}
</if>
ORDER BY a.CREATE_TIME DESC
ORDER BY a.CREATE_TIME DESC
</select>
</select>
...
@@ -105,6 +108,9 @@
...
@@ -105,6 +108,9 @@
<if
test=
"insuranceType.name != null and insuranceType.name.trim() != ''"
>
<if
test=
"insuranceType.name != null and insuranceType.name.trim() != ''"
>
and a.NAME like concat('%',replace(replace(#{insuranceType.name},'_','\_'),'%','\%'),'%')
and a.NAME like concat('%',replace(replace(#{insuranceType.name},'_','\_'),'%','\%'),'%')
</if>
</if>
<if
test=
"insuranceType.isAdress != null and insuranceType.isAdress.trim() != ''"
>
and a.IS_ADRESS = #{insuranceType.isAdress}
</if>
ORDER BY a.CREATE_TIME DESC
ORDER BY a.CREATE_TIME DESC
</select>
</select>
...
...
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