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
32bffff1
You need to sign in or sign up before continuing.
Commit
32bffff1
authored
Sep 07, 2022
by
李灿灿
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-licancan' into 'develop'
订单、商险 导入导出数量20000校验 See merge request fangxinjiang/yifu!243
parents
b65ae0a7
ca819135
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
43 additions
and
12 deletions
+43
-12
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+5
-1
TInsuranceDetailService.java
...insurances/service/insurance/TInsuranceDetailService.java
+2
-2
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+22
-4
OrderConstants.java
...fu/cloud/plus/v1/yifu/order/constants/OrderConstants.java
+4
-0
OrderController.java
.../cloud/plus/v1/yifu/order/controller/OrderController.java
+1
-1
TOrderService.java
.../yifu/cloud/plus/v1/yifu/order/service/TOrderService.java
+2
-2
TOrderServiceImpl.java
...ud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
+7
-2
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
32bffff1
...
@@ -9,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
...
@@ -9,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
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.constants.InsurancesConstants
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.Dept
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.Dept
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService
;
...
@@ -94,7 +95,7 @@ public class TInsuranceDetailController {
...
@@ -94,7 +95,7 @@ public class TInsuranceDetailController {
@PostMapping
(
"/getInsuranceList"
)
@PostMapping
(
"/getInsuranceList"
)
@PreAuthorize
(
"@pms.hasPermission('insurance_custserve_insure_export')"
)
@PreAuthorize
(
"@pms.hasPermission('insurance_custserve_insure_export')"
)
public
R
<
List
<
InsuranceListVO
>>
getInsuranceList
(
@RequestBody
InsuranceListParam
param
)
{
public
R
<
List
<
InsuranceListVO
>>
getInsuranceList
(
@RequestBody
InsuranceListParam
param
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceList
(
param
)
);
return
tInsuranceDetailService
.
getInsuranceList
(
param
);
}
}
/**
/**
...
@@ -255,6 +256,9 @@ public class TInsuranceDetailController {
...
@@ -255,6 +256,9 @@ public class TInsuranceDetailController {
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
}
}
if
(
param
.
size
()
>
CommonConstants
.
IMPORT_TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
return
tInsuranceDetailService
.
insuranceHandleImport
(
user
,
param
);
return
tInsuranceDetailService
.
insuranceHandleImport
(
user
,
param
);
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java
View file @
32bffff1
...
@@ -54,9 +54,9 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
...
@@ -54,9 +54,9 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
*
*
* @author licancan
* @author licancan
* @param param
* @param param
* @return {@link
List<InsuranceListVO
>}
* @return {@link
R<List<InsuranceListVO>
>}
*/
*/
List
<
InsuranceListVO
>
getInsuranceList
(
InsuranceListParam
param
);
R
<
List
<
InsuranceListVO
>
>
getInsuranceList
(
InsuranceListParam
param
);
/**
/**
* 投保办理分页查询
* 投保办理分页查询
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
32bffff1
...
@@ -208,16 +208,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -208,16 +208,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* 投保不分页查询
* 投保不分页查询
*
*
* @param param
* @param param
* @return {@link
List<InsuranceListVO
>}
* @return {@link
R<List<InsuranceListVO>
>}
* @author licancan
* @author licancan
*/
*/
@Override
@Override
public
List
<
InsuranceListVO
>
getInsuranceList
(
InsuranceListParam
param
)
{
public
R
<
List
<
InsuranceListVO
>
>
getInsuranceList
(
InsuranceListParam
param
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
List
<
String
>
deptList
=
getDeptNoList
(
user
);
List
<
String
>
deptList
=
getDeptNoList
(
user
);
List
<
InsuranceListVO
>
insuranceList
=
new
ArrayList
<>();
List
<
InsuranceListVO
>
insuranceList
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isEmpty
(
deptList
)){
if
(
CollectionUtils
.
isEmpty
(
deptList
)){
return
insuranceList
;
return
R
.
ok
(
insuranceList
)
;
}
}
param
.
setDeptNoList
(
deptList
);
param
.
setDeptNoList
(
deptList
);
insuranceList
=
baseMapper
.
getInsuranceList
(
param
);
insuranceList
=
baseMapper
.
getInsuranceList
(
param
);
...
@@ -225,11 +225,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -225,11 +225,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
setProjectNameByDeptNo
(
insuranceList
);
setProjectNameByDeptNo
(
insuranceList
);
// 购买月数
// 购买月数
if
(
CollectionUtils
.
isNotEmpty
(
insuranceList
)){
if
(
CollectionUtils
.
isNotEmpty
(
insuranceList
)){
if
(
insuranceList
.
size
()
>
CommonConstants
.
EXPORT_TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
EXPORT_TOO_LONG
);
}
insuranceList
.
stream
().
forEach
(
e
->{
insuranceList
.
stream
().
forEach
(
e
->{
e
.
setBuyMonth
(
LocalDateUtil
.
betweenMonth
(
e
.
getPolicyStart
().
toString
(),
e
.
getPolicyEnd
().
toString
()));
e
.
setBuyMonth
(
LocalDateUtil
.
betweenMonth
(
e
.
getPolicyStart
().
toString
(),
e
.
getPolicyEnd
().
toString
()));
});
});
}
}
return
insuranceList
;
return
R
.
ok
(
insuranceList
)
;
}
}
/**
/**
* 投保办理分页查询
* 投保办理分页查询
...
@@ -277,6 +280,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -277,6 +280,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
}
}
if
(
paramList
.
size
()
>
CommonConstants
.
IMPORT_TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
...
@@ -327,6 +333,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -327,6 +333,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
}
}
if
(
paramList
.
size
()
>
CommonConstants
.
IMPORT_TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
...
@@ -375,6 +384,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -375,6 +384,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
}
}
if
(
paramList
.
size
()
>
CommonConstants
.
IMPORT_TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
...
@@ -880,6 +892,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -880,6 +892,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
insuranceExportList
=
baseMapper
.
getInsuranceExportList
(
param
);
insuranceExportList
=
baseMapper
.
getInsuranceExportList
(
param
);
}
}
if
(
CollectionUtils
.
isNotEmpty
(
insuranceExportList
)){
if
(
CollectionUtils
.
isNotEmpty
(
insuranceExportList
)){
if
(
insuranceExportList
.
size
()
>
CommonConstants
.
EXPORT_TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
EXPORT_TOO_LONG
);
}
List
<
TInsuranceDetail
>
detailList
=
new
ArrayList
<>();
List
<
TInsuranceDetail
>
detailList
=
new
ArrayList
<>();
//根据项目编码获取项目名称
//根据项目编码获取项目名称
List
<
String
>
collect
=
insuranceExportList
.
stream
().
map
(
e
->
e
.
getDeptNo
()).
distinct
().
collect
(
Collectors
.
toList
());
List
<
String
>
collect
=
insuranceExportList
.
stream
().
map
(
e
->
e
.
getDeptNo
()).
distinct
().
collect
(
Collectors
.
toList
());
...
@@ -1372,6 +1387,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1372,6 +1387,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
}
}
if
(
paramList
.
size
()
>
CommonConstants
.
IMPORT_TWENTY_THOUSAND
){
return
R
.
failed
(
InsurancesConstants
.
IMPORT_TOO_LONG
);
}
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
...
...
yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/constants/OrderConstants.java
View file @
32bffff1
...
@@ -110,4 +110,8 @@ public class OrderConstants {
...
@@ -110,4 +110,8 @@ public class OrderConstants {
* 附件超出上传上限
* 附件超出上传上限
*/
*/
public
static
final
String
ENCLOSURE_SIZE_ERROR
=
"附件超出上传上限"
;
public
static
final
String
ENCLOSURE_SIZE_ERROR
=
"附件超出上传上限"
;
/**
* 一次性导出不可超过20000条,请分批导出
*/
public
static
final
String
EXPORT_TOO_LONG
=
"一次性导出不可超过20000条,请分批导出"
;
}
}
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/controller/OrderController.java
View file @
32bffff1
...
@@ -60,7 +60,7 @@ public class OrderController {
...
@@ -60,7 +60,7 @@ public class OrderController {
@GetMapping
(
"/getOrderList"
)
@GetMapping
(
"/getOrderList"
)
@PreAuthorize
(
"@pms.hasPermission('order:order_getOrderList')"
)
@PreAuthorize
(
"@pms.hasPermission('order:order_getOrderList')"
)
public
R
<
List
<
OrderListVO
>>
getOrderList
(
OrderListParam
param
)
{
public
R
<
List
<
OrderListVO
>>
getOrderList
(
OrderListParam
param
)
{
return
R
.
ok
(
tOrderService
.
getOrderList
(
param
)
);
return
tOrderService
.
getOrderList
(
param
);
}
}
/**
/**
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/TOrderService.java
View file @
32bffff1
...
@@ -34,9 +34,9 @@ public interface TOrderService extends IService<TOrder> {
...
@@ -34,9 +34,9 @@ public interface TOrderService extends IService<TOrder> {
*
*
* @author licancan
* @author licancan
* @param param
* @param param
* @return {@link
List<OrderListVO
>}
* @return {@link
R<List<OrderListVO>
>}
*/
*/
List
<
OrderListVO
>
getOrderList
(
OrderListParam
param
);
R
<
List
<
OrderListVO
>
>
getOrderList
(
OrderListParam
param
);
/**
/**
* 变更订单状态
* 变更订单状态
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @
32bffff1
...
@@ -83,7 +83,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
...
@@ -83,7 +83,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
* @author licancan
* @author licancan
*/
*/
@Override
@Override
public
List
<
OrderListVO
>
getOrderList
(
OrderListParam
param
)
{
public
R
<
List
<
OrderListVO
>
>
getOrderList
(
OrderListParam
param
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
List
<
OrderListVO
>
list
;
List
<
OrderListVO
>
list
;
if
(
CollectionUtils
.
isNotEmpty
(
param
.
getIdList
())){
if
(
CollectionUtils
.
isNotEmpty
(
param
.
getIdList
())){
...
@@ -91,7 +91,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
...
@@ -91,7 +91,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
}
else
{
}
else
{
list
=
baseMapper
.
getOrderList
(
param
,
user
.
getUsername
());
list
=
baseMapper
.
getOrderList
(
param
,
user
.
getUsername
());
}
}
return
list
;
if
(
CollectionUtils
.
isNotEmpty
(
list
)){
if
(
list
.
size
()
>
CommonConstants
.
EXPORT_TWENTY_THOUSAND
){
return
R
.
failed
(
OrderConstants
.
EXPORT_TOO_LONG
);
}
}
return
R
.
ok
(
list
);
}
}
/**
/**
...
...
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