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
f719fc50
You need to sign in or sign up before continuing.
Commit
f719fc50
authored
Jul 19, 2022
by
查济
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-zhaji' into 'develop'
Feature zhaji See merge request fangxinjiang/yifu!7
parents
8544c851
44cfecfd
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
253 additions
and
16 deletions
+253
-16
CommonConstants.java
...ud.plus.v1/yifu/common/core/constant/CommonConstants.java
+8
-0
InsuranceRefundCheck.java
.../plus/v1/yifu/insurances/entity/InsuranceRefundCheck.java
+69
-0
TInsuranceCompany.java
...oud/plus/v1/yifu/insurances/entity/TInsuranceCompany.java
+17
-2
TInsuranceType.java
.../cloud/plus/v1/yifu/insurances/entity/TInsuranceType.java
+10
-2
TInsuranceTypeRate.java
...ud/plus/v1/yifu/insurances/entity/TInsuranceTypeRate.java
+15
-2
TInsuranceTypeStandard.java
...lus/v1/yifu/insurances/entity/TInsuranceTypeStandard.java
+8
-6
BeanCopyUtils.java
...ifu/cloud/plus/v1/yifu/insurances/util/BeanCopyUtils.java
+36
-0
ValidityUtil.java
...yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
+10
-0
InsuranceTypeVo.java
...ifu/cloud/plus/v1/yifu/insurances/vo/InsuranceTypeVo.java
+28
-0
TInsuranceTypeMapper.java
.../plus/v1/yifu/insurances/mapper/TInsuranceTypeMapper.java
+21
-1
TInsuranceTypeMapper.xml
...es-biz/src/main/resources/mapper/TInsuranceTypeMapper.xml
+30
-0
TInsuranceTypeStandardMapper.xml
...rc/main/resources/mapper/TInsuranceTypeStandardMapper.xml
+1
-3
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java
View file @
f719fc50
...
...
@@ -176,6 +176,14 @@ public interface CommonConstants {
**/
String
[]
dingleDigitStrArray
=
{
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
,
"9"
,
"10"
,
"11"
,
"12"
,
"13"
,
"14"
,
"15"
,
"16"
,
"17"
};
/**
* 月份(阿里编码规约不允许直接使用‘魔法值’)
* @Author pwang
* @Date 2019-08-02 16:39
**/
String
[]
MonthStrArray
=
{
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
,
"9"
,
"10"
,
"11"
,
"12"
};
/**
* 逗号
* @Author fxj
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/InsuranceRefundCheck.java
0 → 100644
View file @
f719fc50
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
entity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @author zhaji
* @description 减员校验类
* @date 2022-07-19 09:09:41
*/
@Data
@Tag
(
name
=
"减员校验类"
)
public
class
InsuranceRefundCheck
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 员工姓名
*/
@Schema
(
description
=
"员工姓名"
)
private
String
empName
;
/**
* 员工身份证号码
*/
@Schema
(
description
=
"员工身份证号码"
)
private
String
empIdCardNo
;
/**
* 保险公司名称
*/
@Schema
(
description
=
"保险公司名称"
)
private
String
insuranceCompanyName
;
/**
* 险种名称
*/
@Schema
(
description
=
"险种名称"
)
private
String
insuranceTypeName
;
/**
* 保单开始日期
*/
@Schema
(
description
=
"保单开始日期"
)
private
String
policyStart
;
/**
* 保单结束日期
*/
@Schema
(
description
=
"保单结束日期"
)
private
String
policyEnd
;
/**
* 退款金额
*/
@Schema
(
description
=
"退款金额"
)
private
String
refundMoney
;
/**
* 备注
*/
@Schema
(
description
=
"备注"
)
private
String
remark
;
/**
* 错误信息
*/
@Schema
(
description
=
"错误信息"
)
private
String
errorMessage
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceCompany.java
View file @
f719fc50
...
...
@@ -2,11 +2,15 @@ package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import
com.baomidou.mybatisplus.annotation.TableName
;
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
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NonNull
;
import
org.checkerframework.common.value.qual.StringVal
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
/**
* 保险公司表
...
...
@@ -22,26 +26,37 @@ public class TInsuranceCompany extends BaseEntity {
/**
* 保险公司id
*/
private
Lo
ng
id
;
private
Stri
ng
id
;
/**
* 保险公司名称
*/
@NotBlank
(
message
=
"保险公司名称不能为空"
)
private
String
companyName
;
/**
* 保险公司地址
*/
@NotBlank
(
message
=
"保险公司地址不能为空"
)
private
String
companyAddress
;
/**
* 对接人
*/
@NotBlank
(
message
=
"对接人不能为空"
)
private
String
companyDocking
;
/**
* 计费方式
*/
@NotBlank
(
message
=
"计费方式不能为空"
)
@StringVal
({
"0"
,
"1"
})
private
String
billingType
;
/**
* 删除标志(0:未删除,1:删除)
*/
@Schema
(
description
=
"是否删除 0否/1是"
)
private
Integer
deleteFlag
;
}
\ No newline at end of file
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceType.java
View file @
f719fc50
...
...
@@ -2,10 +2,12 @@ package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import
com.baomidou.mybatisplus.annotation.TableName
;
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
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
import
java.util.Date
;
...
...
@@ -24,33 +26,39 @@ public class TInsuranceType extends BaseEntity {
private
Long
id
;
/**
*
保险
名称
*
险种
名称
*/
@NotBlank
(
message
=
"险种名称不能为空"
)
private
String
name
;
/**
* 保险公司主键ID
*/
private
Long
insuranceCompanyId
;
@NotBlank
(
message
=
"所属保险公司不能为空"
)
private
String
insuranceCompanyId
;
/**
* 收款单位名称
*/
@NotBlank
(
message
=
"收款单位名称不能为空"
)
private
String
receiptUnitName
;
/**
* 收款银行名称
*/
@NotBlank
(
message
=
"收款银行名称不能为空"
)
private
String
bankName
;
/**
* 收款银行账号
*/
@NotBlank
(
message
=
"收款银行账号不能为空"
)
private
String
bankNo
;
/**
* 删除标志(0:未删除,1:删除)
*/
@Schema
(
description
=
"是否删除 0否/1是"
)
private
Integer
deleteFlag
;
}
\ No newline at end of file
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeRate.java
View file @
f719fc50
...
...
@@ -2,10 +2,12 @@ package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import
com.baomidou.mybatisplus.annotation.TableName
;
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
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
javax.validation.constraints.NotBlank
;
import
java.math.BigDecimal
;
/**
...
...
@@ -25,16 +27,27 @@ public class TInsuranceTypeRate extends BaseEntity {
/**
* 险种ID
*/
@NotBlank
(
message
=
"所属险种不能为空"
)
private
String
insuranceTypeId
;
/**
* 月数
*/
private
Integer
month
;
@NotBlank
(
message
=
"月不能为空"
)
private
String
month
;
/**
* 费率
*/
private
BigDecimal
rate
;
@NotBlank
(
message
=
"费率不能为空"
)
private
String
rate
;
/**
* 删除标志(0:未删除,1:删除)
*/
@Schema
(
description
=
"是否删除 0否/1是"
)
private
Integer
deleteFlag
;
}
\ No newline at end of file
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeStandard.java
View file @
f719fc50
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import
com.baomidou.mybatisplus.annotation.TableName
;
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
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
@@ -14,7 +15,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@TableName
(
"t_insurance_type_standard"
)
@Tag
(
name
=
"
保险公司
表"
)
@Tag
(
name
=
"
购买标准
表"
)
public
class
TInsuranceTypeStandard
extends
BaseEntity
{
/**
*
...
...
@@ -31,11 +32,6 @@ public class TInsuranceTypeStandard extends BaseEntity {
*/
private
String
buyStandard
;
/**
*
*/
private
Integer
type
;
/**
* 医疗额度
*/
...
...
@@ -45,4 +41,10 @@ public class TInsuranceTypeStandard extends BaseEntity {
* 身故或残疾额度
*/
private
String
dieDisableQuota
;
/**
* 删除标志(0:未删除,1:删除)
*/
@Schema
(
description
=
"是否删除 0否/1是"
)
private
Integer
deleteFlag
;
}
\ No newline at end of file
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/BeanCopyUtils.java
0 → 100644
View file @
f719fc50
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
util
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanWrapper
;
import
org.springframework.beans.BeanWrapperImpl
;
import
java.util.HashSet
;
import
java.util.Set
;
/**
* @auther wangan
* @date 2019/12/3
* bean复制,忽视空串
*/
public
class
BeanCopyUtils
{
public
static
String
[]
getNullPropertyNames
(
Object
source
)
{
final
BeanWrapper
src
=
new
BeanWrapperImpl
(
source
);
java
.
beans
.
PropertyDescriptor
[]
pds
=
src
.
getPropertyDescriptors
();
Set
<
String
>
emptyNames
=
new
HashSet
<>();
for
(
java
.
beans
.
PropertyDescriptor
pd
:
pds
)
{
Object
srcValue
=
src
.
getPropertyValue
(
pd
.
getName
());
if
(
srcValue
==
null
)
{
emptyNames
.
add
(
pd
.
getName
());
}
}
String
[]
result
=
new
String
[
emptyNames
.
size
()];
return
emptyNames
.
toArray
(
result
);
}
public
static
void
copyProperties
(
Object
src
,
Object
target
)
{
BeanUtils
.
copyProperties
(
src
,
target
,
getNullPropertyNames
(
src
));
}
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
View file @
f719fc50
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
util
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ValidityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
...
...
@@ -299,6 +300,15 @@ public class ValidityUtil {
}
return
true
;
}
public
static
boolean
isMonth
(
String
month
){
for
(
String
s
:
CommonConstants
.
MonthStrArray
){
if
(
s
.
equals
(
month
)){
return
true
;
}
}
return
false
;
}
public
static
boolean
isInt
(
String
numStr
)
{
if
(
numStr
==
null
){
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceTypeVo.java
0 → 100644
View file @
f719fc50
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard
;
import
lombok.Data
;
import
java.util.List
;
/**
* @author zhaji
* @description 险种信息返回类
* @date 2022-07-19 10:26:33
*/
@Data
public
class
InsuranceTypeVo
extends
TInsuranceType
{
/**
* 费率信息
*/
private
List
<
TInsuranceTypeRate
>
insuranceTypeRateList
;
/**
* 购买标准
*/
private
List
<
TInsuranceTypeStandard
>
insuranceTypeStandardList
;
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeMapper.java
View file @
f719fc50
...
...
@@ -2,7 +2,12 @@ package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
* @author Administrator
...
...
@@ -13,5 +18,20 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public
interface
TInsuranceTypeMapper
extends
BaseMapper
<
TInsuranceType
>
{
/**
* 根据险种id查询费率
*
* @author zhaji
* @param id 险种id
* @return {@link List< TInsuranceTypeRate>}
*/
List
<
TInsuranceTypeRate
>
selectInsuranceTypeRateList
(
@Param
(
"id"
)
String
id
);
/**
* 根据险种id查询购买标准
*
* @author zhaji
* @param id 险种id
* @return {@link List< TInsuranceTypeStandard>}
*/
List
<
TInsuranceTypeStandard
>
selectInsuranceTypeStandardList
(
String
id
);
}
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeMapper.xml
View file @
f719fc50
...
...
@@ -25,4 +25,34 @@
DELETE_FLAG,CREATE_BY,CREATE_NAME,
CREATE_TIME,UPDATE_BY,UPDATE_TIME
</sql>
<select
id=
"selectInsuranceTypeRateList"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate"
>
select
ID as id,
INSURANCE_TYPE_ID as insuranceTypeId,
MONTH as month,
RATE as rate
from
t_insurance_type_rate
where
INSURANCE_TYPE_ID = #{id}
and
DELETE_FLAG = 0
</select>
<select
id=
"selectInsuranceTypeStandardList"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard"
>
select
ID as id,
INSURANCE_TYPE_ID as insuranceTypeId,
BUY_STANDARD as buyStandard,
TYPE as type,
MEDICAL_QUOTA as medicalQuota,
DIE_DISABLE_QUOTA as dieDisableQuota
from
t_insurance_type_standard
where
INSURANCE_TYPE_ID = #{id}
and
DELETE_FLAG = 0
</select>
</mapper>
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeStandardMapper.xml
View file @
f719fc50
...
...
@@ -8,13 +8,11 @@
<id
property=
"id"
column=
"ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"insuranceTypeId"
column=
"INSURANCE_TYPE_ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"buyStandard"
column=
"BUY_STANDARD"
jdbcType=
"VARCHAR"
/>
<result
property=
"type"
column=
"TYPE"
jdbcType=
"TINYINT"
/>
<result
property=
"medicalQuota"
column=
"MEDICAL_QUOTA"
jdbcType=
"VARCHAR"
/>
<result
property=
"dieDisableQuota"
column=
"DIE_DISABLE_QUOTA"
jdbcType=
"VARCHAR"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
ID,INSURANCE_TYPE_ID,BUY_STANDARD,
TYPE,MEDICAL_QUOTA,DIE_DISABLE_QUOTA
ID,INSURANCE_TYPE_ID,BUY_STANDARD,MEDICAL_QUOTA,DIE_DISABLE_QUOTA
</sql>
</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