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
ad8986bd
You need to sign in or sign up before continuing.
Commit
ad8986bd
authored
Jul 28, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
4534f3ff
cc6dab0f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
274 additions
and
78 deletions
+274
-78
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+7
-2
TInsuranceRefund.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceRefund.java
+8
-0
LocalDateUtil.java
...ifu/cloud/plus/v1/yifu/insurances/util/LocalDateUtil.java
+8
-3
DeptChangeCheckParam.java
...loud/plus/v1/yifu/insurances/vo/DeptChangeCheckParam.java
+19
-0
InsuranceAddParam.java
...u/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java
+1
-1
InsuranceRefundListVo.java
...oud/plus/v1/yifu/insurances/vo/InsuranceRefundListVo.java
+5
-1
TInsuranceRefundDetail.java
...ud/plus/v1/yifu/insurances/vo/TInsuranceRefundDetail.java
+1
-1
TInsuranceDetailMapper.java
...lus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java
+1
-1
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+223
-68
TInsuranceDetailMapper.xml
...-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
+1
-1
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
ad8986bd
...
...
@@ -405,9 +405,9 @@ public class InsurancesConstants {
public
static
final
String
INSURANCE_REFUND_STATUS_FOUR_ERROR
=
"商险已减员,无法减员"
;
/**
*
替换结算月份和原有结算月份相同
*
变更结算月和当前结算月一致
*/
public
static
final
String
SETTLE_MONTH_IDENTICAL
=
"
替换结算月份和原有结算月份相同
"
;
public
static
final
String
SETTLE_MONTH_IDENTICAL
=
"
变更结算月和当前结算月一致
"
;
/**
* 商险待投保,无法减员
...
...
@@ -429,6 +429,11 @@ public class InsurancesConstants {
*/
public
static
final
String
SETTLE_MONTH_CHANGE_REFUND_STATUS_FOUR_ERROR
=
"商险已减员,无法变更结算月"
;
/**
* 减员流程中,无法变更结算月
*/
public
static
final
String
SETTLE_MONTH_CHANGE_REFUND_STATUS_ONE_ERROR
=
"减员流程中,无法变更结算月"
;
/**
* 商险结算中,无法变更结算月
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceRefund.java
View file @
ad8986bd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
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.tags.Tag
;
...
...
@@ -20,26 +22,32 @@ public class TInsuranceRefund extends BaseEntity {
/**
* 主键id
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Schema
(
description
=
"主键"
)
private
String
id
;
/**
* 保单信息主键
*/
@Schema
(
description
=
"保单信息主键"
)
private
String
insDetailId
;
/**
* 减员状态
*/
@Schema
(
description
=
"减员状态"
)
private
Integer
reduceHandleStatus
;
/**
* 退费金额
*/
@Schema
(
description
=
"退费金额"
)
private
BigDecimal
refundMoney
;
/**
* 备注
*/
@Schema
(
description
=
"备注"
)
private
String
remark
;
/**
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/LocalDateUtil.java
View file @
ad8986bd
...
...
@@ -74,9 +74,14 @@ public class LocalDateUtil {
* @return {@link LocalDate}
*/
public
static
LocalDate
parseLocalDate
(
String
strDate
){
DateTimeFormatter
dateTimeFormatter
=
DateTimeFormatter
.
ofPattern
(
NORM_DATE_PATTERN
,
Locale
.
CHINA
);
LocalDate
localDate
=
LocalDate
.
parse
(
strDate
,
dateTimeFormatter
);
return
localDate
;
try
{
DateTimeFormatter
dateTimeFormatter
=
DateTimeFormatter
.
ofPattern
(
NORM_DATE_PATTERN
,
Locale
.
CHINA
);
LocalDate
localDate
=
LocalDate
.
parse
(
strDate
,
dateTimeFormatter
);
return
localDate
;
}
catch
(
Exception
e
){
e
.
printStackTrace
();
return
null
;
}
}
/**
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/DeptChangeCheckParam.java
View file @
ad8986bd
...
...
@@ -91,4 +91,23 @@ public class DeptChangeCheckParam implements Serializable {
@Schema
(
description
=
"结算方式"
)
private
Integer
oldSettleType
;
/**
* 默认结算id
*/
@Schema
(
description
=
"默认结算id"
)
private
String
defaultSettleId
;
/**
* 预估保费
*/
@Schema
(
description
=
"预估保费"
)
private
String
estimatePremium
;
/**
* 实际保费
*/
@Schema
(
description
=
"实际保费"
)
private
String
actualPremium
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java
View file @
ad8986bd
...
...
@@ -132,7 +132,7 @@ public class InsuranceAddParam implements Serializable {
* 险种主键
*/
@JsonIgnore
private
Stri
ng
insuranceTypeId
;
private
Lo
ng
insuranceTypeId
;
/**
* 商险购买地省code
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundListVo.java
View file @
ad8986bd
...
...
@@ -171,5 +171,9 @@ public class InsuranceRefundListVo implements Serializable {
@Schema
(
description
=
"减员状态 1待减员 2减员中3减员退回"
)
private
Integer
reduceHandleStatus
;
/**
* 购买月数
*/
@Schema
(
description
=
"购买月数"
)
private
Long
buyMonth
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/
entity
/TInsuranceRefundDetail.java
→
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/
vo
/TInsuranceRefundDetail.java
View file @
ad8986bd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java
View file @
ad8986bd
...
...
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.
entity
.TInsuranceRefundDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.
vo
.TInsuranceRefundDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
ad8986bd
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
View file @
ad8986bd
...
...
@@ -640,7 +640,7 @@
</foreach>
</select>
<!-- 查询保单减员退费信息-->
<select
id=
"selectRefundDetail"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.
entity
.TInsuranceRefundDetail"
>
<select
id=
"selectRefundDetail"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.
vo
.TInsuranceRefundDetail"
>
select
detail.DEPT_NO as deptNo,
detail.EMP_NAME as empName,
...
...
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