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
c39075c6
Commit
c39075c6
authored
Jul 28, 2022
by
李灿灿
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-licancan' into 'develop'
Feature licancan See merge request fangxinjiang/yifu!50
parents
168a798a
6407cf03
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
212 additions
and
82 deletions
+212
-82
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+34
-2
TInsuranceDetail.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
+6
-0
TInsuranceSettle.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceSettle.java
+1
-1
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+169
-78
TInsuranceDetailMapper.xml
...-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
+2
-1
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
c39075c6
...
...
@@ -100,6 +100,10 @@ public class InsurancesConstants {
* 当前记录是投保中,无法替换
*/
public
static
final
String
TWO_REPLACE_IS_NOT_ALLOW
=
"当前记录是投保中,无法替换"
;
/**
* 当前记录是投保退回,无法替换
*/
public
static
final
String
FOUR_REPLACE_IS_NOT_ALLOW
=
"当前记录是投保退回,无法替换"
;
/**
* 当前记录已出险,无法替换
*/
...
...
@@ -121,9 +125,9 @@ public class InsurancesConstants {
*/
public
static
final
String
REDUCE_REPLACE_IS_NOT_ALLOW
=
"当前记录在减员流程中,无法替换"
;
/**
*
已减员
,无法退回
*
投保状态不是投保中或已投保
,无法退回
*/
public
static
final
String
REDUCE_ROLLBACK_IS_NOT_ALLOW
=
"
已减员
,无法退回"
;
public
static
final
String
REDUCE_ROLLBACK_IS_NOT_ALLOW
=
"
投保状态不是投保中或已投保
,无法退回"
;
/**
* 员工姓名不能为空
*/
...
...
@@ -160,6 +164,10 @@ public class InsurancesConstants {
* 替换员工未通过实名认证
*/
public
static
final
String
REPLACE_EMP_ID_CARD_NO_NOT_FIT
=
"替换员工未通过实名认证"
;
/**
* 替换信息和被替换信息一致,无法替换
*/
public
static
final
String
REPLACE_EMP_INFO_SAME
=
"替换信息和被替换信息一致,无法替换"
;
/**
* 替换员工身份证号格式有误
*/
...
...
@@ -312,10 +320,34 @@ public class InsurancesConstants {
* 商险投保中,无法登记保单保费
*/
public
static
final
String
BUY_HANDLE_TWO_NOT_REGISTERED
=
"商险投保中,无法登记保单保费"
;
/**
* 非投保中状态,无法标记投保成功
*/
public
static
final
String
INSURANCE_BUY_STATUS_NOT_TWO
=
"非投保中状态,无法标记投保成功"
;
/**
* 商险投保退回,无法登记保单保费
*/
public
static
final
String
BUY_HANDLE_FOUR_NOT_REGISTERED
=
"商险投保退回,无法登记保单保费"
;
/**
* 商险结算中,无法登记保单保费
*/
public
static
final
String
SETTLE_HANDLE_TWO_NOT_REGISTERED
=
"商险结算中,无法登记保单保费"
;
/**
* 商险已结算,无法登记保单保费
*/
public
static
final
String
SETTLE_HANDLE_THREE_NOT_REGISTERED
=
"商险已结算,无法登记保单保费"
;
/**
* 保单号不存在或已过期
*/
public
static
final
String
POLICY_NO_EXIST
=
"保单号不存在或已过期"
;
/**
* 保单号不存
*/
public
static
final
String
POLICY_NO_NOT_EXIST
=
"保单号不存"
;
/**
* 保单号信息错误
*/
public
static
final
String
POLICY_NO_ERROR
=
"保单号信息错误"
;
/**
* 保险公司错误
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @
c39075c6
...
...
@@ -203,6 +203,12 @@ public class TInsuranceDetail extends BaseEntity {
@Schema
(
description
=
"预估保费"
)
private
BigDecimal
estimatePremium
;
/**
* 是否标记投保成功标识 0 未标记过 1标记过
*/
@Schema
(
description
=
"是否标记投保成功标识 0 未标记过 1标记过"
)
private
Integer
signFlag
;
/**
* 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceSettle.java
View file @
c39075c6
...
...
@@ -33,7 +33,7 @@ public class TInsuranceSettle implements Serializable {
private
String
insDetailId
;
/**
* 结算状态
* 结算状态
1、待结算,2、结算中,3、已结算
*/
@Schema
(
description
=
"结算状态 1、待结算,2、结算中,3、已结算"
)
private
String
settleHandleStatus
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
c39075c6
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
View file @
c39075c6
...
...
@@ -35,6 +35,7 @@
<result
property=
"settleType"
column=
"SETTLE_TYPE"
jdbcType=
"TINYINT"
/>
<result
property=
"actualPremium"
column=
"ACTUAL_PREMIUM"
jdbcType=
"DECIMAL"
/>
<result
property=
"estimatePremium"
column=
"ESTIMATE_PREMIUM"
jdbcType=
"DECIMAL"
/>
<result
property=
"signFlag"
column=
"SIGN_FLAG"
jdbcType=
"TINYINT"
/>
<result
property=
"buyHandleStatus"
column=
"BUY_HANDLE_STATUS"
jdbcType=
"TINYINT"
/>
<result
property=
"defaultSettleId"
column=
"DEFAULT_SETTLE_ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"reduceHandleStatus"
column=
"REDUCE_HANDLE_STATUS"
jdbcType=
"TINYINT"
/>
...
...
@@ -58,7 +59,7 @@
BATCH_DATE,SETTLE_MONTH,INVOICE_NO,
BUY_TYPE,INSURANCE_PROVINCE,INSURANCE_PROVINCE_NAME,INSURANCE_CITY,INSURANCE_CITY_NAME,
INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME,SETTLE_TYPE,
ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
SIGN_FLAG,
BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
CREATE_BY,CREATE_NAME,CREATE_TIME,
...
...
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