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
c1d421ae
You need to sign in or sign up before continuing.
Commit
c1d421ae
authored
Jul 20, 2022
by
李灿灿
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-licancan' into 'develop'
商险详情字段调整 See merge request fangxinjiang/yifu!17
parents
757ab2bb
80fe23be
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
16 deletions
+10
-16
TInsuranceDetail.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
+5
-11
TInsuranceDetailMapper.xml
...-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
+5
-5
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @
c1d421ae
...
...
@@ -30,12 +30,6 @@ public class TInsuranceDetail extends BaseEntity {
@Schema
(
description
=
"主键"
)
private
String
id
;
/**
* 员工档案id
*/
@Schema
(
description
=
"员工档案id"
)
private
String
empId
;
/**
* 员工姓名
*/
...
...
@@ -228,11 +222,11 @@ public class TInsuranceDetail extends BaseEntity {
@Schema
(
description
=
"投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员"
)
private
Integer
buyHandleStatus
;
/**
* 结算办理状态 1待结算 2结算中 3已结算
*/
@Schema
(
description
=
"
结算办理状态 1待结算 2结算中 3已结算
"
)
private
Integer
settleHandleStatus
;
/**
* 默认结算信息id
*/
@Schema
(
description
=
"
默认结算信息id
"
)
private
Integer
defaultSettleId
;
/**
* 减员状态 1待减员 2减员中3减员退回
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
View file @
c1d421ae
...
...
@@ -6,7 +6,6 @@
<resultMap
id=
"BaseResultMap"
type=
"com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail"
>
<id
property=
"id"
column=
"ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"empId"
column=
"EMP_ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"empName"
column=
"EMP_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"empIdcardNo"
column=
"EMP_IDCARD_NO"
jdbcType=
"VARCHAR"
/>
<result
property=
"orderNo"
column=
"ORDER_NO"
jdbcType=
"VARCHAR"
/>
...
...
@@ -39,7 +38,7 @@
<result
property=
"estimatePremium"
column=
"ESTIMATE_PREMIUM"
jdbcType=
"DECIMAL"
/>
<result
property=
"settleBalance"
column=
"SETTLE_BALANCE"
jdbcType=
"DECIMAL"
/>
<result
property=
"buyHandleStatus"
column=
"BUY_HANDLE_STATUS"
jdbcType=
"TINYINT"
/>
<result
property=
"
settleHandleStatus"
column=
"SETTLE_HANDLE_STATUS"
jdbcType=
"TINYINT
"
/>
<result
property=
"
defaultSettleId"
column=
"DEFAULT_SETTLE_ID"
jdbcType=
"VARCHAR
"
/>
<result
property=
"reduceHandleStatus"
column=
"REDUCE_HANDLE_STATUS"
jdbcType=
"TINYINT"
/>
<result
property=
"isUse"
column=
"IS_USE"
jdbcType=
"TINYINT"
/>
<result
property=
"isEffect"
column=
"IS_EFFECT"
jdbcType=
"TINYINT"
/>
...
...
@@ -54,7 +53,7 @@
</resultMap>
<sql
id=
"Base_Column_List"
>
ID,EMP_
ID,EMP_
NAME,
ID,EMP_NAME,
EMP_IDCARD_NO,ORDER_NO,DEPT_NO,POST,INSURANCE_COMPANY_NAME,INSURANCE_TYPE_NAME,
INSURANCE_TYPE_ID,BUY_STANDARD,MEDICAL_QUOTA,DIE_DISABLE_QUOTA,POLICY_NO,
POLICY_START,POLICY_END,POLICY_EFFECT,
...
...
@@ -62,7 +61,7 @@
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,SETTLE_BALANCE,
BUY_HANDLE_STATUS,
SETTLE_HANDLE_STATUS
,REDUCE_HANDLE_STATUS,
BUY_HANDLE_STATUS,
DEFAULT_SETTLE_ID
,REDUCE_HANDLE_STATUS,
IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
CREATE_BY,CREATE_NAME,CREATE_TIME,
UPDATE_BY,UPDATE_TIME,DELETE_FLAG
...
...
@@ -165,7 +164,7 @@
detail.SETTLE_MONTH as settleMonth,
detail.BUY_HANDLE_STATUS as buyHandleStatus,
detail.REDUCE_HANDLE_STATUS as reduceHandleStatus,
detail
.SETTLE_HANDLE_STATUS as settleHandleStatus,
tis
.SETTLE_HANDLE_STATUS as settleHandleStatus,
detail.IS_USE as isUse,
detail.IS_EFFECT as isEffect,
detail.IS_OVERDUE as isOverdue,
...
...
@@ -176,6 +175,7 @@
detail.CREATE_NAME as createName,
detail.CREATE_TIME as createTime
from t_insurance_detail detail
left join t_insurance_settle tis on detail.DEFAULT_SETTLE_ID = tis.ID
where detail.ID = #{id}
</select>
</mapper>
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