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
c0641660
Commit
c0641660
authored
Aug 05, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
81f6ef12
c9338d95
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
437 additions
and
81 deletions
+437
-81
CommonConstants.java
...ud.plus.v1/yifu/common/core/constant/CommonConstants.java
+4
-0
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+20
-7
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+30
-3
TInsuranceDetailMapper.java
...lus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java
+21
-2
TInsuranceDetailService.java
...s/v1/yifu/insurances/service/TInsuranceDetailService.java
+22
-2
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+177
-50
TInsuranceDetailMapper.xml
...-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
+134
-17
PreDispatchConstants.java
...d/plus/v1/yifu/social/constants/PreDispatchConstants.java
+2
-0
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+27
-0
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java
View file @
c0641660
...
@@ -126,6 +126,10 @@ public interface CommonConstants {
...
@@ -126,6 +126,10 @@ public interface CommonConstants {
String
FIVE_STRING
=
"5"
;
String
FIVE_STRING
=
"5"
;
String
TWELVE_STRING
=
"12"
;
String
THIRTEEN_STRING
=
"13"
;
/**
/**
* number 0
* number 0
*/
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
c0641660
...
@@ -542,6 +542,21 @@ public class InsurancesConstants {
...
@@ -542,6 +542,21 @@ public class InsurancesConstants {
*/
*/
public
static
final
String
DEPT_NO_CHANGE_NOT_EMPTY
=
"替换项目编码不能为空"
;
public
static
final
String
DEPT_NO_CHANGE_NOT_EMPTY
=
"替换项目编码不能为空"
;
/**
* 无替换项目的操作权限
*/
public
static
final
String
NEW_DEPT_NO_NOT_IN_DEPT_LIST
=
"无替换项目的操作权限"
;
/**
* 无被替换项目的操作权限
*/
public
static
final
String
OLD_DEPT_NO_NOT_IN_DEPT_LIST
=
"无被替换项目的操作权限"
;
/**
* 无该项目的操作权限
*/
public
static
final
String
DEPT_NO_NOT_IN_USER_DEPT_LIST
=
"无该项目的操作权限"
;
/**
/**
* 替换项目不存在
* 替换项目不存在
*/
*/
...
@@ -587,6 +602,11 @@ public class InsurancesConstants {
...
@@ -587,6 +602,11 @@ public class InsurancesConstants {
*/
*/
public
static
final
String
USER_DATA_IS_NOT_EXIST
=
"员工投保记录不存在"
;
public
static
final
String
USER_DATA_IS_NOT_EXIST
=
"员工投保记录不存在"
;
/**
* 无该投保记录的操作权限
*/
public
static
final
String
DEPT_NO_NOT_IN_DEPT_LIST
=
"无该投保记录的操作权限"
;
/**
/**
* 存在多条在保记录
* 存在多条在保记录
*/
*/
...
@@ -752,11 +772,4 @@ public class InsurancesConstants {
...
@@ -752,11 +772,4 @@ public class InsurancesConstants {
public
static
final
String
NOT_CREATE_USER_DELETE_ERROR
=
"非创建人无法删除保单信息"
;
public
static
final
String
NOT_CREATE_USER_DELETE_ERROR
=
"非创建人无法删除保单信息"
;
/**
* 非创建人无法进行出险
*/
public
static
final
String
NOT_CREATE_USER_UPDATE_IS_USE_ERROR
=
"非创建人无法进行出险"
;
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
c0641660
...
@@ -71,24 +71,51 @@ public class TInsuranceDetailController {
...
@@ -71,24 +71,51 @@ public class TInsuranceDetailController {
* @return {@link R<IPage<InsuranceListVO>>}
* @return {@link R<IPage<InsuranceListVO>>}
*/
*/
@Operation
(
summary
=
"投保办理分页查询"
,
description
=
"投保办理分页查询"
)
@Operation
(
summary
=
"投保办理分页查询"
,
description
=
"投保办理分页查询"
)
@PostMapping
(
"/getInsuranceHandleListPage"
)
public
R
<
IPage
<
InsuranceListVO
>>
getInsuranceHandleListPage
(
Page
<
InsuranceListVO
>
page
,
@RequestBody
InsuranceListParam
param
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceHandleListPage
(
page
,
param
));
}
/**
* 投保分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link R<IPage<InsuranceListVO>>}
*/
@Operation
(
summary
=
"投保分页查询"
,
description
=
"投保分页查询"
)
@PostMapping
(
"/getInsuranceListPage"
)
@PostMapping
(
"/getInsuranceListPage"
)
public
R
<
IPage
<
InsuranceListVO
>>
getInsuranceListPage
(
Page
<
InsuranceListVO
>
page
,
@RequestBody
InsuranceListParam
param
)
{
public
R
<
IPage
<
InsuranceListVO
>>
getInsuranceListPage
(
Page
<
InsuranceListVO
>
page
,
@RequestBody
InsuranceListParam
param
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceListPage
(
page
,
param
));
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceListPage
(
page
,
param
));
}
}
/**
/**
* 投保
办理
不分页查询
* 投保不分页查询
*
*
* @author licancan
* @author licancan
* @param param
* @param param
* @return {@link R<List<InsuranceListVO>>}
* @return {@link R<List<InsuranceListVO>>}
*/
*/
@Operation
(
summary
=
"投保
办理不分页查询"
,
description
=
"投保办理
不分页查询"
)
@Operation
(
summary
=
"投保
不分页查询"
,
description
=
"投保
不分页查询"
)
@PostMapping
(
"/getInsuranceList"
)
@PostMapping
(
"/getInsuranceList"
)
public
R
<
List
<
InsuranceListVO
>>
getInsuranceList
(
@RequestBody
InsuranceListParam
param
)
{
public
R
<
List
<
InsuranceListVO
>>
getInsuranceList
(
@RequestBody
InsuranceListParam
param
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceList
(
param
));
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceList
(
param
));
}
}
/**
* 投保办理不分页查询
*
* @author licancan
* @param param
* @return {@link R<List<InsuranceListVO>>}
*/
@Operation
(
summary
=
"投保办理不分页查询"
,
description
=
"投保办理不分页查询"
)
@PostMapping
(
"/getInsuranceHandleList"
)
public
R
<
List
<
InsuranceListVO
>>
getInsuranceHandleList
(
@RequestBody
InsuranceListParam
param
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceHandleList
(
param
));
}
/**
/**
* 商险新增
* 商险新增
*
*
...
@@ -414,7 +441,7 @@ public class TInsuranceDetailController {
...
@@ -414,7 +441,7 @@ public class TInsuranceDetailController {
@Operation
(
summary
=
"查询项目列表"
,
description
=
"查询项目列表"
)
@Operation
(
summary
=
"查询项目列表"
,
description
=
"查询项目列表"
)
@GetMapping
(
"/deptList"
)
@GetMapping
(
"/deptList"
)
public
R
getDeptList
()
{
public
R
getDeptList
()
{
return
tInsuranceDetailService
.
getDeptList
();
return
tInsuranceDetailService
.
getDeptList
ByUser
();
}
}
/**
/**
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java
View file @
c0641660
...
@@ -20,7 +20,7 @@ import java.util.List;
...
@@ -20,7 +20,7 @@ import java.util.List;
public
interface
TInsuranceDetailMapper
extends
BaseMapper
<
TInsuranceDetail
>
{
public
interface
TInsuranceDetailMapper
extends
BaseMapper
<
TInsuranceDetail
>
{
/***********************商险办理********************************/
/***********************商险办理********************************/
/**
/**
* 投保
办理
分页查询
* 投保分页查询
*
*
* @author licancan
* @author licancan
* @param page
* @param page
...
@@ -30,7 +30,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
...
@@ -30,7 +30,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
IPage
<
InsuranceListVO
>
getInsuranceListPage
(
Page
<
InsuranceListVO
>
page
,
@Param
(
"param"
)
InsuranceListParam
param
);
IPage
<
InsuranceListVO
>
getInsuranceListPage
(
Page
<
InsuranceListVO
>
page
,
@Param
(
"param"
)
InsuranceListParam
param
);
/**
/**
* 投保
办理
不分页查询
* 投保不分页查询
*
*
* @author licancan
* @author licancan
* @param param
* @param param
...
@@ -38,6 +38,25 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
...
@@ -38,6 +38,25 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
*/
*/
List
<
InsuranceListVO
>
getInsuranceList
(
@Param
(
"param"
)
InsuranceListParam
param
);
List
<
InsuranceListVO
>
getInsuranceList
(
@Param
(
"param"
)
InsuranceListParam
param
);
/**
* 投保办理分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link IPage< InsuranceListVO>}
*/
IPage
<
InsuranceListVO
>
getInsuranceHandleListPage
(
Page
<
InsuranceListVO
>
page
,
@Param
(
"param"
)
InsuranceListParam
param
);
/**
* 投保办理不分页查询
*
* @author licancan
* @param param
* @return {@link List<InsuranceListVO>}
*/
List
<
InsuranceListVO
>
getInsuranceHandleList
(
@Param
(
"param"
)
InsuranceListParam
param
);
/**
/**
* 通过id查询
* 通过id查询
*
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java
View file @
c0641660
...
@@ -38,7 +38,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
...
@@ -38,7 +38,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
R
<
String
>
updateInsuranceSettle
(
UpdateInsuranceSettleParam
param
);
R
<
String
>
updateInsuranceSettle
(
UpdateInsuranceSettleParam
param
);
/**
/**
* 投保
办理
分页查询
* 投保分页查询
*
*
* @author licancan
* @author licancan
* @param page
* @param page
...
@@ -48,7 +48,18 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
...
@@ -48,7 +48,18 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
IPage
<
InsuranceListVO
>
getInsuranceListPage
(
Page
<
InsuranceListVO
>
page
,
InsuranceListParam
param
);
IPage
<
InsuranceListVO
>
getInsuranceListPage
(
Page
<
InsuranceListVO
>
page
,
InsuranceListParam
param
);
/**
/**
* 投保办理不分页查询
* 投保办理分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link IPage<InsuranceListVO>}
*/
IPage
<
InsuranceListVO
>
getInsuranceHandleListPage
(
Page
<
InsuranceListVO
>
page
,
InsuranceListParam
param
);
/**
* 投保不分页查询
*
*
* @author licancan
* @author licancan
* @param param
* @param param
...
@@ -56,6 +67,15 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
...
@@ -56,6 +67,15 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
*/
*/
List
<
InsuranceListVO
>
getInsuranceList
(
InsuranceListParam
param
);
List
<
InsuranceListVO
>
getInsuranceList
(
InsuranceListParam
param
);
/**
* 投保办理不分页查询
*
* @author licancan
* @param param
* @return {@link List<InsuranceListVO>}
*/
List
<
InsuranceListVO
>
getInsuranceHandleList
(
InsuranceListParam
param
);
/**
/**
* 商险新增
* 商险新增
*
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
c0641660
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
View file @
c0641660
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/PreDispatchConstants.java
View file @
c0641660
...
@@ -44,4 +44,6 @@ public class PreDispatchConstants {
...
@@ -44,4 +44,6 @@ public class PreDispatchConstants {
public
static
final
String
NO_SOCIAL_FUND_ADDRESS_ADD
=
"派增:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!"
;
public
static
final
String
NO_SOCIAL_FUND_ADDRESS_ADD
=
"派增:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!"
;
public
static
final
String
NO_SOCIAL_FUND_ADDRESS_REDUCE
=
"派减:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!"
;
public
static
final
String
NO_SOCIAL_FUND_ADDRESS_REDUCE
=
"派减:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!"
;
public
static
final
String
GET_AREA_INFO
=
"获取区域数据失败!"
;
public
static
final
String
GET_AREA_INFO
=
"获取区域数据失败!"
;
public
static
final
String
TEL_NOT_EMPTY
=
"联系电话2不可为空!"
;
public
static
final
String
TEL_INVALID
=
"联系电话2无效!"
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
c0641660
...
@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
...
@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.*
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.*
;
...
@@ -547,6 +548,13 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -547,6 +548,13 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
if
(
x
!=
null
)
{
if
(
x
!=
null
)
{
return
x
;
return
x
;
}
}
// 手机号码必填及格式校验
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getTelTwo
())){
return
R
.
failed
(
PreDispatchConstants
.
TEL_NOT_EMPTY
);
}
if
(
ValidityUtil
.
checkInvalidEmpPhone
(
tPreDispatchInfo
.
getTelTwo
())){
return
R
.
failed
(
PreDispatchConstants
.
TEL_INVALID
);
}
}
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tPreDispatchInfo
.
getType
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tPreDispatchInfo
.
getType
()))
{
initLeaveReason
(
tPreDispatchInfo
);
initLeaveReason
(
tPreDispatchInfo
);
...
@@ -592,6 +600,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -592,6 +600,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
int
i
=
1
;
int
i
=
1
;
for
(
TPreDispatchInfo
info
:
listInfo
)
{
for
(
TPreDispatchInfo
info
:
listInfo
)
{
i
++;
i
++;
if
(!
CommonConstants
.
IS_TRUE
.
equals
(
info
.
getTelNotice
())
&&
!
CommonConstants
.
IS_FALSE
.
equals
(
info
.
getTelNotice
()))
{
errorList
.
add
(
new
ErrorMessage
(
i
,
"是否电话通知不允许导入【是】和【否】之外的内容"
));
continue
;
}
// 1.验重
// 1.验重
if
(
checkAddRepeat
(
errorList
,
existsMap
,
i
,
info
))
{
if
(
checkAddRepeat
(
errorList
,
existsMap
,
i
,
info
))
{
continue
;
continue
;
...
@@ -736,6 +749,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -736,6 +749,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
String
str
=
null
;
String
str
=
null
;
for
(
TPreDispatchInfo
info:
listInfo
){
for
(
TPreDispatchInfo
info:
listInfo
){
i
++;
i
++;
if
(!
CommonConstants
.
IS_TRUE
.
equals
(
info
.
getTelNotice
())
&&
!
CommonConstants
.
IS_FALSE
.
equals
(
info
.
getTelNotice
()))
{
errorList
.
add
(
new
ErrorMessage
(
i
,
"是否电话通知不允许导入【是】和【否】之外的内容"
));
continue
;
}
// 重置异常状态
// 重置异常状态
info
.
setExceptionContent
(
""
);
info
.
setExceptionContent
(
""
);
info
.
setPreStatus
(
CommonConstants
.
ZERO_STRING
);
info
.
setPreStatus
(
CommonConstants
.
ZERO_STRING
);
...
@@ -1150,6 +1168,15 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -1150,6 +1168,15 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
private
String
checkAddPreDispatch
(
TPreDispatchInfo
tPreDispatchInfo
)
{
private
String
checkAddPreDispatch
(
TPreDispatchInfo
tPreDispatchInfo
)
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tPreDispatchInfo
.
getType
()))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tPreDispatchInfo
.
getType
()))
{
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getContractStart
())
||
Common
.
isEmpty
(
tPreDispatchInfo
.
getContractEnd
())){
return
"派增的合同开始日期和合同终止日期不可为空!"
;
}
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getTelTwo
())){
return
PreDispatchConstants
.
TEL_NOT_EMPTY
;
}
if
(
ValidityUtil
.
checkInvalidEmpPhone
(
tPreDispatchInfo
.
getTelTwo
())){
return
PreDispatchConstants
.
TEL_INVALID
;
}
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getPensionAddress
())
&&
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getPensionAddress
())
&&
Common
.
isEmpty
(
tPreDispatchInfo
.
getFundAddress
()))
{
Common
.
isEmpty
(
tPreDispatchInfo
.
getFundAddress
()))
{
return
PreDispatchConstants
.
NO_SOCIAL_FUND_ADDRESS_ADD
;
return
PreDispatchConstants
.
NO_SOCIAL_FUND_ADDRESS_ADD
;
...
...
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